diff options
Diffstat (limited to 'kppp')
| -rw-r--r-- | kppp/accounting.cpp | 18 | ||||
| -rw-r--r-- | kppp/accounting.h | 2 | ||||
| -rw-r--r-- | kppp/accounts.cpp | 30 | ||||
| -rw-r--r-- | kppp/connect.cpp | 6 | ||||
| -rw-r--r-- | kppp/conwindow.cpp | 2 | ||||
| -rw-r--r-- | kppp/debug.cpp | 4 | ||||
| -rw-r--r-- | kppp/loginterm.cpp | 4 | ||||
| -rw-r--r-- | kppp/logview/monthly.cpp | 4 | ||||
| -rw-r--r-- | kppp/miniterm.cpp | 8 | ||||
| -rw-r--r-- | kppp/modeminfo.cpp | 8 | ||||
| -rw-r--r-- | kppp/pppdargs.cpp | 2 | ||||
| -rw-r--r-- | kppp/pppdata.cpp | 4 | ||||
| -rw-r--r-- | kppp/ppplog.cpp | 8 | ||||
| -rw-r--r-- | kppp/pwentry.cpp | 6 | ||||
| -rw-r--r-- | kppp/ruleset.cpp | 48 | ||||
| -rw-r--r-- | kppp/runtests.cpp | 4 | ||||
| -rw-r--r-- | kppp/scriptedit.cpp | 28 |
17 files changed, 93 insertions, 93 deletions
diff --git a/kppp/accounting.cpp b/kppp/accounting.cpp index 99cbd65d..4bfdcc5b 100644 --- a/kppp/accounting.cpp +++ b/kppp/accounting.cpp @@ -173,9 +173,9 @@ bool AccountingBase::saveCosts() { gpppdata.setTotalCosts(val); gpppdata.save(); - return TRUE; + return true; } else - return FALSE; + return false; } @@ -191,7 +191,7 @@ bool AccountingBase::loadCosts() { _total = 0.0; } - return TRUE; + return true; } @@ -292,7 +292,7 @@ void Accounting::slotStart() { s += ":"; s += rules.currencySymbol(); - logMessage(s, TRUE); + logMessage(s, true); } } @@ -313,7 +313,7 @@ void Accounting::slotStop() { stats->ibytes, stats->obytes); - logMessage(s, FALSE); + logMessage(s, false); saveCosts(); } } @@ -323,7 +323,7 @@ bool Accounting::loadRuleSet(const TQString & name) { if (name.isEmpty()) { rules.load(""); // delete old rules - return TRUE; + return true; } TQString d = AccountingBase::getAccountingFile(name); @@ -335,7 +335,7 @@ bool Accounting::loadRuleSet(const TQString & name) { return (bool)(ret == 0); } - return FALSE; + return false; } @@ -450,7 +450,7 @@ void ExecutableAccounting::slotStart() { s += ":"; s += currency; - logMessage(s, TRUE); + logMessage(s, true); } @@ -468,7 +468,7 @@ void ExecutableAccounting::slotStop() { stats->ibytes, stats->obytes); - logMessage(s, FALSE); + logMessage(s, false); saveCosts(); } } diff --git a/kppp/accounting.h b/kppp/accounting.h index f3670f7b..7d74caf6 100644 --- a/kppp/accounting.h +++ b/kppp/accounting.h @@ -58,7 +58,7 @@ signals: void changed(TQString total, TQString session); protected: - void logMessage(TQString, bool = FALSE); + void logMessage(TQString, bool = false); bool saveCosts(); bool loadCosts(); diff --git a/kppp/accounts.cpp b/kppp/accounts.cpp index 13f2ea37..138faa34 100644 --- a/kppp/accounts.cpp +++ b/kppp/accounts.cpp @@ -111,13 +111,13 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name ) l12->addLayout(l121); l121->addStretch(1); costlabel = new TQLabel(i18n("Phone costs:"), parent); - costlabel->setEnabled(FALSE); + costlabel->setEnabled(false); l121->addWidget(costlabel); costedit = new TQLineEdit(parent); costedit->setFocusPolicy(TQWidget::NoFocus); costedit->setFixedHeight(costedit->sizeHint().height()); - costedit->setEnabled(FALSE); + costedit->setEnabled(false); l121->addWidget(costedit); l121->addStretch(1); TQString tmp = i18n("<p>This shows the accumulated phone costs\n" @@ -130,13 +130,13 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name ) TQWhatsThis::add(costedit, tmp); vollabel = new TQLabel(i18n("Volume:"), parent); - vollabel->setEnabled(FALSE); + vollabel->setEnabled(false); l121->addWidget(vollabel); voledit = new TQLineEdit(parent,"voledit"); voledit->setFocusPolicy(TQWidget::NoFocus); voledit->setFixedHeight(voledit->sizeHint().height()); - voledit->setEnabled(FALSE); + voledit->setEnabled(false); l121->addWidget(voledit); tmp = i18n("<p>This shows the number of bytes transferred\n" "for the selected account (not for all of your\n" @@ -154,7 +154,7 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name ) l122->addStretch(1); reset = new TQPushButton(i18n("&Reset..."), parent); - reset->setEnabled(FALSE); + reset->setEnabled(false); connect(reset, TQ_SIGNAL(clicked()), this, TQ_SLOT(resetClicked())); l122->addWidget(reset); @@ -187,24 +187,24 @@ void AccountWidget::slotListBoxSelect(int idx) { if(idx!=-1) { TQString account = gpppdata.accname(); gpppdata.setAccountByIndex(accountlist_l->currentItem()); - reset->setEnabled(TRUE); - costlabel->setEnabled(TRUE); - costedit->setEnabled(TRUE); + reset->setEnabled(true); + costlabel->setEnabled(true); + costedit->setEnabled(true); costedit->setText(AccountingBase::getCosts(accountlist_l->text(accountlist_l->currentItem()))); - vollabel->setEnabled(TRUE); - voledit->setEnabled(TRUE); + vollabel->setEnabled(true); + voledit->setEnabled(true); int bytes = gpppdata.totalBytes(); voledit->setText(prettyPrintVolume(bytes)); gpppdata.setAccount(account); } else{ - reset->setEnabled(FALSE); - costlabel->setEnabled(FALSE); + reset->setEnabled(false); + costlabel->setEnabled(false); costedit->setText(""); - costedit->setEnabled(FALSE); - vollabel->setEnabled(FALSE); + costedit->setEnabled(false); + vollabel->setEnabled(false); voledit->setText(""); - voledit->setEnabled(FALSE); + voledit->setEnabled(false); } } diff --git a/kppp/connect.cpp b/kppp/connect.cpp index abcc277c..376f06df 100644 --- a/kppp/connect.cpp +++ b/kppp/connect.cpp @@ -1172,7 +1172,7 @@ void ConnectWidget::if_waiting_slot() { return; } - if_timer->start(100, TRUE); // single shot + if_timer->start(100, true); // single shot return; } @@ -1385,7 +1385,7 @@ void auto_hostname() { dot=new_hostname.find('.'); new_hostname=new_hostname.remove(dot,new_hostname.length()-dot); Requester::rq->setHostname(new_hostname); - modified_hostname = TRUE; + modified_hostname = true; new_hostname=hostname_entry->h_name; new_hostname.remove(0,dot+1); @@ -1532,7 +1532,7 @@ void removedns() { if ( modified_hostname ) { Requester::rq->setHostname(old_hostname); - modified_hostname = FALSE; + modified_hostname = false; } } diff --git a/kppp/conwindow.cpp b/kppp/conwindow.cpp index 9f4a10bd..784a2499 100644 --- a/kppp/conwindow.cpp +++ b/kppp/conwindow.cpp @@ -273,7 +273,7 @@ void ConWindow::timeclick() { // volume accounting if(volumeAccountingEnabled) { - volinfo->setEnabled(TRUE); + volinfo->setEnabled(true); int bytes = gpppdata.totalBytes(); volinfo->setText(prettyPrintVolume(bytes)); } diff --git a/kppp/debug.cpp b/kppp/debug.cpp index 23790300..97498890 100644 --- a/kppp/debug.cpp +++ b/kppp/debug.cpp @@ -46,13 +46,13 @@ void myMultiEdit::newLine() { DebugWidget::DebugWidget(TQWidget *parent, const char *name) - : TQDialog(parent, name, FALSE) + : TQDialog(parent, name, false) { setCaption(i18n("Login Script Debug Window")); text_window = new myMultiEdit(this,"debugwindow"); text_window->setGeometry(2,5,400, 300); - // text_window->setReadOnly(FALSE); + // text_window->setReadOnly(false); statuslabel = new TQLabel("", this, "statuslabel"); diff --git a/kppp/loginterm.cpp b/kppp/loginterm.cpp index e5c4f3f1..dd44384b 100644 --- a/kppp/loginterm.cpp +++ b/kppp/loginterm.cpp @@ -58,7 +58,7 @@ void LoginMultiLineEdit::myreturn() { void LoginMultiLineEdit::mynewline() { - TQMultiLineEdit::end(FALSE); + TQMultiLineEdit::end(false); TQMultiLineEdit::newLine(); p_kppp->debugwindow->addChar('\n'); @@ -94,7 +94,7 @@ void LoginMultiLineEdit::readChar(unsigned char c) { LoginTerm::LoginTerm (TQWidget *parent, const char *name) - : TQDialog(parent, name, FALSE) + : TQDialog(parent, name, false) { setCaption(i18n("Login Terminal Window")); setMinimumSize(300, 200); diff --git a/kppp/logview/monthly.cpp b/kppp/logview/monthly.cpp index 656bf582..065773ca 100644 --- a/kppp/logview/monthly.cpp +++ b/kppp/logview/monthly.cpp @@ -218,7 +218,7 @@ MonthlyWidget::MonthlyWidget(TQWidget *parent) : title = new TQLabel("X", this); TQFont f = title->font(); f.setPointSize(f.pointSize() + 2); - f.setBold(TRUE); + f.setBold(true); title->setFont(f); title->setFixedHeight(title->sizeHint().height()*2); @@ -263,7 +263,7 @@ void MonthlyWidget::layoutWidget() { l->setText(i18n("Statistics:")); TQFont f2 = l->font(); f2.setPointSize(f2.pointSize() + 1); - f2.setBold(TRUE); + f2.setBold(true); l->setFont(f2); l->setFixedHeight(l->sizeHint().height()); l->setAlignment( AlignLeft ); diff --git a/kppp/miniterm.cpp b/kppp/miniterm.cpp index e65f812e..a9b4139e 100644 --- a/kppp/miniterm.cpp +++ b/kppp/miniterm.cpp @@ -104,15 +104,15 @@ void MiniTerm::setupToolbar() { toolbar->insertButton("system-log-out", 0, TQ_SIGNAL(clicked()), this, - TQ_SLOT(cancelbutton()), TRUE, i18n("Close MiniTerm")); + TQ_SLOT(cancelbutton()), true, i18n("Close MiniTerm")); toolbar->insertButton("back", 0, TQ_SIGNAL(clicked()), this, - TQ_SLOT(resetModem()), TRUE, i18n("Reset Modem")); + TQ_SLOT(resetModem()), true, i18n("Reset Modem")); toolbar->insertButton("help", 0, TQ_SIGNAL(clicked()), this, - TQ_SLOT(help()), TRUE, i18n("Help")); + TQ_SLOT(help()), true, i18n("Help")); toolbar->setBarPos( TDEToolBar::Top ); toolbar->setMovingEnabled(false); @@ -274,7 +274,7 @@ void MyTerm::myreturn() { void MyTerm::mynewline() { - TQMultiLineEdit::end(FALSE); + TQMultiLineEdit::end(false); TQMultiLineEdit::newLine(); } diff --git a/kppp/modeminfo.cpp b/kppp/modeminfo.cpp index 7053f2e9..f00e7f25 100644 --- a/kppp/modeminfo.cpp +++ b/kppp/modeminfo.cpp @@ -36,7 +36,7 @@ #include <tdelocale.h> ModemTransfer::ModemTransfer(TQWidget *parent, const char *name) - : TQDialog(parent, name,TRUE, WStyle_Customize|WStyle_NormalBorder) + : TQDialog(parent, name,true, WStyle_Customize|WStyle_NormalBorder) { setCaption(i18n("ATI Query")); KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); @@ -86,7 +86,7 @@ ModemTransfer::ModemTransfer(TQWidget *parent, const char *name) scripttimer = new TQTimer(this); connect(scripttimer, TQ_SIGNAL(timeout()), TQ_SLOT(do_script())); - timeout_timer->start(15000,TRUE); // 15 secs single shot + timeout_timer->start(15000,true); // 15 secs single shot TQTimer::singleShot(500, this, TQ_SLOT(init())); } @@ -241,7 +241,7 @@ void ModemTransfer::closeEvent( TQCloseEvent *e ) { ModemInfo::ModemInfo(TQWidget *parent, const char* name) - : TQDialog(parent, name, TRUE, WStyle_Customize|WStyle_NormalBorder) + : TQDialog(parent, name, true, WStyle_Customize|WStyle_NormalBorder) { TQString label_text; @@ -271,7 +271,7 @@ ModemInfo::ModemInfo(TQWidget *parent, const char* name) TQHBoxLayout *l2 = new TQHBoxLayout; TQPushButton *ok = new KPushButton(KStdGuiItem::close(), this); - ok->setDefault(TRUE); + ok->setDefault(true); ok->setFocus(); tl->addLayout(l2); diff --git a/kppp/pppdargs.cpp b/kppp/pppdargs.cpp index 2bbc1e62..e7e8b473 100644 --- a/kppp/pppdargs.cpp +++ b/kppp/pppdargs.cpp @@ -41,7 +41,7 @@ #include <kstdguiitem.h> PPPdArguments::PPPdArguments(TQWidget *parent, const char *name) - : TQDialog(parent, name, TRUE) + : TQDialog(parent, name, true) { setCaption(i18n("Customize pppd Arguments")); KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); diff --git a/kppp/pppdata.cpp b/kppp/pppdata.cpp index 5f2b3cd0..08d15557 100644 --- a/kppp/pppdata.cpp +++ b/kppp/pppdata.cpp @@ -320,7 +320,7 @@ void PPPData::set_show_log_window(bool set) { bool PPPData::automatic_redial() { - return (bool) readNumConfig(GENERAL_GRP, AUTOREDIAL_KEY, FALSE); + return (bool) readNumConfig(GENERAL_GRP, AUTOREDIAL_KEY, false); } @@ -330,7 +330,7 @@ void PPPData::set_automatic_redial(bool set) { bool PPPData::get_iconify_on_connect() { - return (bool) readNumConfig(GENERAL_GRP, ICONIFY_ON_CONNECT_KEY, TRUE); + return (bool) readNumConfig(GENERAL_GRP, ICONIFY_ON_CONNECT_KEY, true); } diff --git a/kppp/ppplog.cpp b/kppp/ppplog.cpp index 590c15bc..92e17582 100644 --- a/kppp/ppplog.cpp +++ b/kppp/ppplog.cpp @@ -222,7 +222,7 @@ void PPPL_ShowLog() { "Shall I turn it on now?"), TQString(), i18n("Restart pppd"), i18n("Do Not Restart")); if(result == KMessageBox::Yes) { - gpppdata.setPPPDebug(TRUE); + gpppdata.setPPPDebug(true); KMessageBox::information(0, i18n("The \"debug\" option has been added. You " "should now try to reconnect. If that fails " @@ -236,15 +236,15 @@ void PPPL_ShowLog() { PPPL_AnalyseLog(sl, result); - TQDialog *dlg = new TQDialog(0, "", TRUE); + TQDialog *dlg = new TQDialog(0, "", true); dlg->setCaption(i18n("PPP Log")); TQVBoxLayout *tl = new TQVBoxLayout(dlg, 10, 10); TQMultiLineEdit *edit = new TQMultiLineEdit(dlg); - edit->setReadOnly(TRUE); + edit->setReadOnly(true); TQLabel *label = new TQLabel(i18n("kppp's diagnosis (just guessing):"), dlg); TQMultiLineEdit *diagnosis = new TQMultiLineEdit(dlg); - diagnosis->setReadOnly(TRUE); + diagnosis->setReadOnly(true); KButtonBox *bbox = new KButtonBox(dlg); bbox->addStretch(1); TQPushButton *write = bbox->addButton(i18n("Write to File")); diff --git a/kppp/pwentry.cpp b/kppp/pwentry.cpp index 32442a53..6da56c69 100644 --- a/kppp/pwentry.cpp +++ b/kppp/pwentry.cpp @@ -55,7 +55,7 @@ PWEntry::PWEntry( TQWidget *parent, const char *name ) pw->setEchoMode( TQLineEdit::Password ); connect( pw, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(hide()) ); - isconsumed = TRUE; + isconsumed = true; } TQString PWEntry::text() { return (pw->text()); } @@ -95,7 +95,7 @@ void PWEntry::resizeEvent(TQResizeEvent* ){ void PWEntry::show() { pw->setText(""); - isconsumed = FALSE; + isconsumed = false; TQWidget::show(); } @@ -104,7 +104,7 @@ bool PWEntry::Consumed() { } void PWEntry::setConsumed() { - isconsumed = TRUE; + isconsumed = true; } void PWEntry::hide() { diff --git a/kppp/ruleset.cpp b/kppp/ruleset.cpp index 21de5625..70c677f9 100644 --- a/kppp/ruleset.cpp +++ b/kppp/ruleset.cpp @@ -189,7 +189,7 @@ bool RuleSet::parseEntry(RULE &ret, TQString s, int year) { ret.type = 1; ret.date.from = TQDate(year, m, d); ret.date.until = TQDate(year, m, d); - return TRUE; + return true; } if(s.contains(TQRegExp("^[0-9]+\\.[0-9]+$"))) { @@ -198,7 +198,7 @@ bool RuleSet::parseEntry(RULE &ret, TQString s, int year) { ret.type = 1; ret.date.from = TQDate(year, m, d); ret.date.until = TQDate(year, m, d); - return TRUE; + return true; } if(s.right(3) == "day") { @@ -207,14 +207,14 @@ bool RuleSet::parseEntry(RULE &ret, TQString s, int year) { ret.type = 2; ret.weekday.from = d; ret.weekday.until = d; - return TRUE; + return true; } } if(s.left(6) == "easter") { TQDate d = get_easter(year); int off; - bool ok = TRUE; + bool ok = true; TQString val = s.mid(6, 1000); if(val.isEmpty()) off = 0; @@ -226,12 +226,12 @@ bool RuleSet::parseEntry(RULE &ret, TQString s, int year) { ret.type = 1; ret.date.from = d; ret.date.until = d; - return TRUE; + return true; } } ret.type = 0; - return FALSE; + return false; } @@ -276,11 +276,11 @@ bool RuleSet::parseEntries(TQString s, int year, r.weekday.until = rr.weekday.from; } } else - return FALSE; + return false; } } else if(!parseEntry(r, token, year)) - return FALSE; + return false; r.costs = costs; r.len = len; @@ -290,22 +290,22 @@ bool RuleSet::parseEntries(TQString s, int year, addRule(r); } - return TRUE; + return true; } bool RuleSet::parseTime(TQTime &t1, TQTime &t2, TQString s) { if(s.isEmpty()) { t1 = midnight(); t2 = beforeMidnight(); - return TRUE; + return true; } else { int t1m, t1h, t2m, t2h; if(sscanf(s.ascii(), "%d:%d..%d:%d", &t1h, &t1m, &t2h, &t2m) == 4) { t1.setHMS(t1h, t1m, 0); t2.setHMS(t2h, t2m, 0); - return TRUE; + return true; } else - return FALSE; + return false; } } @@ -328,17 +328,17 @@ bool RuleSet::parseLine(const TQString &s) { double after; if(!parseRate(flat_init_costs, flat_init_duration, after, token)) - return FALSE; + return false; //printf("COST %f DURATION %f\n",flat_init_costs,flat_init_duration); if(! (flat_init_costs >= 0.0) ) - return FALSE; + return false; if(! (flat_init_duration >= 0.0)) - return FALSE; + return false; have_flat_init_costs = true; - return TRUE; + return true; } @@ -348,7 +348,7 @@ bool RuleSet::parseLine(const TQString &s) { s.find(")use")-s.find("between(") - 8); TQTime t1, t2; if(!parseTime(t1, t2, token)) - return FALSE; + return false; // parse the rate fields token = s.mid(s.find("use(") + 4, @@ -357,16 +357,16 @@ bool RuleSet::parseLine(const TQString &s) { double len; double after; if(!parseRate(costs, len, after, token)) - return FALSE; + return false; // parse the days token = s.mid(s.find("on(") + 3, s.find(")betw")-s.find("on(") - 3); if(!parseEntries(token, TQDate::currentDate().year(), t1, t2, costs, len, after)) - return FALSE; + return false; - return TRUE; + return true; } // check for the name @@ -381,7 +381,7 @@ bool RuleSet::parseLine(const TQString &s) { TQString token = s.mid(9, s.length() - 10); double after; if(parseRate(default_costs, default_len, after, token)) - return TRUE; + return true; } // check for "minimum costs" @@ -395,7 +395,7 @@ bool RuleSet::parseLine(const TQString &s) { // check currency settings if(s.startsWith("currency_symbol=")) { _currency_symbol = s.mid(16); - return TRUE; + return true; } if(s.contains(TQRegExp("currency_digits=.*"))) { @@ -407,7 +407,7 @@ bool RuleSet::parseLine(const TQString &s) { // "currency_position" is deprecated so we'll simply ignore it if(s.contains(TQRegExp("currency_position=.*"))) - return TRUE; + return true; // check per connection fee if(s.contains(TQRegExp("per_connection="))) { @@ -417,7 +417,7 @@ bool RuleSet::parseLine(const TQString &s) { return ok; } - return FALSE; + return false; } void RuleSet::setStartTime(TQDateTime dt){ diff --git a/kppp/runtests.cpp b/kppp/runtests.cpp index 01e1437d..e4710d79 100644 --- a/kppp/runtests.cpp +++ b/kppp/runtests.cpp @@ -191,7 +191,7 @@ int runTests() { // Test pre-1: check if the user is allowed to dial-out if(access("/etc/kppp.allow", R_OK) == 0 && getuid() != 0) { - bool access = FALSE; + bool access = false; FILE *f; if((f = fopen("/etc/kppp.allow", "r")) != NULL) { char buf[2048]; // safe @@ -204,7 +204,7 @@ int runTests() { continue; if((uid_t)uidFromName(TQFile::encodeName(s)) == getuid()) { - access = TRUE; + access = true; fclose(f); f = NULL; } diff --git a/kppp/scriptedit.cpp b/kppp/scriptedit.cpp index 9667776d..a573d273 100644 --- a/kppp/scriptedit.cpp +++ b/kppp/scriptedit.cpp @@ -94,72 +94,72 @@ void ScriptEdit::setType(int i) { switch(i) { case Expect: se->setText(""); - se->setEnabled(TRUE); + se->setEnabled(true); break; case Send: se->setText(""); - se->setEnabled(TRUE); + se->setEnabled(true); break; case Pause: se->setText(""); - se->setEnabled(TRUE); + se->setEnabled(true); break; case Hangup: se->setText(""); - se->setEnabled(FALSE); + se->setEnabled(false); break; case Answer: se->setText(""); - se->setEnabled(FALSE); + se->setEnabled(false); break; case Timeout: se->setText(""); - se->setEnabled(TRUE); + se->setEnabled(true); break; case Password: se->setText(""); - se->setEnabled(TRUE); + se->setEnabled(true); break; case ID: se->setText(""); - se->setEnabled(TRUE); + se->setEnabled(true); break; case Prompt: se->setText(""); - se->setEnabled(TRUE); + se->setEnabled(true); break; case PWPrompt: se->setText(""); - se->setEnabled(TRUE); + se->setEnabled(true); break; case LoopStart: se->setText(""); - se->setEnabled(TRUE); + se->setEnabled(true); break; case LoopEnd: se->setText(""); - se->setEnabled(TRUE); + se->setEnabled(true); break; case Scan: se->setText(""); - se->setEnabled(TRUE); + se->setEnabled(true); break; case Save: se->setText("password"); - se->setEnabled(FALSE); + se->setEnabled(false); break; default: break; |
