[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdenetwork/kppp
From: Arto Hytönen <amthpublic () gmail ! com>
Date: 2007-08-25 18:53:51
Message-ID: 1188068031.779281.8673.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 704673 by amth:
TRUE/FALSE -> true/false fixes
M +9 -10 accounting.cpp
M +1 -1 accounting.h
M +15 -15 accounts.cpp
M +2 -2 connect.cpp
M +1 -1 conwindow.cpp
M +1 -1 loginterm.cpp
M +2 -2 logview/monthly.cpp
M +1 -1 miniterm.cpp
M +1 -1 modeminfo.cpp
M +2 -2 pppdata.cpp
M +3 -3 ppplog.cpp
M +3 -3 pwentry.cpp
M +24 -24 ruleset.cpp
M +2 -2 runtests.cpp
M +14 -19 scriptedit.cpp
--- trunk/KDE/kdenetwork/kppp/accounting.cpp #704672:704673
@@ -176,9 +176,9 @@
gpppdata.setTotalCosts(val);
gpppdata.save();
- return TRUE;
+ return true;
} else
- return FALSE;
+ return false;
}
@@ -194,7 +194,7 @@
_total = 0.0;
}
- return TRUE;
+ return true;
}
@@ -296,7 +296,7 @@
s += ':';
s += rules.currencySymbol();
- logMessage(s, TRUE);
+ logMessage(s, true);
}
}
@@ -317,7 +317,7 @@
stats->ibytes,
stats->obytes);
- logMessage(s, FALSE);
+ logMessage(s, false);
saveCosts();
}
}
@@ -327,7 +327,7 @@
if (name.isEmpty()) {
rules.load(""); // delete old rules
- return TRUE;
+ return true;
}
QString d = AccountingBase::getAccountingFile(name);
@@ -339,7 +339,7 @@
return (bool)(ret == 0);
}
- return FALSE;
+ return false;
}
@@ -455,7 +455,7 @@
s += ':';
s += currency;
- logMessage(s, TRUE);
+ logMessage(s, true);
}
@@ -473,10 +473,9 @@
stats->ibytes,
stats->obytes);
- logMessage(s, FALSE);
+ logMessage(s, false);
saveCosts();
}
}
#include "accounting.moc"
-
--- trunk/KDE/kdenetwork/kppp/accounting.h #704672:704673
@@ -59,7 +59,7 @@
void changed(QString total, QString session);
protected:
- void logMessage(QString, bool = FALSE);
+ void logMessage(QString, bool = false);
bool saveCosts();
bool loadCosts();
--- trunk/KDE/kdenetwork/kppp/accounts.cpp #704672:704673
@@ -115,13 +115,13 @@
l12->addLayout(l121);
l121->addStretch(1);
costlabel = new QLabel(i18n("Phone costs:"), parent);
- costlabel->setEnabled(FALSE);
+ costlabel->setEnabled(false);
l121->addWidget(costlabel);
costedit = new QLineEdit(parent);
costedit->setFocusPolicy(Qt::NoFocus);
costedit->setFixedHeight(costedit->sizeHint().height());
- costedit->setEnabled(FALSE);
+ costedit->setEnabled(false);
l121->addWidget(costedit);
l121->addStretch(1);
QString tmp = i18n("<p>This shows the accumulated phone costs\n"
@@ -134,14 +134,14 @@
costedit->setWhatsThis( tmp);
vollabel = new QLabel(i18n("Volume:"), parent);
- vollabel->setEnabled(FALSE);
+ vollabel->setEnabled(false);
l121->addWidget(vollabel);
voledit = new QLineEdit(parent);
voledit->setObjectName( "voledit" );
voledit->setFocusPolicy(Qt::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"
@@ -159,7 +159,7 @@
l122->addStretch(1);
reset = new QPushButton(i18n("&Reset..."), parent);
- reset->setEnabled(FALSE);
+ reset->setEnabled(false);
connect(reset, SIGNAL(clicked()),
this, SLOT(resetClicked()));
l122->addWidget(reset);
@@ -192,24 +192,24 @@
if(idx!=-1) {
QString 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);
}
}
--- trunk/KDE/kdenetwork/kppp/connect.cpp #704672:704673
@@ -1408,7 +1408,7 @@
dot=new_hostname.indexOf('.');
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);
@@ -1551,7 +1551,7 @@
if ( modified_hostname ) {
Requester::rq->setHostname(old_hostname);
- modified_hostname = FALSE;
+ modified_hostname = false;
}
}
--- trunk/KDE/kdenetwork/kppp/conwindow.cpp #704672:704673
@@ -282,7 +282,7 @@
// volume accounting
if(volumeAccountingEnabled) {
- volinfo->setEnabled(TRUE);
+ volinfo->setEnabled(true);
int bytes = gpppdata.totalBytes();
volinfo->setText(prettyPrintVolume(bytes));
}
--- trunk/KDE/kdenetwork/kppp/loginterm.cpp #704672:704673
@@ -67,7 +67,7 @@
insertPlainText(QString("\n"));
#if 0
- Q3MultiLineEdit::end(FALSE);
+ Q3MultiLineEdit::end(false);
Q3MultiLineEdit::newLine();
#endif
p_kppp->debugwindow->addChar('\n');
--- trunk/KDE/kdenetwork/kppp/logview/monthly.cpp #704672:704673
@@ -225,7 +225,7 @@
title = new QLabel("X", this);
QFont f = title->font();
f.setPointSize(f.pointSize() + 2);
- f.setBold(TRUE);
+ f.setBold(true);
title->setFont(f);
title->setFixedHeight(title->sizeHint().height()*2);
@@ -268,7 +268,7 @@
l->setText(i18n("Statistics:"));
QFont f2 = l->font();
f2.setPointSize(f2.pointSize() + 1);
- f2.setBold(TRUE);
+ f2.setBold(true);
l->setFont(f2);
l->setFixedHeight(l->sizeHint().height());
l->setAlignment( Qt::AlignLeft );
--- trunk/KDE/kdenetwork/kppp/miniterm.cpp #704672:704673
@@ -276,7 +276,7 @@
void MyTerm::mynewline() {
- Q3MultiLineEdit::end(FALSE);
+ Q3MultiLineEdit::end(false);
Q3MultiLineEdit::newLine();
}
--- trunk/KDE/kdenetwork/kppp/modeminfo.cpp #704672:704673
@@ -290,7 +290,7 @@
QHBoxLayout *l2 = new QHBoxLayout;
QPushButton *ok = new KPushButton(KStandardGuiItem::close(), this);
- ok->setDefault(TRUE);
+ ok->setDefault(true);
ok->setFocus();
tl->addLayout(l2);
--- trunk/KDE/kdenetwork/kppp/pppdata.cpp #704672:704673
@@ -315,7 +315,7 @@
bool PPPData::automatic_redial() {
- return (bool) readNumConfig(GENERAL_GRP, AUTOREDIAL_KEY, FALSE);
+ return (bool) readNumConfig(GENERAL_GRP, AUTOREDIAL_KEY, false);
}
@@ -325,7 +325,7 @@
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);
}
--- trunk/KDE/kdenetwork/kppp/ppplog.cpp #704672:704673
@@ -220,7 +220,7 @@
"Shall I turn it on now?"), QString(), KGuiItem(i18n("Restart pppd")), \
KGuiItem(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 "
@@ -242,10 +242,10 @@
tl->setSpacing(10);
tl->setMargin(10);
QTextEdit *edit = new QTextEdit(dlg);
- edit->setReadOnly(TRUE);
+ edit->setReadOnly(true);
QLabel *label = new QLabel(i18n("kppp's diagnosis (just guessing):"), dlg);
QTextEdit *diagnosis = new QTextEdit(dlg);
- diagnosis->setReadOnly(TRUE);
+ diagnosis->setReadOnly(true);
edit->setMinimumSize(600, 250);
label->setMinimumSize(600, 15);
diagnosis->setMinimumSize(600, 60);
--- trunk/KDE/kdenetwork/kppp/pwentry.cpp #704672:704673
@@ -63,7 +63,7 @@
pw->setEchoMode( QLineEdit::Password );
connect( pw, SIGNAL(returnPressed()), this, SLOT(hide()) );
- isconsumed = TRUE;
+ isconsumed = true;
}
QString PWEntry::text() { return (pw->text()); }
@@ -103,7 +103,7 @@
void PWEntry::show() {
pw->setText("");
- isconsumed = FALSE;
+ isconsumed = false;
QWidget::show();
}
@@ -112,7 +112,7 @@
}
void PWEntry::setConsumed() {
- isconsumed = TRUE;
+ isconsumed = true;
}
void PWEntry::hide() {
--- trunk/KDE/kdenetwork/kppp/ruleset.cpp #704672:704673
@@ -190,7 +190,7 @@
ret.type = 1;
ret.date.from = QDate(year, m, d);
ret.date.until = QDate(year, m, d);
- return TRUE;
+ return true;
}
if(s.contains(QRegExp("^[0-9]+\\.[0-9]+$"))) {
@@ -199,7 +199,7 @@
ret.type = 1;
ret.date.from = QDate(year, m, d);
ret.date.until = QDate(year, m, d);
- return TRUE;
+ return true;
}
if(s.right(3) == "day") {
@@ -208,14 +208,14 @@
ret.type = 2;
ret.weekday.from = d;
ret.weekday.until = d;
- return TRUE;
+ return true;
}
}
if(s.left(6) == "easter") {
QDate d = get_easter(year);
int off;
- bool ok = TRUE;
+ bool ok = true;
QString val = s.mid(6, 1000);
if(val.isEmpty())
off = 0;
@@ -227,12 +227,12 @@
ret.type = 1;
ret.date.from = d;
ret.date.until = d;
- return TRUE;
+ return true;
}
}
ret.type = 0;
- return FALSE;
+ return false;
}
@@ -277,11 +277,11 @@
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;
@@ -291,22 +291,22 @@
addRule(r);
}
- return TRUE;
+ return true;
}
bool RuleSet::parseTime(QTime &t1, QTime &t2, QString s) {
if(s.isEmpty()) {
t1 = midnight();
t2 = beforeMidnight();
- return TRUE;
+ return true;
} else {
int t1m, t1h, t2m, t2h;
if(sscanf(s.toAscii(), "%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;
}
}
@@ -329,17 +329,17 @@
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;
}
@@ -349,7 +349,7 @@
s.indexOf(")use")-s.indexOf("between(") - 8);
QTime t1, t2;
if(!parseTime(t1, t2, token))
- return FALSE;
+ return false;
// parse the rate fields
token = s.mid(s.indexOf("use(") + 4,
@@ -358,16 +358,16 @@
double len;
double after;
if(!parseRate(costs, len, after, token))
- return FALSE;
+ return false;
// parse the days
token = s.mid(s.indexOf("on(") + 3,
s.indexOf(")betw")-s.indexOf("on(") - 3);
if(!parseEntries(token, QDate::currentDate().year(),
t1, t2, costs, len, after))
- return FALSE;
+ return false;
- return TRUE;
+ return true;
}
// check for the name
@@ -382,7 +382,7 @@
QString 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"
@@ -396,7 +396,7 @@
// check currency settings
if(s.startsWith("currency_symbol=")) {
_currency_symbol = s.mid(16);
- return TRUE;
+ return true;
}
if(s.contains(QRegExp("currency_digits=.*"))) {
@@ -408,7 +408,7 @@
// "currency_position" is deprecated so we'll simply ignore it
if(s.contains(QRegExp("currency_position=.*")))
- return TRUE;
+ return true;
// check per connection fee
if(s.contains(QRegExp("per_connection="))) {
@@ -418,7 +418,7 @@
return ok;
}
- return FALSE;
+ return false;
}
void RuleSet::setStartTime(QDateTime dt){
--- trunk/KDE/kdenetwork/kppp/runtests.cpp #704672:704673
@@ -191,7 +191,7 @@
// 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 @@
continue;
if((uid_t)uidFromName(QFile::encodeName(s)) == getuid()) {
- access = TRUE;
+ access = true;
fclose(f);
f = NULL;
}
--- trunk/KDE/kdenetwork/kppp/scriptedit.cpp #704672:704673
@@ -100,72 +100,72 @@
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;
@@ -173,8 +173,3 @@
}
#include "scriptedit.moc"
-
-
-
-
-
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic