From 1de96857f5b0ed5d4a36e9486ffc8c7f8c802f98 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:58:08 -0600 Subject: Remove additional unneeded tq method conversions --- kpf/src/ActiveMonitorItem.cpp | 2 +- kpf/src/ActiveMonitorWindow.cpp | 2 +- kpf/src/AppletItem.cpp | 2 +- kpf/src/BandwidthGraph.cpp | 8 ++++---- kpf/src/BandwidthGraph.h | 4 ++-- kpf/src/DirectoryLister.cpp | 6 +++--- kpf/src/ErrorMessageConfigDialog.cpp | 2 +- kpf/src/PropertiesDialogPlugin.cpp | 2 +- kpf/src/Response.cpp | 6 +++--- kpf/src/ServerWizard.cpp | 4 ++-- kpf/src/SingleServerConfigDialog.cpp | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) (limited to 'kpf') diff --git a/kpf/src/ActiveMonitorItem.cpp b/kpf/src/ActiveMonitorItem.cpp index 217e437c..1fe889d1 100644 --- a/kpf/src/ActiveMonitorItem.cpp +++ b/kpf/src/ActiveMonitorItem.cpp @@ -178,7 +178,7 @@ namespace KPF sent_ += l; setText(Sent, TQString::number(sent_)); updateState(); - tqrepaint(); + repaint(); } } diff --git a/kpf/src/ActiveMonitorWindow.cpp b/kpf/src/ActiveMonitorWindow.cpp index 238ddefa..0e0450b4 100644 --- a/kpf/src/ActiveMonitorWindow.cpp +++ b/kpf/src/ActiveMonitorWindow.cpp @@ -39,7 +39,7 @@ namespace KPF ) : KMainWindow(parent, name) { - setCaption(i18n("Monitoring %1 - kpf").tqarg(server->root())); + setCaption(i18n("Monitoring %1 - kpf").arg(server->root())); monitor_ = new ActiveMonitor(server, this, "ActiveMonitor"); diff --git a/kpf/src/AppletItem.cpp b/kpf/src/AppletItem.cpp index e5d3dc51..489b2036 100644 --- a/kpf/src/AppletItem.cpp +++ b/kpf/src/AppletItem.cpp @@ -62,7 +62,7 @@ namespace KPF (new TQVBoxLayout(this))->addWidget(graph_); - TQString popupTitle(i18n("kpf - %1").tqarg(server_->root())); + TQString popupTitle(i18n("kpf - %1").arg(server_->root())); popup_ = new KPopupMenu(this); diff --git a/kpf/src/BandwidthGraph.cpp b/kpf/src/BandwidthGraph.cpp index 84a4bdef..d5a26233 100644 --- a/kpf/src/BandwidthGraph.cpp +++ b/kpf/src/BandwidthGraph.cpp @@ -88,7 +88,7 @@ namespace KPF BandwidthGraph::setTooltip() { TQToolTip::add(this, i18n( "%1 on port %2" ) - .tqarg( server_->root() ).tqarg( server_->listenPort() ) ); + .arg( server_->root() ).arg( server_->listenPort() ) ); } TQRect @@ -251,11 +251,11 @@ namespace KPF if (max_ > 1024) if (max_ > 1024 * 1024) - maxString = mbs.tqarg(max_ / (1024 * 1024)); + maxString = mbs.arg(max_ / (1024 * 1024)); else - maxString = kbs.tqarg(max_ / 1024); + maxString = kbs.arg(max_ / 1024); else if ( max_ > 0 ) - maxString = bs.tqarg(max_); + maxString = bs.arg(max_); else maxString = i18n( "Idle" ); diff --git a/kpf/src/BandwidthGraph.h b/kpf/src/BandwidthGraph.h index 257381cf..eac25f76 100644 --- a/kpf/src/BandwidthGraph.h +++ b/kpf/src/BandwidthGraph.h @@ -74,12 +74,12 @@ namespace KPF void setTooltip(); /** - * Overridden to provide reasonable default size and tqshape. + * Overridden to provide reasonable default size and shape. */ virtual TQSize sizeHint() const; /** - * Overridden to provide reasonable minimum size and tqshape. + * Overridden to provide reasonable minimum size and shape. */ virtual TQSize minimumSizeHint() const; diff --git a/kpf/src/DirectoryLister.cpp b/kpf/src/DirectoryLister.cpp index 18aa7a98..6aec78d7 100644 --- a/kpf/src/DirectoryLister.cpp +++ b/kpf/src/DirectoryLister.cpp @@ -248,7 +248,7 @@ namespace KPF return buildHTML ( i18n("Error"), - i18n("Directory does not exist: %1 %2").tqarg(root).tqarg(path) + i18n("Directory does not exist: %1 %2").arg(root).arg(path) ); } @@ -260,7 +260,7 @@ namespace KPF return buildHTML ( i18n("Error"), - i18n("Directory unreadable: %1 %2").tqarg(root).tqarg(path) + i18n("Directory unreadable: %1 %2").arg(root).arg(path) ); } @@ -335,7 +335,7 @@ namespace KPF return buildHTML ( - i18n("Directory listing for %1").tqarg(TQStyleSheet::escape(path)), + i18n("Directory listing for %1").arg(TQStyleSheet::escape(path)), html ); } diff --git a/kpf/src/ErrorMessageConfigDialog.cpp b/kpf/src/ErrorMessageConfigDialog.cpp index e53941e7..1fdf2c63 100644 --- a/kpf/src/ErrorMessageConfigDialog.cpp +++ b/kpf/src/ErrorMessageConfigDialog.cpp @@ -107,7 +107,7 @@ namespace KPF itemList_.append(new Item(*it, requester, responseName, originalPath)); - TQLabel * l = new TQLabel(pattern.tqarg(*it).tqarg(responseName), w); + TQLabel * l = new TQLabel(pattern.arg(*it).arg(responseName), w); l->setBuddy(requester); diff --git a/kpf/src/PropertiesDialogPlugin.cpp b/kpf/src/PropertiesDialogPlugin.cpp index 56dfb51f..75a52dde 100644 --- a/kpf/src/PropertiesDialogPlugin.cpp +++ b/kpf/src/PropertiesDialogPlugin.cpp @@ -395,7 +395,7 @@ namespace KPF " (%1)" "

" ) - .tqarg(TQDir::homeDirPath()); + .arg(TQDir::homeDirPath()); TQString listenPortHelp = i18n diff --git a/kpf/src/Response.cpp b/kpf/src/Response.cpp index 67d4f206..85621ff8 100644 --- a/kpf/src/Response.cpp +++ b/kpf/src/Response.cpp @@ -90,7 +90,7 @@ namespace KPF if (request.protocol() >= 1.0) { s = TQString(request.protocolString()) - + TQString(" %1 %2\r\n").tqarg(code_).tqarg(responseName(code_)); + + TQString(" %1 %2\r\n").arg(code_).arg(responseName(code_)); } break; @@ -103,7 +103,7 @@ namespace KPF case 501: case 505: s = TQString(request.protocolString()) - + TQString(" %1 %2\r\n").tqarg(code_).tqarg(responseName(code_)) + + TQString(" %1 %2\r\n").arg(code_).arg(responseName(code_)) + data(code_, request); break; @@ -178,7 +178,7 @@ namespace KPF } TQString contentLength = - TQString("Content-Length: %1\r\n").tqarg(html.length()); + TQString("Content-Length: %1\r\n").arg(html.length()); return (contentType + contentLength + "\r\n" + html); } diff --git a/kpf/src/ServerWizard.cpp b/kpf/src/ServerWizard.cpp index b48a2bf2..79ec90f1 100644 --- a/kpf/src/ServerWizard.cpp +++ b/kpf/src/ServerWizard.cpp @@ -49,7 +49,7 @@ namespace KPF ServerWizard::ServerWizard(TQWidget * parent) : KWizard(parent, "KPF::ServerWizard", true) { - setCaption(i18n("New Server - %1").tqarg("kpf")); + setCaption(i18n("New Server - %1").arg("kpf")); page1_ = new TQWidget(this); page2_ = new TQWidget(this); @@ -396,7 +396,7 @@ namespace KPF return; } - fileDialog->setCaption(i18n("Choose Directory to Share - %1").tqarg("kpf")); + fileDialog->setCaption(i18n("Choose Directory to Share - %1").arg("kpf")); } void diff --git a/kpf/src/SingleServerConfigDialog.cpp b/kpf/src/SingleServerConfigDialog.cpp index 0dd907b3..c39f944b 100644 --- a/kpf/src/SingleServerConfigDialog.cpp +++ b/kpf/src/SingleServerConfigDialog.cpp @@ -40,7 +40,7 @@ namespace KPF parent, "KPF::SingleServerConfigDialog", false, - i18n("Configuring Server %1 - kpf").tqarg(server->root()), + i18n("Configuring Server %1 - kpf").arg(server->root()), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true -- cgit v1.2.1