summaryrefslogtreecommitdiffstats
path: root/kppp
diff options
context:
space:
mode:
Diffstat (limited to 'kppp')
-rw-r--r--kppp/accounting.cpp4
-rw-r--r--kppp/accounts.cpp2
-rw-r--r--kppp/connect.cpp46
-rw-r--r--kppp/conwindow.cpp6
-rw-r--r--kppp/kpppwidget.cpp22
-rw-r--r--kppp/logview/export.cpp2
-rw-r--r--kppp/logview/monthly.cpp48
-rw-r--r--kppp/main.cpp4
-rw-r--r--kppp/modemcmds.cpp2
-rw-r--r--kppp/modems.cpp2
-rw-r--r--kppp/pppdata.cpp6
-rw-r--r--kppp/ppplog.cpp4
-rw-r--r--kppp/pppstatdlg.cpp4
-rw-r--r--kppp/pwentry.cpp2
-rw-r--r--kppp/runtests.cpp4
15 files changed, 79 insertions, 79 deletions
diff --git a/kppp/accounting.cpp b/kppp/accounting.cpp
index a01854a0..76c5f02e 100644
--- a/kppp/accounting.cpp
+++ b/kppp/accounting.cpp
@@ -74,8 +74,8 @@ AccountingBase::AccountingBase(TQObject *parent) :
{
TQDate dt = TQDate::currentDate();
LogFileName = TQString("%1-%2.log")
- .tqarg(TQDate::shortMonthName(dt.month()))
- .tqarg(dt.year(), 4);
+ .arg(TQDate::shortMonthName(dt.month()))
+ .arg(dt.year(), 4);
LogFileName = KGlobal::dirs()->saveLocation("appdata", "Log")
+ "/" + LogFileName;
diff --git a/kppp/accounts.cpp b/kppp/accounts.cpp
index 14eb5cd4..81e44459 100644
--- a/kppp/accounts.cpp
+++ b/kppp/accounts.cpp
@@ -324,7 +324,7 @@ void AccountWidget::copyaccount() {
void AccountWidget::deleteaccount() {
TQString s = i18n("Are you sure you want to delete\nthe account \"%1\"?")
- .tqarg(accountlist_l->text(accountlist_l->currentItem()));
+ .arg(accountlist_l->text(accountlist_l->currentItem()));
if(KMessageBox::warningYesNo(this, s, i18n("Confirm"), KGuiItem(i18n("Delete"), "editdelete"), KStdGuiItem::cancel()) != KMessageBox::Yes)
return;
diff --git a/kppp/connect.cpp b/kppp/connect.cpp
index 6878d072..9343bae1 100644
--- a/kppp/connect.cpp
+++ b/kppp/connect.cpp
@@ -210,7 +210,7 @@ void ConnectWidget::init() {
comlist = &gpppdata.scriptType();
arglist = &gpppdata.script();
- TQString tit = i18n("Connecting to: %1").tqarg(gpppdata.accname());
+ TQString tit = i18n("Connecting to: %1").arg(gpppdata.accname());
setCaption(tit);
kapp->processEvents();
@@ -398,7 +398,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) {
TQStringList &plist = gpppdata.phonenumbers();
TQString bmarg= gpppdata.dialPrefix();
bmarg += *plist.at(dialnumber);
- TQString bm = i18n("Dialing %1").tqarg(bmarg);
+ TQString bm = i18n("Dialing %1").arg(bmarg);
messg->setText(bm);
emit debugMessage(bm);
@@ -434,7 +434,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) {
Modem::modem->hangup();
if(gpppdata.busyWait() > 0) {
- TQString bm = i18n("Line busy. Waiting: %1 seconds").tqarg(gpppdata.busyWait());
+ TQString bm = i18n("Line busy. Waiting: %1 seconds").arg(gpppdata.busyWait());
messg->setText(bm);
emit debugMessage(bm);
@@ -467,7 +467,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) {
timeout_timer->start(gpppdata.modemTimeout()*1000);
if(gpppdata.busyWait() > 0) {
- TQString bm = i18n("No carrier. Waiting: %1 seconds").tqarg(gpppdata.busyWait());
+ TQString bm = i18n("No carrier. Waiting: %1 seconds").arg(gpppdata.busyWait());
messg->setText(bm);
emit debugMessage(bm);
@@ -553,7 +553,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) {
}
if (scriptCommand == "Scan") {
- TQString bm = i18n("Scanning %1").tqarg(scriptArgument);
+ TQString bm = i18n("Scanning %1").arg(scriptArgument);
messg->setText(bm);
emit debugMessage(bm);
@@ -563,7 +563,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) {
}
if (scriptCommand == "Save") {
- TQString bm = i18n("Saving %1").tqarg(scriptArgument);
+ TQString bm = i18n("Saving %1").arg(scriptArgument);
messg->setText(bm);
emit debugMessage(bm);
@@ -591,10 +591,10 @@ void ConnectWidget::timerEvent(TQTimerEvent *) {
arg = arg.replace(re2, gpppdata.storedPassword());
if (scriptCommand == "Send")
- bm = bm.tqarg(scriptArgument);
+ bm = bm.arg(scriptArgument);
else {
for(uint i = 0; i < scriptArgument.length(); i++)
- bm = bm.tqarg("*");
+ bm = bm.arg("*");
}
messg->setText(bm);
@@ -606,7 +606,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) {
}
if (scriptCommand == "Expect") {
- TQString bm = i18n("Expecting %1").tqarg(scriptArgument);
+ TQString bm = i18n("Expecting %1").arg(scriptArgument);
messg->setText(bm);
emit debugMessage(bm);
@@ -620,7 +620,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) {
if (scriptCommand == "Pause") {
- TQString bm = i18n("Pause %1 seconds").tqarg(scriptArgument);
+ TQString bm = i18n("Pause %1 seconds").arg(scriptArgument);
messg->setText(bm);
emit debugMessage(bm);
@@ -637,7 +637,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) {
timeout_timer->stop();
- TQString bm = i18n("Timeout %1 seconds").tqarg(scriptArgument);
+ TQString bm = i18n("Timeout %1 seconds").arg(scriptArgument);
messg->setText(bm);
emit debugMessage(bm);
@@ -672,7 +672,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) {
}
if (scriptCommand == "ID") {
- TQString bm = i18n("ID %1").tqarg(scriptArgument);
+ TQString bm = i18n("ID %1").arg(scriptArgument);
messg->setText(bm);
emit debugMessage(bm);
@@ -708,7 +708,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) {
}
if (scriptCommand == "Password") {
- TQString bm = i18n("Password %1").tqarg(scriptArgument);
+ TQString bm = i18n("Password %1").arg(scriptArgument);
messg->setText(bm);
emit debugMessage(bm);
@@ -758,7 +758,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) {
ts.insert( vstart, scanvar );
}
- bm = bm.tqarg(ts);
+ bm = bm.arg(ts);
messg->setText(bm);
emit debugMessage(bm);
@@ -782,7 +782,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) {
}
if (scriptCommand == "PWPrompt") {
- TQString bm = i18n("PW Prompt %1").tqarg(scriptArgument);
+ TQString bm = i18n("PW Prompt %1").arg(scriptArgument);
messg->setText(bm);
emit debugMessage(bm);
@@ -807,7 +807,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) {
if (scriptCommand == "LoopStart") {
- TQString bm = i18n("Loop Start %1").tqarg(scriptArgument);
+ TQString bm = i18n("Loop Start %1").arg(scriptArgument);
// The incrementing of the scriptindex MUST be before the
// call to setExpect otherwise the expect will miss a string that is
@@ -832,9 +832,9 @@ void ConnectWidget::timerEvent(TQTimerEvent *) {
}
if (scriptCommand == "LoopEnd") {
- TQString bm = i18n("Loop End %1").tqarg(scriptArgument);
+ TQString bm = i18n("Loop End %1").arg(scriptArgument);
if ( loopnest <= 0 ) {
- bm = i18n("LoopEnd without matching Start. Line: %1").tqarg(bm);
+ bm = i18n("LoopEnd without matching Start. Line: %1").arg(bm);
vmain=20;
cancelbutton();
KMessageBox::error(0, bm);
@@ -1003,7 +1003,7 @@ void ConnectWidget::checkBuffers() {
scanvar = scanvar.stripWhiteSpace();
// Show the Variabel content in the debug window
- TQString sv = i18n("Scan Var: %1").tqarg(scanvar);
+ TQString sv = i18n("Scan Var: %1").arg(scanvar);
emit debugMessage(sv);
}
@@ -1013,7 +1013,7 @@ void ConnectWidget::checkBuffers() {
// keep everything after the expected string
readbuffer.remove(0, readbuffer.find(expectstr) + expectstr.length());
- TQString ts = i18n("Found: %1").tqarg(expectstr);
+ TQString ts = i18n("Found: %1").arg(expectstr);
emit debugMessage(ts);
if (loopend) {
@@ -1024,7 +1024,7 @@ void ConnectWidget::checkBuffers() {
if (loopend && readbuffer.contains(loopstr[loopnest])) {
expecting = false;
readbuffer = "";
- TQString ts = i18n("Looping: %1").tqarg(loopstr[loopnest]);
+ TQString ts = i18n("Looping: %1").arg(loopstr[loopnest]);
emit debugMessage(ts);
scriptindex = loopstartindex[loopnest];
loopend = false;
@@ -1117,7 +1117,7 @@ void ConnectWidget::setScan(const TQString &n) {
scanstr = n;
scanbuffer = "";
- TQString ts = i18n("Scanning: %1").tqarg(n);
+ TQString ts = i18n("Scanning: %1").arg(n);
emit debugMessage(ts);
}
@@ -1126,7 +1126,7 @@ void ConnectWidget::setExpect(const TQString &n) {
expecting = true;
expectstr = n;
- TQString ts = i18n("Expecting: %1").tqarg(n);
+ TQString ts = i18n("Expecting: %1").arg(n);
ts.replace(TQRegExp("\n"), "<LF>");
emit debugMessage(ts);
diff --git a/kppp/conwindow.cpp b/kppp/conwindow.cpp
index a657fd2c..8f2c8a89 100644
--- a/kppp/conwindow.cpp
+++ b/kppp/conwindow.cpp
@@ -264,12 +264,12 @@ void ConWindow::timeclick() {
TQString tooltip = i18n("Connection: %1\n"
"Connected at: %2\n"
"Time connected: %3")
- .tqarg(gpppdata.accname()).tqarg(info2->text())
- .tqarg(time_string2);
+ .arg(gpppdata.accname()).arg(info2->text())
+ .arg(time_string2);
if(accountingEnabled)
tooltip += i18n("\nSession Bill: %1\nTotal Bill: %2")
- .tqarg(session_bill->text()).tqarg(total_bill->text());
+ .arg(session_bill->text()).arg(total_bill->text());
// volume accounting
if(volumeAccountingEnabled) {
diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp
index 4c287be6..4d2d162c 100644
--- a/kppp/kpppwidget.cpp
+++ b/kppp/kpppwidget.cpp
@@ -305,7 +305,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name )
bool result = gpppdata.setModem(m_strCmdlModem);
if (!result){
TQString string;
- string = i18n("No such Modem:\n%1\nFalling back to default").tqarg(m_strCmdlModem);
+ string = i18n("No such Modem:\n%1\nFalling back to default").arg(m_strCmdlModem);
KMessageBox::error(this, string);
m_bCmdlModem = false;
}
@@ -315,7 +315,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name )
bool result = gpppdata.setAccount(m_strCmdlAccount);
if (!result){
TQString string;
- string = i18n("No such Account:\n%1").tqarg(m_strCmdlAccount);
+ string = i18n("No such Account:\n%1").arg(m_strCmdlAccount);
KMessageBox::error(this, string);
m_bCmdlAccount = false;
show();
@@ -515,7 +515,7 @@ void KPPPWidget::resetmodems() {
}
label7->setShown(m_bModemCShown);
modem_c->setShown(m_bModemCShown);
- tqlayout()->tqinvalidate();
+ tqlayout()->invalidate();
setFixedSize(sizeHint());
//set the default modem
@@ -619,12 +619,12 @@ void KPPPWidget::sigPPPDDied() {
msg = i18n("<p>The pppd daemon died unexpectedly!</p>");
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>Exit status: %1").arg(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>")
- .tqarg("http://developer.kde.org/~kppp/index.html")
- .tqarg("http://developer.kde.org/~kppp/index.html");
+ .arg("http://developer.kde.org/~kppp/index.html")
+ .arg("http://developer.kde.org/~kppp/index.html");
}
}
@@ -715,7 +715,7 @@ void KPPPWidget::beginConnect() {
string = i18n("kppp cannot execute:\n %1\n"
"Please make sure that you have given kppp "
"setuid permission and that "
- "pppd is executable.").tqarg(gpppdata.pppdPath());
+ "pppd is executable.").arg(gpppdata.pppdPath());
KMessageBox::error(this, string);
return;
@@ -737,7 +737,7 @@ void KPPPWidget::beginConnect() {
"your modem device properly "
"and/or adjust the location of the modem device on "
"the modem tab of "
- "the setup dialog.").tqarg(device);
+ "the setup dialog.").arg(device);
KMessageBox::error(this, string);
return;
}
@@ -760,7 +760,7 @@ void KPPPWidget::beginConnect() {
encodeWord(gpppdata.password()))) {
TQString s;
s = i18n("Cannot create PAP/CHAP authentication\n"
- "file \"%1\"").tqarg(PAP_AUTH_FILE);
+ "file \"%1\"").arg(PAP_AUTH_FILE);
KMessageBox::error(this, s);
return;
}
@@ -775,7 +775,7 @@ void KPPPWidget::beginConnect() {
hide();
- TQString tit = i18n("Connecting to: %1").tqarg(gpppdata.accname());
+ TQString tit = i18n("Connecting to: %1").arg(gpppdata.accname());
con->setCaption(tit);
con->enableButtons();
con->show();
@@ -922,7 +922,7 @@ void KPPPWidget::startAccounting() {
if(!acct->loadRuleSet(gpppdata.accountingFile())) {
TQString s= i18n("Can not load the accounting "
- "ruleset \"%1\".").tqarg(gpppdata.accountingFile());
+ "ruleset \"%1\".").arg(gpppdata.accountingFile());
// starting the messagebox with a timer will prevent us
// from blocking the calling function ConnectWidget::timerEvent
diff --git a/kppp/logview/export.cpp b/kppp/logview/export.cpp
index a3d55686..f236be50 100644
--- a/kppp/logview/export.cpp
+++ b/kppp/logview/export.cpp
@@ -219,7 +219,7 @@ void CSVExport::setFinishCode() {
/***** HTMLExport *****/
HTMLExport::HTMLExport(const TQString &filename, const TQString &date)
: Export(filename) {
- TQString title = i18n("Connection log for %1").tqarg(date);
+ TQString title = i18n("Connection log for %1").arg(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::fromLatin1(" <meta http-equiv=\"Content-Type\" content=\"text/html; charset=")
diff --git a/kppp/logview/monthly.cpp b/kppp/logview/monthly.cpp
index 030cd3ba..fee59878 100644
--- a/kppp/logview/monthly.cpp
+++ b/kppp/logview/monthly.cpp
@@ -38,9 +38,9 @@ static void formatBytes(double bytes, TQString &result) {
if(bytes < 1024)
result.setNum(bytes);
else if(bytes < 1024*1024)
- result = i18n("%1 KB").tqarg(KGlobal::locale()->formatNumber((float)bytes / 1024.0, 1));
+ result = i18n("%1 KB").arg(KGlobal::locale()->formatNumber((float)bytes / 1024.0, 1));
else
- result = i18n("%1 MB").tqarg(KGlobal::locale()->formatNumber((float)bytes / 1024.0 / 1024.0, 1));
+ result = i18n("%1 MB").arg(KGlobal::locale()->formatNumber((float)bytes / 1024.0 / 1024.0, 1));
}
static void formatBytesMonth(double bytes, TQString &result) {
@@ -54,23 +54,23 @@ static void formatBytesMonth(double bytes, TQString &result) {
if(bytes < 1024)
result.setNum(bytes);
else if(bytes < 1024*1024)
- result = i18n("%1 KB").tqarg(KGlobal::locale()->formatNumber((float)bytes / 1024.0, 1));
+ result = i18n("%1 KB").arg(KGlobal::locale()->formatNumber((float)bytes / 1024.0, 1));
else
- result = i18n("%1 MB").tqarg(KGlobal::locale()->formatNumber((float)bytes / 1024.0 / 1024.0, 1));
+ result = i18n("%1 MB").arg(KGlobal::locale()->formatNumber((float)bytes / 1024.0 / 1024.0, 1));
}
static void formatDuration(int seconds, TQString &result) {
TQString sec;
sec.sprintf("%02d", seconds%60);
if(seconds < 60)
- result = i18n("%1s").tqarg(sec);
+ result = i18n("%1s").arg(sec);
else if(seconds < 3600)
- result = i18n("%1m %2s").tqarg(seconds/60).tqarg(sec);
+ result = i18n("%1m %2s").arg(seconds/60).arg(sec);
else
result = i18n("%1h %2m %3s")
- .tqarg(seconds/3600)
- .tqarg((seconds % 3600)/60)
- .tqarg(sec);
+ .arg(seconds/3600)
+ .arg((seconds % 3600)/60)
+ .arg(sec);
}
static void formatDurationMonth(int seconds, TQString &result) {
@@ -84,14 +84,14 @@ static void formatDurationMonth(int seconds, TQString &result) {
TQString sec;
sec.sprintf("%02d", seconds%60);
if(seconds < 60)
- result = i18n("%1s").tqarg(sec);
+ result = i18n("%1s").arg(sec);
else if(seconds < 3600)
- result = i18n("%1m %2s").tqarg(seconds/60).tqarg(sec);
+ result = i18n("%1m %2s").arg(seconds/60).arg(sec);
else
result = i18n("%1h %2m %3s")
- .tqarg(seconds/3600)
- .tqarg((seconds % 3600)/60)
- .tqarg(sec);
+ .arg(seconds/3600)
+ .arg((seconds % 3600)/60)
+ .arg(sec);
}
static void costsMonth(double costs, double &result) {
@@ -117,7 +117,7 @@ public:
{
}
virtual void paintCell( TQPainter *p, const TQColorGroup & cg,
- int column, int width, int tqalignment );
+ int column, int width, int alignment );
virtual TQString key(int, bool) const;
@@ -125,9 +125,9 @@ public:
};
void LogListItem::paintCell( TQPainter *p, const TQColorGroup & cg,
- int column, int width, int tqalignment )
+ int column, int width, int alignment )
{
- TQListViewItem::paintCell(p, cg, column, width, tqalignment);
+ TQListViewItem::paintCell(p, cg, column, width, alignment);
// double line above sum
//if(!li) {
@@ -426,13 +426,13 @@ void MonthlyWidget::plotMonth() {
if(lv->childCount() > 0) {
exportBttn->setEnabled(true); // export possibility
t = i18n("Connection log for %1 %2")
- .tqarg(calendar->monthName(startDate))
- .tqarg(calendar->year(startDate));
+ .arg(calendar->monthName(startDate))
+ .arg(calendar->year(startDate));
} else {
exportBttn->setEnabled(false); // nothing to export
t = i18n("No connection log for %1 %2 available")
- .tqarg(calendar->monthName(startDate))
- .tqarg(calendar->year(startDate));
+ .arg(calendar->monthName(startDate))
+ .arg(calendar->year(startDate));
}
title->setText(t);
@@ -465,8 +465,8 @@ void MonthlyWidget::currentMonth() {
void MonthlyWidget::exportWizard() {
const KCalendarSystem * calendar = KGlobal::locale()->calendar();
TQString date = TQString::fromLatin1("%1-%2") // e.g.: June-2001
- .tqarg(calendar->monthName(periodeFirst()))
- .tqarg(calendar->year(periodeFirst()));
+ .arg(calendar->monthName(periodeFirst()))
+ .arg(calendar->year(periodeFirst()));
ExportWizard *wizard = new ExportWizard(0, date);
wizard->exec();
@@ -598,7 +598,7 @@ void MonthlyWidget::exportWizard() {
TQString datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true);
exportIFace->addEmptyLine();
- exportIFace->addDataline(i18n("Monthly estimates (%1)").tqarg(datetime),
+ exportIFace->addDataline(i18n("Monthly estimates (%1)").arg(datetime),
TQString(), TQString(), TQString(), m_duration, m_costs, m_bin, m_bout);
}
diff --git a/kppp/main.cpp b/kppp/main.cpp
index b6bb6c57..753291ba 100644
--- a/kppp/main.cpp
+++ b/kppp/main.cpp
@@ -241,7 +241,7 @@ int main( int argc, char **argv ) {
KGlobal::dirs()->saveLocation("appdata", "Rules");
int pid = create_pidfile();
- TQString err_msg = i18n("kppp can't create or read from\n%1.").tqarg(pidfile);
+ TQString err_msg = i18n("kppp can't create or read from\n%1.").arg(pidfile);
if(pid < 0) {
KMessageBox::error(0L, err_msg);
@@ -281,7 +281,7 @@ int main( int argc, char **argv ) {
"Alternatively, if you have determined that "
"there is no other kppp running, please "
"click Continue to begin.")
- .tqarg(pidfile).tqarg(pid);
+ .arg(pidfile).arg(pid);
int button = KMessageBox::warningYesNo(0, msg, i18n("Error"),
i18n("Exit"), KStdGuiItem::cont());
if (button == KMessageBox::Yes) /* exit */
diff --git a/kppp/modemcmds.cpp b/kppp/modemcmds.cpp
index b980a729..69103683 100644
--- a/kppp/modemcmds.cpp
+++ b/kppp/modemcmds.cpp
@@ -83,7 +83,7 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name)
for(int i = 0; i < PPPData::NumInitStrings; i++) {
initstr[i] = new TQLineEdit(dummyWidget);
- TQLabel *initLabel = new TQLabel(i18n("Initialization string %1:").tqarg(i + 1),
+ TQLabel *initLabel = new TQLabel(i18n("Initialization string %1:").arg(i + 1),
dummyWidget);
ADJUSTEDIT(initstr[i]);
l1->addWidget(initLabel, row, 1);
diff --git a/kppp/modems.cpp b/kppp/modems.cpp
index 27a8b4b5..42e82049 100644
--- a/kppp/modems.cpp
+++ b/kppp/modems.cpp
@@ -190,7 +190,7 @@ void ModemsWidget::copymodem() {
void ModemsWidget::deletemodem() {
TQString s = i18n("Are you sure you want to delete\nthe modem \"%1\"?")
- .tqarg(modemlist_l->text(modemlist_l->currentItem()));
+ .arg(modemlist_l->text(modemlist_l->currentItem()));
if(KMessageBox::warningContinueCancel(this, s, i18n("Confirm"), KStdGuiItem::del()) != KMessageBox::Continue)
return;
diff --git a/kppp/pppdata.cpp b/kppp/pppdata.cpp
index ceb8298b..a983a8b4 100644
--- a/kppp/pppdata.cpp
+++ b/kppp/pppdata.cpp
@@ -350,7 +350,7 @@ void PPPData::set_dock_into_panel(bool set) {
TQString PPPData::pppdVersion() {
- return TQString("%1.%2.%3").tqarg(pppdVer).tqarg(pppdMod).tqarg(pppdPatch);
+ return TQString("%1.%2.%3").arg(pppdVer).arg(pppdMod).arg(pppdPatch);
}
bool PPPData::pppdVersionMin(int ver, int mod, int patch) {
@@ -498,7 +498,7 @@ int PPPData::copymodem(int i) {
TQMap <TQString, TQString> map = config->entryMap(cmodemgroup);
TQMap <TQString, TQString>::ConstIterator it = map.begin();
- TQString newname = i18n("%1_copy").tqarg(modname());
+ TQString newname = i18n("%1_copy").arg(modname());
newmodem();
@@ -1026,7 +1026,7 @@ int PPPData::copyaccount(int i) {
TQMap <TQString, TQString> map = config->entryMap(caccountgroup);
TQMap <TQString, TQString>::ConstIterator it = map.begin();
- TQString newname = i18n("%1_copy").tqarg(accname());
+ TQString newname = i18n("%1_copy").arg(accname());
newaccount();
diff --git a/kppp/ppplog.cpp b/kppp/ppplog.cpp
index 0c62b152..a98a9390 100644
--- a/kppp/ppplog.cpp
+++ b/kppp/ppplog.cpp
@@ -171,7 +171,7 @@ void PPPL_AnalyseLog(TQStringList &list, TQStringList &result) {
if(!str.isEmpty()) {
msg = i18n("Notice that the remote system has sent the following"
" message:\n\"%1\"\nThis may give you a hint why the"
- " the connection has failed.").tqarg(str);
+ " the connection has failed.").arg(str);
result.append(msg);
}
}
@@ -281,7 +281,7 @@ void PPPL_ShowLog() {
fclose(f);
umask(old_umask);
- TQString msg = i18n("The PPP log has been saved\nas \"%1\"!\n\nIf you want to send a bug report, or have\nproblems connecting to the Internet, please\nattach this file. It will help the maintainers\nto find the bug and to improve KPPP").tqarg(s);
+ TQString msg = i18n("The PPP log has been saved\nas \"%1\"!\n\nIf you want to send a bug report, or have\nproblems connecting to the Internet, please\nattach this file. It will help the maintainers\nto find the bug and to improve KPPP").arg(s);
KMessageBox::information(0, msg);
}
delete dlg;
diff --git a/kppp/pppstatdlg.cpp b/kppp/pppstatdlg.cpp
index 2d12a88e..9a39746b 100644
--- a/kppp/pppstatdlg.cpp
+++ b/kppp/pppstatdlg.cpp
@@ -290,8 +290,8 @@ void PPPStatsDlg::paintGraph() {
TQRect r;
TQString s = i18n("%1 (max. %2) kb/sec")
- .tqarg(KGlobal::locale()->formatNumber((float)last_max / 1024.0, 1))
- .tqarg(KGlobal::locale()->formatNumber((float)max / 1024.0, 1));
+ .arg(KGlobal::locale()->formatNumber((float)last_max / 1024.0, 1))
+ .arg(KGlobal::locale()->formatNumber((float)max / 1024.0, 1));
p.drawText(0, 0, pm.width(), 2*8, AlignRight|AlignVCenter, s, -1, &r);
p.drawLine(0, 8, r.left() - 8, 8);
diff --git a/kppp/pwentry.cpp b/kppp/pwentry.cpp
index c3025762..270b4b72 100644
--- a/kppp/pwentry.cpp
+++ b/kppp/pwentry.cpp
@@ -36,7 +36,7 @@ PWEntry::PWEntry( TQWidget *parent, const char *name )
if(parent){
TQPoint point = mapToGlobal (TQPoint (0,0));
- TQRect pos = tqgeometry();
+ TQRect pos = geometry();
setGeometry(point.x() + pos.width()/2 - 300/2,
point.y() + pos.height()/2 - 90/2,
diff --git a/kppp/runtests.cpp b/kppp/runtests.cpp
index 23f2196d..a520d116 100644
--- a/kppp/runtests.cpp
+++ b/kppp/runtests.cpp
@@ -253,7 +253,7 @@ int runTests() {
i18n("You don't have sufficient permission to run\n"
"%1\n"
"Please make sure that kppp is owned by root "
- "and has the SUID bit set.").tqarg(f));
+ "and has the SUID bit set.").arg(f));
warning++;
}
}
@@ -265,7 +265,7 @@ int runTests() {
TQString msgstr = i18n("%1 is missing or can't be read!\n"
"Ask your system administrator to create "
"this file (can be empty) with appropriate "
- "read and write permissions.").tqarg(file);
+ "read and write permissions.").arg(file);
KMessageBox::error(0, msgstr);
warning ++;
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-11 16:52:57 +0000