From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 00:30:31 +0000 Subject: TQt4 port kdenetwork This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kppp/ppplog.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'kppp/ppplog.cpp') diff --git a/kppp/ppplog.cpp b/kppp/ppplog.cpp index 96ccaa34..597cd53d 100644 --- a/kppp/ppplog.cpp +++ b/kppp/ppplog.cpp @@ -163,7 +163,7 @@ void PPPL_AnalyseLog(TQStringList &list, TQStringList &result) { for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { // look for remote message - int pos = (*it).find(rmsg); + int pos = (*it).tqfind(rmsg); if (pos != -1) { TQString str = (*it); @@ -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.").arg(str); + " the connection has failed.").tqarg(str); result.append(msg); } } @@ -180,7 +180,7 @@ void PPPL_AnalyseLog(TQStringList &list, TQStringList &result) { for(uint k = 0; hints[k].regexp != 0; k++) { TQRegExp rx(hints[k].regexp); TQString l(*it); - if(l.contains(rx)) { + if(l.tqcontains(rx)) { result.append(i18n(hints[k].answer)); break; } @@ -202,15 +202,15 @@ void PPPL_ShowLog() { bool foundConnect = false; bool foundLCP = gpppdata.getPPPDebug(); - TQString lcp = TQString::fromLatin1("[LCP"); - TQString conn = TQString::fromLatin1("Connect:"); + TQString lcp = TQString::tqfromLatin1("[LCP"); + TQString conn = TQString::tqfromLatin1("Connect:"); TQStringList::ConstIterator it = sl.begin(); for( ; it != sl.end(); it++) { - if((*it).find(lcp) >= 0) { + if((*it).tqfind(lcp) >= 0) { foundLCP = true; break; } - if((*it).find(conn) >= 0) + if((*it).tqfind(conn) >= 0) foundConnect = true; } if(foundConnect && !foundLCP) { @@ -219,7 +219,7 @@ void PPPL_ShowLog() { "that pppd was started without the \"debug\" option.\n" "Without this option it's difficult to find out PPP " "problems, so you should turn on the debug option.\n" - "Shall I turn it on now?"), TQString::null, i18n("Restart pppd"), i18n("Do Not Restart")); + "Shall I turn it on now?"), TQString(), i18n("Restart pppd"), i18n("Do Not Restart")); if(result == KMessageBox::Yes) { gpppdata.setPPPDebug(TRUE); @@ -249,7 +249,7 @@ void PPPL_ShowLog() { bbox->addStretch(1); TQPushButton *write = bbox->addButton(i18n("Write to File")); TQPushButton *close = bbox->addButton(KStdGuiItem::close()); - bbox->layout(); + bbox->tqlayout(); edit->setMinimumSize(600, 250); label->setMinimumSize(600, 15); diagnosis->setMinimumSize(600, 60); @@ -258,7 +258,7 @@ void PPPL_ShowLog() { tl->addWidget(label); tl->addWidget(diagnosis, 1); tl->addWidget(bbox); - dlg->setFixedSize(dlg->sizeHint()); + dlg->setFixedSize(dlg->tqsizeHint()); for(uint i = 0; i < sl.count(); i++) edit->append(*sl.at(i)); @@ -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").arg(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").tqarg(s); KMessageBox::information(0, msg); } delete dlg; -- cgit v1.2.1