summaryrefslogtreecommitdiffstats
path: root/kppp
diff options
context:
space:
mode:
Diffstat (limited to 'kppp')
-rw-r--r--kppp/accounting.cpp6
-rw-r--r--kppp/accounts.cpp10
-rw-r--r--kppp/acctselect.cpp2
-rw-r--r--kppp/connect.cpp12
-rw-r--r--kppp/conwindow.cpp18
-rw-r--r--kppp/debug.cpp2
-rw-r--r--kppp/edit.cpp20
-rw-r--r--kppp/iplined.cpp4
-rw-r--r--kppp/iplined.h2
-rw-r--r--kppp/kpppwidget.cpp38
-rw-r--r--kppp/loginterm.cpp6
-rw-r--r--kppp/logview/export.cpp6
-rw-r--r--kppp/logview/main.cpp4
-rw-r--r--kppp/logview/monthly.cpp30
-rw-r--r--kppp/macros.h12
-rw-r--r--kppp/modemcmds.cpp24
-rw-r--r--kppp/modemdb.cpp4
-rw-r--r--kppp/modeminfo.cpp12
-rw-r--r--kppp/modems.cpp2
-rw-r--r--kppp/newwidget.cpp2
-rw-r--r--kppp/opener.cpp14
-rw-r--r--kppp/opener.h2
-rw-r--r--kppp/pppdargs.cpp2
-rw-r--r--kppp/ppplog.cpp6
-rw-r--r--kppp/pppstatdlg.cpp16
-rw-r--r--kppp/pppstats.cpp16
-rw-r--r--kppp/pppstats.h4
-rw-r--r--kppp/providerdb.cpp2
-rw-r--r--kppp/requester.cpp8
-rw-r--r--kppp/requester.h4
-rw-r--r--kppp/ruleset.cpp2
31 files changed, 146 insertions, 146 deletions
diff --git a/kppp/accounting.cpp b/kppp/accounting.cpp
index 2d7ab5d7..a01854a0 100644
--- a/kppp/accounting.cpp
+++ b/kppp/accounting.cpp
@@ -72,7 +72,7 @@ AccountingBase::AccountingBase(TQObject *parent) :
_total(0),
_session(0)
{
- TQDate dt = TQDate::tqcurrentDate();
+ TQDate dt = TQDate::currentDate();
LogFileName = TQString("%1-%2.log")
.tqarg(TQDate::shortMonthName(dt.month()))
.tqarg(dt.year(), 4);
@@ -233,7 +233,7 @@ void Accounting::timerEvent(TQTimerEvent *t) {
double newLen;
double connect_time = difftime(time(0), start_time);
- rules.getActiveRule(TQDateTime::tqcurrentDateTime(), connect_time, newCosts, newLen);
+ rules.getActiveRule(TQDateTime::currentDateTime(), connect_time, newCosts, newLen);
if(newLen < 1) { // changed to < 1
slotStop();
return; // no default rule found
@@ -279,7 +279,7 @@ void Accounting::slotStart() {
_lastcosts = 0.0;
_lastlen = 0.0;
_session = rules.perConnectionCosts();
- rules.setStartTime(TQDateTime::tqcurrentDateTime());
+ rules.setStartTime(TQDateTime::currentDateTime());
acct_timer_id = startTimer(1);
if(UPDATE_TIME > 0)
update_timer_id = startTimer(UPDATE_TIME);
diff --git a/kppp/accounts.cpp b/kppp/accounts.cpp
index 450e2a1b..14eb5cd4 100644
--- a/kppp/accounts.cpp
+++ b/kppp/accounts.cpp
@@ -75,7 +75,7 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name )
connect(edit_b, TQT_SIGNAL(clicked()), TQT_SLOT(editaccount()));
TQWhatsThis::add(edit_b, i18n("Allows you to modify the selected account"));
- min = edit_b->tqsizeHint().width();
+ min = edit_b->sizeHint().width();
min = TQMAX(70,min);
edit_b->setMinimumWidth(min);
@@ -116,7 +116,7 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name )
costedit = new TQLineEdit(parent);
costedit->setFocusPolicy(TQ_NoFocus);
- costedit->setFixedHeight(costedit->tqsizeHint().height());
+ costedit->setFixedHeight(costedit->sizeHint().height());
costedit->setEnabled(FALSE);
l121->addWidget(costedit);
l121->addStretch(1);
@@ -135,7 +135,7 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name )
voledit = new TQLineEdit(parent,"voledit");
voledit->setFocusPolicy(TQ_NoFocus);
- voledit->setFixedHeight(voledit->tqsizeHint().height());
+ voledit->setFixedHeight(voledit->sizeHint().height());
voledit->setEnabled(FALSE);
l121->addWidget(voledit);
tmp = i18n("<p>This shows the number of bytes transferred\n"
@@ -450,7 +450,7 @@ QueryReset::QueryReset(TQWidget *parent) : TQDialog(parent, 0, true) {
l1->activate();
- // this activates the f-tqlayout and sets tqminimumSize()
+ // this activates the f-tqlayout and sets minimumSize()
f->show();
tl->addWidget(f);
@@ -470,7 +470,7 @@ QueryReset::QueryReset(TQWidget *parent) : TQDialog(parent, 0, true) {
tl->addWidget(bbox);
// TODO: activate if KGroupBox is fixed
- // setFixedSize(tqsizeHint());
+ // setFixedSize(sizeHint());
}
diff --git a/kppp/acctselect.cpp b/kppp/acctselect.cpp
index 121713c5..fc843017 100644
--- a/kppp/acctselect.cpp
+++ b/kppp/acctselect.cpp
@@ -85,7 +85,7 @@ AccountingSelector::AccountingSelector(TQWidget *parent, bool _isnewaccount, con
selected = new TQLabel(parent);
selected->setFrameStyle(TQFrame::Sunken | TQFrame::WinPanel);
selected->setLineWidth(1);
- selected->setFixedHeight(selected->tqsizeHint().height() + 16);
+ selected->setFixedHeight(selected->sizeHint().height() + 16);
l11->addWidget(lsel, 0);
l11->addSpacing(10);
l11->addWidget(selected, 1);
diff --git a/kppp/connect.cpp b/kppp/connect.cpp
index ea755a3e..6878d072 100644
--- a/kppp/connect.cpp
+++ b/kppp/connect.cpp
@@ -109,10 +109,10 @@ ConnectWidget::ConnectWidget(TQWidget *parent, const char *name, PPPStats *st)
l0->addSpacing(10);
messg = new TQLabel(this, "messg");
messg->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
- messg->tqsetAlignment(AlignCenter);
+ messg->setAlignment(AlignCenter);
messg->setText(i18n("Unable to create modem lock file."));
- messg->setMinimumHeight(messg->tqsizeHint().height() + 5);
- int messw = (messg->tqsizeHint().width() * 12) / 10;
+ messg->setMinimumHeight(messg->sizeHint().height() + 5);
+ int messw = (messg->sizeHint().width() * 12) / 10;
messw = TQMAX(messw,280);
messg->setMinimumWidth(messw);
messg->setText(i18n("Looking for modem..."));
@@ -131,8 +131,8 @@ ConnectWidget::ConnectWidget(TQWidget *parent, const char *name, PPPStats *st)
cancel->setFocus();
connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(cancelbutton()));
- int maxw = TQMAX(cancel->tqsizeHint().width(),
- debug->tqsizeHint().width());
+ int maxw = TQMAX(cancel->sizeHint().width(),
+ debug->sizeHint().width());
maxw = TQMAX(maxw,65);
debug->setFixedWidth(maxw);
cancel->setFixedWidth(maxw);
@@ -140,7 +140,7 @@ ConnectWidget::ConnectWidget(TQWidget *parent, const char *name, PPPStats *st)
l1->addWidget(cancel);
l1->addSpacing(10);
- setFixedSize(tqsizeHint());
+ setFixedSize(sizeHint());
pausetimer = new TQTimer(this);
connect(pausetimer, TQT_SIGNAL(timeout()), TQT_SLOT(pause()));
diff --git a/kppp/conwindow.cpp b/kppp/conwindow.cpp
index 14154e69..a657fd2c 100644
--- a/kppp/conwindow.cpp
+++ b/kppp/conwindow.cpp
@@ -142,11 +142,11 @@ void ConWindow::accounting(bool on) {
l1->setColStretch(0, 0);
l1->setColStretch(1, 1);
- info2->tqsetAlignment(AlignRight|AlignVCenter);
- timelabel2->tqsetAlignment(AlignRight|AlignVCenter);
- session_bill->tqsetAlignment(AlignRight|AlignVCenter);
- total_bill->tqsetAlignment(AlignRight|AlignVCenter);
- volinfo->tqsetAlignment(AlignRight|AlignVCenter);
+ info2->setAlignment(AlignRight|AlignVCenter);
+ timelabel2->setAlignment(AlignRight|AlignVCenter);
+ session_bill->setAlignment(AlignRight|AlignVCenter);
+ total_bill->setAlignment(AlignRight|AlignVCenter);
+ volinfo->setAlignment(AlignRight|AlignVCenter);
// make sure that there's enough space for the bills
TQString s1 = session_bill->text();
TQString s2 = total_bill->text();
@@ -155,9 +155,9 @@ void ConWindow::accounting(bool on) {
session_bill->setText("888888.88 XXX");
total_bill->setText("888888.88 XXX");
volinfo->setText("8888.8 MB");
- session_bill->setFixedSize(session_bill->tqsizeHint());
- total_bill->setFixedSize(total_bill->tqsizeHint());
- volinfo->setFixedSize(volinfo->tqsizeHint());
+ session_bill->setFixedSize(session_bill->sizeHint());
+ total_bill->setFixedSize(total_bill->sizeHint());
+ volinfo->setFixedSize(volinfo->sizeHint());
session_bill->setText(s1);
total_bill->setText(s2);
volinfo->setText(s3);
@@ -214,7 +214,7 @@ void ConWindow::accounting(bool on) {
tl1->addSpacing(5);
- setFixedSize(tqsizeHint());
+ setFixedSize(sizeHint());
/*
do not overwrite position read from config
// If this gets re-enabled, fix it for Xinerama before committing to CVS.
diff --git a/kppp/debug.cpp b/kppp/debug.cpp
index 9b220c20..3dee5797 100644
--- a/kppp/debug.cpp
+++ b/kppp/debug.cpp
@@ -57,7 +57,7 @@ DebugWidget::DebugWidget(TQWidget *parent, const char *name)
statuslabel = new TQLabel("", this, "statuslabel");
statuslabel->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
- statuslabel->tqsetAlignment( AlignLeft|AlignVCenter );
+ statuslabel->setAlignment( AlignLeft|AlignVCenter );
statuslabel->setGeometry(2, 307, 400, 20);
//statusPageLabel->setFont( KGlobalSettings::generalFont() );
diff --git a/kppp/edit.cpp b/kppp/edit.cpp
index 39f88097..19b78185 100644
--- a/kppp/edit.cpp
+++ b/kppp/edit.cpp
@@ -66,7 +66,7 @@ DialWidget::DialWidget( TQWidget *parent, bool isnewaccount, const char *name )
number_label = new TQLabel(i18n("P&hone number:"), parent);
- number_label->tqsetAlignment(AlignTop|AlignLeft);
+ number_label->setAlignment(AlignTop|AlignLeft);
tl->addWidget(number_label, 1, 0);
TQHBoxLayout *lpn = new TQHBoxLayout(5);
@@ -324,7 +324,7 @@ i18n("Here you can select commands to run at certain stages of the\n"
"(unless, of course, you are root).\n\n"
"Be sure to supply the whole path to the program otherwise\n"
"kppp might be unable to find it."), parent);
- l->setMinimumHeight(l->tqsizeHint().height());
+ l->setMinimumHeight(l->sizeHint().height());
tl->addWidget(l);
tl->addStretch(1);
@@ -334,7 +334,7 @@ i18n("Here you can select commands to run at certain stages of the\n"
l1->setColStretch(1, 1);
before_connect_l = new TQLabel(i18n("&Before connect:"), parent);
- before_connect_l->tqsetAlignment(AlignVCenter);
+ before_connect_l->setAlignment(AlignVCenter);
l1->addWidget(before_connect_l, 0, 0);
before_connect = new TQLineEdit(parent);
before_connect_l->setBuddy(before_connect);
@@ -350,7 +350,7 @@ i18n("Here you can select commands to run at certain stages of the\n"
TQWhatsThis::add(before_connect,tmp);
command_label = new TQLabel(i18n("&Upon connect:"), parent);
- command_label->tqsetAlignment(AlignVCenter);
+ command_label->setAlignment(AlignVCenter);
l1->addWidget(command_label, 1, 0);
command = new TQLineEdit(parent);
command_label->setBuddy(command);
@@ -367,7 +367,7 @@ i18n("Here you can select commands to run at certain stages of the\n"
predisconnect_label = new TQLabel(i18n("Before &disconnect:"),
parent);
- predisconnect_label->tqsetAlignment(AlignVCenter);
+ predisconnect_label->setAlignment(AlignVCenter);
l1->addWidget(predisconnect_label, 2, 0);
predisconnect = new TQLineEdit(parent);
predisconnect_label->setBuddy(predisconnect);
@@ -382,7 +382,7 @@ i18n("Here you can select commands to run at certain stages of the\n"
discommand_label = new TQLabel(i18n("U&pon disconnect:"),
parent);
- discommand_label->tqsetAlignment(AlignVCenter);
+ discommand_label->setAlignment(AlignVCenter);
l1->addWidget(discommand_label, 3, 0);
discommand = new TQLineEdit(parent);
@@ -655,7 +655,7 @@ DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name )
tl->addLayout(l1, 4, 1);
add = new TQPushButton(i18n("&Add"), parent);
connect(add, TQT_SIGNAL(clicked()), TQT_SLOT(adddns()));
- int width = add->tqsizeHint().width();
+ int width = add->sizeHint().width();
width = TQMAX(width,60);
add->setMinimumWidth(width);
l1->addWidget(add);
@@ -667,7 +667,7 @@ DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name )
remove = new TQPushButton(i18n("&Remove"), parent);
connect(remove, TQT_SIGNAL(clicked()), TQT_SLOT(removedns()));
- width = remove->tqsizeHint().width();
+ width = remove->sizeHint().width();
width = TQMAX(width,60);
remove->setMinimumWidth(width);
l1->addWidget(remove);
@@ -676,7 +676,7 @@ DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name )
"server entry from the list below"));
servers_label = new TQLabel(i18n("DNS address &list:"), parent);
- servers_label->tqsetAlignment(AlignTop|AlignLeft);
+ servers_label->setAlignment(AlignTop|AlignLeft);
tl->addWidget(servers_label, 5, 0);
dnsservers = new TQListBox(parent);
@@ -908,7 +908,7 @@ ScriptWidget::ScriptWidget( TQWidget *parent, bool isnewaccount, const char *nam
sl->setMinimumSize(TQSize(150, 140));
slb = new TQScrollBar(parent);
- slb->setFixedWidth(slb->tqsizeHint().width());
+ slb->setFixedWidth(slb->sizeHint().width());
connect(slb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(scrolling(int)));
l12->addWidget(stl, 1);
diff --git a/kppp/iplined.cpp b/kppp/iplined.cpp
index 989c790c..197b13a6 100644
--- a/kppp/iplined.cpp
+++ b/kppp/iplined.cpp
@@ -32,11 +32,11 @@ IPLineEdit::IPLineEdit( TQWidget *parent, const char *name )
setMaxLength(3 * 4 + 1 * 3);
}
-TQSize IPLineEdit::tqsizeHint() const {
+TQSize IPLineEdit::sizeHint() const {
TQFontMetrics fm = fontMetrics();
TQSize s;
- s.setHeight(TQLineEdit::tqsizeHint().height());
+ s.setHeight(TQLineEdit::sizeHint().height());
s.setWidth(fm.boundingRect("888.888.888.888XX").width());
return s;
}
diff --git a/kppp/iplined.h b/kppp/iplined.h
index 64a6dcbb..b978b6f5 100644
--- a/kppp/iplined.h
+++ b/kppp/iplined.h
@@ -34,7 +34,7 @@ public:
IPLineEdit( TQWidget *parent=0, const char *name=0 );
~IPLineEdit() {}
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
};
#endif
diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp
index 28afa910..4c287be6 100644
--- a/kppp/kpppwidget.cpp
+++ b/kppp/kpppwidget.cpp
@@ -189,13 +189,13 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name )
int minw = 0;
quit_b = new KPushButton(KStdGuiItem::quit(), this);
connect( quit_b, TQT_SIGNAL(clicked()), TQT_SLOT(quitbutton()));
- if(quit_b->tqsizeHint().width() > minw)
- minw = quit_b->tqsizeHint().width();
+ if(quit_b->sizeHint().width() > minw)
+ minw = quit_b->sizeHint().width();
setup_b = new KPushButton(KGuiItem(i18n("Co&nfigure..."), "configure"), this);
connect( setup_b, TQT_SIGNAL(clicked()), TQT_SLOT(expandbutton()));
- if(setup_b->tqsizeHint().width() > minw)
- minw = setup_b->tqsizeHint().width();
+ if(setup_b->sizeHint().width() > minw)
+ minw = setup_b->sizeHint().width();
if(gpppdata.access() != KConfig::ReadWrite)
setup_b->setEnabled(false);
@@ -206,19 +206,19 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name )
KHelpMenu *helpMenu = new KHelpMenu(this, KGlobal::instance()->aboutData(), true);
help_b->setPopup((TQPopupMenu*)helpMenu->menu());
- if(help_b->tqsizeHint().width() > minw)
- minw = help_b->tqsizeHint().width();
+ if(help_b->sizeHint().width() > minw)
+ minw = help_b->sizeHint().width();
connect_b = new TQPushButton(i18n("&Connect"), this);
connect_b->setDefault(true);
connect_b->setFocus();
connect(connect_b, TQT_SIGNAL(clicked()), TQT_SLOT(beginConnect()));
- if(connect_b->tqsizeHint().width() > minw)
- minw = connect_b->tqsizeHint().width();
+ if(connect_b->sizeHint().width() > minw)
+ minw = connect_b->sizeHint().width();
quit_b->setFixedWidth(minw);
setup_b->setFixedWidth(minw);
- help_b->setFixedWidth(help_b->tqsizeHint().width());
+ help_b->setFixedWidth(help_b->sizeHint().width());
connect_b->setFixedWidth(minw);
l2->addWidget(quit_b);
@@ -227,7 +227,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name )
l2->addSpacing(20);
l2->addWidget(connect_b);
- setFixedSize(tqsizeHint());
+ setFixedSize(sizeHint());
(void)new Modem;
@@ -258,7 +258,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name )
KWin::setIcons(con->winId(), kapp->icon(), kapp->miniIcon() );
connect(this, TQT_SIGNAL(begin_connect()),con, TQT_SLOT(preinit()));
- TQRect desk = KGlobalSettings::desktopGeometry(tqtopLevelWidget());
+ TQRect desk = KGlobalSettings::desktopGeometry(topLevelWidget());
con->setGeometry(desk.center().x()-175, desk.center().y()-55, 350,110);
// connect the ConnectWidgets various signals
@@ -516,7 +516,7 @@ void KPPPWidget::resetmodems() {
label7->setShown(m_bModemCShown);
modem_c->setShown(m_bModemCShown);
tqlayout()->tqinvalidate();
- setFixedSize(tqsizeHint());
+ setFixedSize(sizeHint());
//set the default modem
if(!gpppdata.defaultModem().isEmpty()) {
@@ -598,8 +598,8 @@ void KPPPWidget::sigPPPDDied() {
Modem::modem->unlockdevice();
con->pppdDied();
- Requester::rq->pppdExittqStatus();
- gpppdata.setWaitCallback(gpppdata.callbackType() && Requester::rq->lasttqStatus == E_CBCP_WAIT);
+ Requester::rq->pppdExitStatus();
+ gpppdata.setWaitCallback(gpppdata.callbackType() && Requester::rq->lastStatus == E_CBCP_WAIT);
if(!gpppdata.automatic_redial() && !gpppdata.waitCallback()) {
quit_b->setFocus();
@@ -617,9 +617,9 @@ void KPPPWidget::sigPPPDDied() {
"to come up.");
else {
msg = i18n("<p>The pppd daemon died unexpectedly!</p>");
- Requester::rq->pppdExittqStatus();
- if (Requester::rq->lasttqStatus != 99) { // more recent pppds only
- msg += i18n("<p>Exit status: %1").tqarg(Requester::rq->lasttqStatus);
+ Requester::rq->pppdExitStatus();
+ if (Requester::rq->lastStatus != 99) { // more recent pppds only
+ msg += i18n("<p>Exit status: %1").tqarg(Requester::rq->lastStatus);
msg += i18n("</p><p>See 'man pppd' for an explanation of the error "
"codes or take a look at the kppp FAQ on "
" <a href=\"%1\">%2</a></p>")
@@ -1020,7 +1020,7 @@ void KPPPWidget::showNews() {
TQLabel *icon = new TQLabel(&dlg);
icon->setPixmap(BarIcon("exclamation"));
- icon->setFixedSize(icon->tqsizeHint());
+ icon->setFixedSize(icon->sizeHint());
l1->addWidget(icon);
l1->addLayout(l2);
@@ -1037,7 +1037,7 @@ void KPPPWidget::showNews() {
&dlg);
TQCheckBox *cb = new TQCheckBox(i18n("Don't show this hint again"), &dlg);
- cb->setFixedSize(cb->tqsizeHint());
+ cb->setFixedSize(cb->sizeHint());
KButtonBox *bbox = new KButtonBox(&dlg);
bbox->addStretch(1);
diff --git a/kppp/loginterm.cpp b/kppp/loginterm.cpp
index 4be1dea0..fd544486 100644
--- a/kppp/loginterm.cpp
+++ b/kppp/loginterm.cpp
@@ -123,10 +123,10 @@ LoginTerm::LoginTerm (TQWidget *parent, const char *name)
connect(continue_b, TQT_SIGNAL(clicked()), TQT_SLOT(continuebutton()));
int mwidth;
- if (cancel_b->tqsizeHint().width() > continue_b->tqsizeHint().width())
- mwidth = cancel_b->tqsizeHint().width();
+ if (cancel_b->sizeHint().width() > continue_b->sizeHint().width())
+ mwidth = cancel_b->sizeHint().width();
else
- mwidth = continue_b->tqsizeHint().width();
+ mwidth = continue_b->sizeHint().width();
cancel_b->setFixedWidth(mwidth + 20);
continue_b->setFixedWidth(mwidth + 20);
diff --git a/kppp/logview/export.cpp b/kppp/logview/export.cpp
index b646acdc..a3d55686 100644
--- a/kppp/logview/export.cpp
+++ b/kppp/logview/export.cpp
@@ -73,7 +73,7 @@ ExportWizard::ExportWizard(TQWidget *parent, const TQString &_date)
formatLayout->addSpacing(10);
typeInfo = new TQLabel(formatPage);
- typeInfo->tqsetAlignment(TQt::AlignTop | TQt::WordBreak);
+ typeInfo->setAlignment(TQt::AlignTop | TQt::WordBreak);
typeInfo->setText(i18n("<qt><b>Please choose the output format on the left side.</b></qt>"));
typeInfo->setMinimumSize(350, 200);
formatLayout->addWidget(typeInfo);
@@ -222,9 +222,9 @@ HTMLExport::HTMLExport(const TQString &filename, const TQString &date)
TQString title = i18n("Connection log for %1").tqarg(date);
buffer = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n";
buffer.append("<html>\n<head>\n <title>"+title+"</title>\n");
- buffer.append(TQString::tqfromLatin1(" <meta http-equiv=\"Content-Type\" content=\"text/html; charset=")
+ buffer.append(TQString::fromLatin1(" <meta http-equiv=\"Content-Type\" content=\"text/html; charset=")
+ TQTextCodec::codecForLocale()->mimeName() +
- TQString::tqfromLatin1("\">"));
+ TQString::fromLatin1("\">"));
buffer.append("\n</head>\n<body>\n<h1>"+title+"</h1>\n\n");
buffer.append("<table width=\"100%\" border=\"1\">\n");
diff --git a/kppp/logview/main.cpp b/kppp/logview/main.cpp
index 6f87ae21..f034c462 100644
--- a/kppp/logview/main.cpp
+++ b/kppp/logview/main.cpp
@@ -86,8 +86,8 @@ TopWidget::TopWidget() : KMainWindow(0, "") {
kapp, TQT_SLOT(quit()));
}
- setMinimumSize(mw->tqsizeHint().width() + 15,
- mw->tqsizeHint().height() + 120);
+ setMinimumSize(mw->sizeHint().width() + 15,
+ mw->sizeHint().height() + 120);
setCentralWidget(w);
}
diff --git a/kppp/logview/monthly.cpp b/kppp/logview/monthly.cpp
index 831976cc..030cd3ba 100644
--- a/kppp/logview/monthly.cpp
+++ b/kppp/logview/monthly.cpp
@@ -46,8 +46,8 @@ static void formatBytes(double bytes, TQString &result) {
static void formatBytesMonth(double bytes, TQString &result) {
int day, days;
- day = TQDate::tqcurrentDate().day();
- days = TQDate::tqcurrentDate().daysInMonth();
+ day = TQDate::currentDate().day();
+ days = TQDate::currentDate().daysInMonth();
bytes = (bytes / day) * days;
@@ -76,8 +76,8 @@ static void formatDuration(int seconds, TQString &result) {
static void formatDurationMonth(int seconds, TQString &result) {
int day, days;
- day = TQDate::tqcurrentDate().day();
- days = TQDate::tqcurrentDate().daysInMonth();
+ day = TQDate::currentDate().day();
+ days = TQDate::currentDate().daysInMonth();
seconds = (seconds / day) * days;
@@ -97,8 +97,8 @@ static void formatDurationMonth(int seconds, TQString &result) {
static void costsMonth(double costs, double &result) {
int day, days;
- day = TQDate::tqcurrentDate().day();
- days = TQDate::tqcurrentDate().daysInMonth();
+ day = TQDate::currentDate().day();
+ days = TQDate::currentDate().daysInMonth();
result = (costs / day) * days;
@@ -212,7 +212,7 @@ MonthlyWidget::MonthlyWidget(TQWidget *parent) :
lv2->setSorting(-1);
lv2->setItemMargin(2);
lv2->setMaximumHeight(100);
- lv2->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
+ lv2->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
lv2->setSelectionMode(TQListView::NoSelection);
title = new TQLabel("X", this);
@@ -220,7 +220,7 @@ MonthlyWidget::MonthlyWidget(TQWidget *parent) :
f.setPointSize(f.pointSize() + 2);
f.setBold(TRUE);
title->setFont(f);
- title->setFixedHeight(title->tqsizeHint().height()*2);
+ title->setFixedHeight(title->sizeHint().height()*2);
cboConnections = new TQComboBox(false, this); // add a combo box to select connections
cboConnections->setMaximumWidth(200); // a resonable size
@@ -265,8 +265,8 @@ void MonthlyWidget::layoutWidget() {
f2.setPointSize(f2.pointSize() + 1);
f2.setBold(TRUE);
l->setFont(f2);
- l->setFixedHeight(l->tqsizeHint().height());
- l->tqsetAlignment( AlignLeft );
+ l->setFixedHeight(l->sizeHint().height());
+ l->setAlignment( AlignLeft );
tl->addWidget(l, 5, 0);
tl->addWidget(bbox, 1, 2);
tl->addMultiCellWidget(lv, 1, 4, 0, 1);
@@ -396,7 +396,7 @@ void MonthlyWidget::plotMonth() {
const KCalendarSystem * calendar = KGlobal::locale()->calendar();
- if(calendar->month(periodeFirst()) == calendar->month(TQDate::tqcurrentDate())) {
+ if(calendar->month(periodeFirst()) == calendar->month(TQDate::currentDate())) {
TQString m_bin, m_bout;
@@ -456,7 +456,7 @@ void MonthlyWidget::prevMonth() {
void MonthlyWidget::currentMonth() {
const KCalendarSystem * calendar = KGlobal::locale()->calendar();
- TQDate dt = TQDate::tqcurrentDate();
+ TQDate dt = TQDate::currentDate();
calendar->setYMD(m_periodeFirst, calendar->year(dt), calendar->month(dt), 1);
plotMonth();
@@ -464,7 +464,7 @@ void MonthlyWidget::currentMonth() {
void MonthlyWidget::exportWizard() {
const KCalendarSystem * calendar = KGlobal::locale()->calendar();
- TQString date = TQString::tqfromLatin1("%1-%2") // e.g.: June-2001
+ TQString date = TQString::fromLatin1("%1-%2") // e.g.: June-2001
.tqarg(calendar->monthName(periodeFirst()))
.tqarg(calendar->year(periodeFirst()));
@@ -576,7 +576,7 @@ void MonthlyWidget::exportWizard() {
}
}
- if(calendar->month(periodeFirst()) == calendar->month(TQDate::tqcurrentDate())) {
+ if(calendar->month(periodeFirst()) == calendar->month(TQDate::currentDate())) {
TQString m_bin, m_bout;
if(bin < 0)
@@ -595,7 +595,7 @@ void MonthlyWidget::exportWizard() {
costsMonth(costs, costs);
TQString m_costs(KGlobal::locale()->formatMoney(costs, TQString(), 2));
- TQString datetime = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), true);
+ TQString datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true);
exportIFace->addEmptyLine();
exportIFace->addDataline(i18n("Monthly estimates (%1)").tqarg(datetime),
diff --git a/kppp/macros.h b/kppp/macros.h
index b631516a..6f541b76 100644
--- a/kppp/macros.h
+++ b/kppp/macros.h
@@ -5,11 +5,11 @@
#include <tqlayout.h>
-#define MIN_WIDTH(w) w->setMinimumWidth(w->tqsizeHint().width());
-#define MIN_HEIGHT(w) w->setMinimumHeight(w->tqsizeHint().height());
-#define MIN_SIZE(w) w->setMinimumSize(w->tqsizeHint());
-#define FIXED_SIZE(w) w->setFixedSize(w->tqsizeHint());
-#define FIXED_WIDTH(w) w->setFixedWidth(w->tqsizeHint().width());
-#define FIXED_HEIGHT(w) w->setFixedHeight(w->tqsizeHint().height());
+#define MIN_WIDTH(w) w->setMinimumWidth(w->sizeHint().width());
+#define MIN_HEIGHT(w) w->setMinimumHeight(w->sizeHint().height());
+#define MIN_SIZE(w) w->setMinimumSize(w->sizeHint());
+#define FIXED_SIZE(w) w->setFixedSize(w->sizeHint());
+#define FIXED_WIDTH(w) w->setFixedWidth(w->sizeHint().width());
+#define FIXED_HEIGHT(w) w->setFixedHeight(w->sizeHint().height());
#endif
diff --git a/kppp/modemcmds.cpp b/kppp/modemcmds.cpp
index 2416e4c5..b980a729 100644
--- a/kppp/modemcmds.cpp
+++ b/kppp/modemcmds.cpp
@@ -40,10 +40,10 @@
#include <tqlabel.h>
-#define ADJUSTEDIT(e) e->setText("XXXXXXXXqy"); e->setMinimumSize(e->tqsizeHint()); e->setFixedHeight(e->tqsizeHint().height()); e->setText(""); e->setMaxLength(MODEMSTR_SIZE);
+#define ADJUSTEDIT(e) e->setText("XXXXXXXXqy"); e->setMinimumSize(e->sizeHint()); e->setFixedHeight(e->sizeHint().height()); e->setText(""); e->setMaxLength(MODEMSTR_SIZE);
// a little trick to make the label look like a disabled lineedit
-#define FORMATSLIDERLABEL(l) l->setFixedWidth(l->tqsizeHint().width()); l->setFixedHeight(TQLineEdit(dummyWidget).tqsizeHint().height()); l->tqsetAlignment(AlignCenter); l->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); l->setLineWidth(2);
+#define FORMATSLIDERLABEL(l) l->setFixedWidth(l->sizeHint().width()); l->setFixedHeight(TQLineEdit(dummyWidget).sizeHint().height()); l->setAlignment(AlignCenter); l->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); l->setLineWidth(2);
ModemCommands::ModemCommands(TQWidget *parent, const char *name)
: KDialogBase(parent, name, true, i18n("Edit Modem Commands"), Ok|Cancel)
@@ -72,7 +72,7 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name)
preinitslider = new TQSlider(0, 300, 1, 0,
Qt::Horizontal, dummyWidget);
- preinitslider->setFixedHeight(preinitslider->tqsizeHint().height());
+ preinitslider->setFixedHeight(preinitslider->sizeHint().height());
connect(preinitslider, TQT_SIGNAL(valueChanged(int)),
lpreinitslider, TQT_SLOT(setNum(int)));
l2->addWidget(lpreinitslider, 0);
@@ -96,7 +96,7 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name)
FORMATSLIDERLABEL(linitslider);
initslider = new TQSlider(1, 300, 1, 0,
Qt::Horizontal, dummyWidget);
- initslider->setFixedHeight(initslider->tqsizeHint().height());
+ initslider->setFixedHeight(initslider->sizeHint().height());
connect(initslider, TQT_SIGNAL(valueChanged(int)),
linitslider, TQT_SLOT(setNum(int)));
l3->addWidget(linitslider, 0);
@@ -112,7 +112,7 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name)
FORMATSLIDERLABEL(ldurationslider);
durationslider = new TQSlider(1, 255, 1, 0,
Qt::Horizontal, dummyWidget);
- durationslider->setFixedHeight(durationslider->tqsizeHint().height());
+ durationslider->setFixedHeight(durationslider->sizeHint().height());
connect(durationslider, TQT_SIGNAL(valueChanged(int)),
ldurationslider, TQT_SLOT(setNum(int)));
l4->addWidget(ldurationslider, 0);
@@ -228,7 +228,7 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name)
slider = new TQSlider(0, 255, 1, 0,
Qt::Horizontal, dummyWidget);
- slider->setFixedHeight(slider->tqsizeHint().height());
+ slider->setFixedHeight(slider->sizeHint().height());
connect(slider, TQT_SIGNAL(valueChanged(int)),
lslider, TQT_SLOT(setNum(int)));
l5->addWidget(lslider, 0);
@@ -242,14 +242,14 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name)
TQHBoxLayout *l6 = new TQHBoxLayout;
l1->addLayout(l6, row++, 2);
volume_off = new TQLineEdit(dummyWidget);
- volume_off->setFixedHeight(volume_off->tqsizeHint().height());
- volume_off->setMinimumWidth((int)(volume_off->tqsizeHint().width() / 2));
+ volume_off->setFixedHeight(volume_off->sizeHint().height());
+ volume_off->setMinimumWidth((int)(volume_off->sizeHint().width() / 2));
volume_medium = new TQLineEdit(dummyWidget);
- volume_medium->setFixedHeight(volume_medium->tqsizeHint().height());
- volume_medium->setMinimumWidth((int)(volume_medium->tqsizeHint().width() / 2));
+ volume_medium->setFixedHeight(volume_medium->sizeHint().height());
+ volume_medium->setMinimumWidth((int)(volume_medium->sizeHint().width() / 2));
volume_high = new TQLineEdit(dummyWidget);
- volume_high->setFixedHeight(volume_high->tqsizeHint().height());
- volume_high->setMinimumWidth((int)(volume_high->tqsizeHint().width() / 2));
+ volume_high->setFixedHeight(volume_high->sizeHint().height());
+ volume_high->setMinimumWidth((int)(volume_high->sizeHint().width() / 2));
l6->addWidget(volume_off);
l6->addWidget(volume_medium);
l6->addWidget(volume_high);
diff --git a/kppp/modemdb.cpp b/kppp/modemdb.cpp
index 35eff389..6f910a69 100644
--- a/kppp/modemdb.cpp
+++ b/kppp/modemdb.cpp
@@ -51,7 +51,7 @@ ModemSelector::ModemSelector(TQWidget *parent) : TQDialog(parent, 0, true) {
"right list. If you don't know which modem you have, "
"you can try out one of the \"Generic\" modems."),
this);
- l1->tqsetAlignment(AlignLeft | WordBreak);
+ l1->setAlignment(AlignLeft | WordBreak);
l1->setFixedWidth(400);
l1->setMinimumHeight(50);
tl->addWidget(l1, 0);
@@ -75,7 +75,7 @@ ModemSelector::ModemSelector(TQWidget *parent) : TQDialog(parent, 0, true) {
cancel = bbox->addButton(KStdGuiItem::cancel());
bbox->tqlayout();
tl->addWidget(bbox);
- setFixedSize(tqsizeHint());
+ setFixedSize(sizeHint());
// set up modem database
db = new ModemDatabase();
diff --git a/kppp/modeminfo.cpp b/kppp/modeminfo.cpp
index d242c4f4..14543ce2 100644
--- a/kppp/modeminfo.cpp
+++ b/kppp/modeminfo.cpp
@@ -48,7 +48,7 @@ ModemTransfer::ModemTransfer(TQWidget *parent, const char *name)
statusBar = new TQLabel(this,"sBar");
statusBar->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
- statusBar->tqsetAlignment(AlignCenter);
+ statusBar->setAlignment(AlignCenter);
// This is a rather complicated case. Since we do not know which
// message is the widest in the national language, we'd to
@@ -56,12 +56,12 @@ ModemTransfer::ModemTransfer(TQWidget *parent, const char *name)
// the longest english message, translate it and give it additional
// 20 percent space. Hope this is enough.
statusBar->setText(i18n("Unable to create modem lock file."));
- statusBar->setFixedWidth((statusBar->tqsizeHint().width() * 12) / 10);
- statusBar->setFixedHeight(statusBar->tqsizeHint().height() + 4);
+ statusBar->setFixedWidth((statusBar->sizeHint().width() * 12) / 10);
+ statusBar->setFixedHeight(statusBar->sizeHint().height() + 4);
// set original text
statusBar->setText(i18n("Looking for modem..."));
- progressBar->setFixedHeight(statusBar->tqminimumSize().height());
+ progressBar->setFixedHeight(statusBar->minimumSize().height());
tl->addWidget(progressBar);
tl->addWidget(statusBar);
@@ -74,7 +74,7 @@ ModemTransfer::ModemTransfer(TQWidget *parent, const char *name)
l1->addStretch(1);
l1->addWidget(cancel);
- setFixedSize(tqsizeHint());
+ setFixedSize(sizeHint());
step = 0;
@@ -280,7 +280,7 @@ ModemInfo::ModemInfo(TQWidget *parent, const char* name)
connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()));
l2->addWidget(ok);
- setMinimumSize(tqsizeHint());
+ setMinimumSize(sizeHint());
}
diff --git a/kppp/modems.cpp b/kppp/modems.cpp
index 55f8f629..27a8b4b5 100644
--- a/kppp/modems.cpp
+++ b/kppp/modems.cpp
@@ -74,7 +74,7 @@ ModemsWidget::ModemsWidget( TQWidget *parent, const char *name )
connect(edit_b, TQT_SIGNAL(clicked()), TQT_SLOT(editmodem()));
TQWhatsThis::add(edit_b, i18n("Allows you to modify the selected account"));
- min = edit_b->tqsizeHint().width();
+ min = edit_b->sizeHint().width();
min = TQMAX(70,min);
edit_b->setMinimumWidth(min);
diff --git a/kppp/newwidget.cpp b/kppp/newwidget.cpp
index 49676ddd..28cc9fc6 100644
--- a/kppp/newwidget.cpp
+++ b/kppp/newwidget.cpp
@@ -9,7 +9,7 @@
TQLineEdit *newLineEdit(int visiblewidth, TQWidget *parent) {
TQLineEdit *l = new TQLineEdit(parent);
if(visiblewidth == 0)
- l->setMinimumWidth(l->tqsizeHint().width());
+ l->setMinimumWidth(l->sizeHint().width());
else
l->setFixedWidth(l->fontMetrics().width('H') * visiblewidth);
diff --git a/kppp/opener.cpp b/kppp/opener.cpp
index 0d46edd9..5d90cc0e 100644
--- a/kppp/opener.cpp
+++ b/kppp/opener.cpp
@@ -128,7 +128,7 @@ extern "C" {
static void sighandler_child(int);
static pid_t pppdPid = -1;
-static int pppdExittqStatus = -1;
+static int pppdExitStatus = -1;
static int checkForInterface();
// processing will stop at first file that could be opened successfully
@@ -316,10 +316,10 @@ void Opener::mainLoop() {
sendResponse(&response);
break;
- case PPPDExittqStatus:
+ case PPPDExitStatus:
Debug("Opener: received PPPDExitStatus");
MY_ASSERT(len == sizeof(struct PPPDExitStatusRequest));
- response.status = pppdExittqStatus;
+ response.status = pppdExitStatus;
sendResponse(&response);
break;
@@ -519,7 +519,7 @@ bool Opener::execpppd(const char *arguments) {
if(ttyfd<0)
return false;
- pppdExittqStatus = -1;
+ pppdExitStatus = -1;
switch(pppdPid = fork())
{
@@ -711,10 +711,10 @@ void sighandler_child(int) {
Debug("It was pppd that died");
pppdPid = -1;
if((WIFEXITED(status))) {
- pppdExittqStatus = (WEXITSTATUS(status));
- Debug2("pppd exited with return value %d\n", pppdExittqStatus);
+ pppdExitStatus = (WEXITSTATUS(status));
+ Debug2("pppd exited with return value %d\n", pppdExitStatus);
} else {
- pppdExittqStatus = 99;
+ pppdExitStatus = 99;
Debug("pppd exited abnormally.");
}
Debug2("Sending %i a SIGUSR1\n", getppid());
diff --git a/kppp/opener.h b/kppp/opener.h
index 99568f5d..812ec9ba 100644
--- a/kppp/opener.h
+++ b/kppp/opener.h
@@ -34,7 +34,7 @@ public:
SetSecret, RemoveSecret,
SetHostname,
ExecPPPDaemon, KillPPPDaemon,
- PPPDExittqStatus,
+ PPPDExitStatus,
Stop };
enum Auth { PAP = 1, CHAP };
enum { MaxPathLen = 30, MaxStrLen = 40, MaxArgs = 100 };
diff --git a/kppp/pppdargs.cpp b/kppp/pppdargs.cpp
index 56814f34..e27b583a 100644
--- a/kppp/pppdargs.cpp
+++ b/kppp/pppdargs.cpp
@@ -98,7 +98,7 @@ PPPdArguments::PPPdArguments(TQWidget *parent, const char *name)
bbox->tqlayout();
l->addWidget(bbox);
- setFixedSize(tqsizeHint());
+ setFixedSize(sizeHint());
//load info from gpppdata
init();
diff --git a/kppp/ppplog.cpp b/kppp/ppplog.cpp
index a5075b3e..0c62b152 100644
--- a/kppp/ppplog.cpp
+++ b/kppp/ppplog.cpp
@@ -202,8 +202,8 @@ void PPPL_ShowLog() {
bool foundConnect = false;
bool foundLCP = gpppdata.getPPPDebug();
- TQString lcp = TQString::tqfromLatin1("[LCP");
- TQString conn = TQString::tqfromLatin1("Connect:");
+ TQString lcp = TQString::fromLatin1("[LCP");
+ TQString conn = TQString::fromLatin1("Connect:");
TQStringList::ConstIterator it = sl.begin();
for( ; it != sl.end(); it++) {
if((*it).find(lcp) >= 0) {
@@ -258,7 +258,7 @@ void PPPL_ShowLog() {
tl->addWidget(label);
tl->addWidget(diagnosis, 1);
tl->addWidget(bbox);
- dlg->setFixedSize(dlg->tqsizeHint());
+ dlg->setFixedSize(dlg->sizeHint());
for(uint i = 0; i < sl.count(); i++)
edit->append(*sl.at(i));
diff --git a/kppp/pppstatdlg.cpp b/kppp/pppstatdlg.cpp
index b5b12f42..2d12a88e 100644
--- a/kppp/pppstatdlg.cpp
+++ b/kppp/pppstatdlg.cpp
@@ -80,7 +80,7 @@ PPPStatsDlg::PPPStatsDlg(TQWidget *parent, const char *name, TQWidget *,
pixmap_l = new TQLabel(this);
pixmap_l->setMinimumSize(big_modem_both_pixmap.size());
l111->addWidget(pixmap_l, 1);
- pixmap_l->tqsetAlignment(AlignVCenter|AlignLeft);
+ pixmap_l->setAlignment(AlignVCenter|AlignLeft);
TQGridLayout *l1112 = new TQGridLayout(3, 2);
l111->addLayout(l1112);
@@ -137,10 +137,10 @@ PPPStatsDlg::PPPStatsDlg(TQWidget *parent, const char *name, TQWidget *,
for(i = 0; i < 5; i++) {
labela2[i]->setText("888888888"); // TODO: resize automatically
labelb2[i]->setText("888888888");
- labela2[i]->tqsetAlignment(TQt::AlignRight);
- labelb2[i]->tqsetAlignment(TQt::AlignRight);
- labela2[i]->setFixedSize(labela2[i]->tqsizeHint());
- labelb2[i]->setFixedSize(labelb2[i]->tqsizeHint());
+ labela2[i]->setAlignment(TQt::AlignRight);
+ labelb2[i]->setAlignment(TQt::AlignRight);
+ labela2[i]->setFixedSize(labela2[i]->sizeHint());
+ labelb2[i]->setFixedSize(labelb2[i]->sizeHint());
labela2[i]->setText("");
labelb2[i]->setText("");
@@ -175,8 +175,8 @@ PPPStatsDlg::PPPStatsDlg(TQWidget *parent, const char *name, TQWidget *,
cancelbutton = new KPushButton(KStdGuiItem::close(),this, "cancelbutton");
cancelbutton->setFocus();
connect(cancelbutton, TQT_SIGNAL(clicked()), this,TQT_SLOT(cancel()));
- cancelbutton->setFixedHeight(cancelbutton->tqsizeHint().height());
- cancelbutton->setMinimumWidth(TQMAX(cancelbutton->tqsizeHint().width(), 70));
+ cancelbutton->setFixedHeight(cancelbutton->sizeHint().height());
+ cancelbutton->setMinimumWidth(TQMAX(cancelbutton->sizeHint().width(), 70));
l12->addWidget(cancelbutton);
if(gpppdata.graphingEnabled()) {
@@ -184,7 +184,7 @@ PPPStatsDlg::PPPStatsDlg(TQWidget *parent, const char *name, TQWidget *,
connect(graphTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateGraph()));
}
- setFixedSize(tqsizeHint());
+ setFixedSize(sizeHint());
connect(stats, TQT_SIGNAL(statsChanged(int)), TQT_SLOT(paintIcon(int)));
diff --git a/kppp/pppstats.cpp b/kppp/pppstats.cpp
index fb4d6428..29a87e77 100644
--- a/kppp/pppstats.cpp
+++ b/kppp/pppstats.cpp
@@ -127,25 +127,25 @@ void PPPStats::clear()
compressed = 0;
packetsunc = 0;
packetsoutunc = 0;
- iotqStatus = BytesNone;
+ ioStatus = BytesNone;
}
void PPPStats::timerClick() {
- enum IOtqStatus newtqStatus;
+ enum IOStatus newStatus;
doStats();
if((ibytes != ibytes_last) && (obytes != obytes_last))
- newtqStatus = BytesBoth;
+ newStatus = BytesBoth;
else if(ibytes != ibytes_last)
- newtqStatus = BytesIn;
+ newStatus = BytesIn;
else if(obytes != obytes_last)
- newtqStatus = BytesOut;
+ newStatus = BytesOut;
else
- newtqStatus = BytesNone;
+ newStatus = BytesNone;
- if(newtqStatus != iotqStatus)
- emit statsChanged(iotqStatus = newtqStatus);
+ if(newStatus != ioStatus)
+ emit statsChanged(ioStatus = newStatus);
ibytes_last = ibytes;
obytes_last = obytes;
diff --git a/kppp/pppstats.h b/kppp/pppstats.h
index 91e4e9e0..4fdf17bd 100644
--- a/kppp/pppstats.h
+++ b/kppp/pppstats.h
@@ -65,7 +65,7 @@ public:
TQString local_ip_address;
TQString remote_ip_address;
- enum IOtqStatus { BytesNone = 0, BytesIn, BytesOut, BytesBoth };
+ enum IOStatus { BytesNone = 0, BytesIn, BytesOut, BytesBoth };
private:
bool get_ppp_stats(struct ppp_stats *curp);
@@ -78,7 +78,7 @@ private:
#endif
int unit;
char unitName[5];
- enum IOtqStatus iotqStatus;
+ enum IOStatus ioStatus;
TQTimer *timer;
};
diff --git a/kppp/providerdb.cpp b/kppp/providerdb.cpp
index 97d13612..870db69b 100644
--- a/kppp/providerdb.cpp
+++ b/kppp/providerdb.cpp
@@ -88,7 +88,7 @@ ProviderDB::ProviderDB(TQWidget *parent) :
connect((const TQObject *)backButton(), TQT_SIGNAL(clicked()),
this, TQT_SLOT(pageSelected()));
- // resize(tqminimumSize());
+ // resize(minimumSize());
adjustSize();
}
diff --git a/kppp/requester.cpp b/kppp/requester.cpp
index dcb28fcb..b5450929 100644
--- a/kppp/requester.cpp
+++ b/kppp/requester.cpp
@@ -70,7 +70,7 @@ Requester *Requester::rq = 0L;
Requester::Requester(int s) : socket(s) {
assert(rq==0L);
rq = this;
- lasttqStatus = -1;
+ lastStatus = -1;
}
Requester::~Requester() {
@@ -167,7 +167,7 @@ bool Requester::recvResponse() {
kdDebug(5002) << "response.status: " << response.status << endl;
}
- lasttqStatus = response.status;
+ lastStatus = response.status;
return (response.status == 0);
}
@@ -306,10 +306,10 @@ bool Requester::killPPPDaemon() {
return recvResponse();
}
-int Requester::pppdExittqStatus()
+int Requester::pppdExitStatus()
{
struct PPPDExitStatusRequest req;
- req.header.type = Opener::PPPDExittqStatus;
+ req.header.type = Opener::PPPDExitStatus;
sendRequest((struct RequestHeader *) &req, sizeof(req));
return recvResponse();
}
diff --git a/kppp/requester.h b/kppp/requester.h
index 46626df5..ea415df0 100644
--- a/kppp/requester.h
+++ b/kppp/requester.h
@@ -17,12 +17,12 @@ public:
bool setHostname(const TQString & name);
bool execPPPDaemon(const TQString & arguments);
bool killPPPDaemon();
- int pppdExittqStatus();
+ int pppdExitStatus();
bool stop();
public:
static Requester *rq;
- int lasttqStatus;
+ int lastStatus;
private:
bool sendRequest(struct RequestHeader *request, int len);
diff --git a/kppp/ruleset.cpp b/kppp/ruleset.cpp
index ef9d9517..723d5f2b 100644
--- a/kppp/ruleset.cpp
+++ b/kppp/ruleset.cpp
@@ -362,7 +362,7 @@ bool RuleSet::parseLine(const TQString &s) {
// parse the days
token = s.mid(s.find("on(") + 3,
s.find(")betw")-s.find("on(") - 3);
- if(!parseEntries(token, TQDate::tqcurrentDate().year(),
+ if(!parseEntries(token, TQDate::currentDate().year(),
t1, t2, costs, len, after))
return FALSE;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-25 14:22:27 +0000