From 808e453c56036211f57482ed847d54aca01bba68 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:49:40 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kpf/src/ActiveMonitor.cpp | 8 ++--- kpf/src/ActiveMonitorItem.cpp | 12 +++---- kpf/src/ActiveMonitorItem.h | 4 +-- kpf/src/ActiveMonitorWindow.cpp | 2 +- kpf/src/Applet.cpp | 2 +- kpf/src/Applet.h | 10 +++--- kpf/src/AppletItem.cpp | 4 +-- kpf/src/BandwidthGraph.cpp | 14 ++++---- kpf/src/BandwidthGraph.h | 8 ++--- kpf/src/ConfigDialogPage.cpp | 2 +- kpf/src/DirectoryLister.cpp | 12 +++---- kpf/src/ErrorMessageConfigDialog.cpp | 10 +++--- kpf/src/PropertiesDialogPlugin.cpp | 18 +++++----- kpf/src/Response.cpp | 8 ++--- kpf/src/Server.cpp | 4 +-- kpf/src/ServerWizard.cpp | 64 ++++++++++++++++++------------------ kpf/src/SingleServerConfigDialog.cpp | 2 +- kpf/src/StartingKPFDialog.cpp | 6 ++-- kpf/src/Utils.cpp | 2 +- 19 files changed, 96 insertions(+), 96 deletions(-) (limited to 'kpf/src') diff --git a/kpf/src/ActiveMonitor.cpp b/kpf/src/ActiveMonitor.cpp index dc6115df..58fc416e 100644 --- a/kpf/src/ActiveMonitor.cpp +++ b/kpf/src/ActiveMonitor.cpp @@ -21,7 +21,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include +#include #include #include @@ -57,9 +57,9 @@ namespace KPF view_->addColumn(i18n("Resource")); view_->addColumn(i18n("Host")); - TQVBoxLayout * tqlayout = new TQVBoxLayout(this); + TQVBoxLayout * layout = new TQVBoxLayout(this); - tqlayout->addWidget(view_); + layout->addWidget(view_); connect ( @@ -146,7 +146,7 @@ namespace KPF void ActiveMonitor::slotCull() { - TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime dt = TQDateTime::currentDateTime(); TQListViewItemIterator it(view_); diff --git a/kpf/src/ActiveMonitorItem.cpp b/kpf/src/ActiveMonitorItem.cpp index 04fe857d..1fe889d1 100644 --- a/kpf/src/ActiveMonitorItem.cpp +++ b/kpf/src/ActiveMonitorItem.cpp @@ -93,7 +93,7 @@ namespace KPF { switch (c) { - case tqStatus: + case Status: return 16; break; @@ -115,19 +115,19 @@ namespace KPF switch (server_->state()) { case Server::WaitingForRequest: - setPixmap(tqStatus, SmallIcon("connect_creating")); + setPixmap(Status, SmallIcon("connect_creating")); break; case Server::WaitingForHeaders: - setPixmap(tqStatus, SmallIcon("connect_creating")); + setPixmap(Status, SmallIcon("connect_creating")); break; case Server::Responding: - setPixmap(tqStatus, SmallIcon("connect_established")); + setPixmap(Status, SmallIcon("connect_established")); break; case Server::Finished: - setPixmap(tqStatus, SmallIcon("connect_no")); + setPixmap(Status, SmallIcon("connect_no")); break; } } @@ -178,7 +178,7 @@ namespace KPF sent_ += l; setText(Sent, TQString::number(sent_)); updateState(); - tqrepaint(); + repaint(); } } diff --git a/kpf/src/ActiveMonitorItem.h b/kpf/src/ActiveMonitorItem.h index 8cc347e2..bd4e5e7a 100644 --- a/kpf/src/ActiveMonitorItem.h +++ b/kpf/src/ActiveMonitorItem.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include class TQPainter; @@ -48,7 +48,7 @@ namespace KPF enum Column { - tqStatus, + Status, Progress, Size, Sent, 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/Applet.cpp b/kpf/src/Applet.cpp index 983ae0c3..85ec4917 100644 --- a/kpf/src/Applet.cpp +++ b/kpf/src/Applet.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/kpf/src/Applet.h b/kpf/src/Applet.h index bd41962f..5b7e9e8c 100644 --- a/kpf/src/Applet.h +++ b/kpf/src/Applet.h @@ -93,13 +93,13 @@ namespace KPF /** * Called when a WebServer object has been created. Creates an - * AppletItem, associates it with the former, and updates the tqlayout. + * AppletItem, associates it with the former, and updates the layout. */ void slotServerCreated(WebServer *); /** * Called when a WebServer object has been disabled. - * Deletes the associated AppletItem and updates the tqlayout. + * Deletes the associated AppletItem and updates the layout. */ void slotServerDisabled(WebServer *); @@ -121,13 +121,13 @@ namespace KPF virtual void about(); /** - * Overridden to keep track of orientation change and update tqlayout + * Overridden to keep track of orientation change and update layout * accordingly. */ virtual void orientationChange(Qt::Orientation); /** - * Overridden to update tqlayout accordingly. + * Overridden to update layout accordingly. */ virtual void moveEvent(TQMoveEvent *); virtual void resizeEvent(TQResizeEvent *); @@ -138,7 +138,7 @@ namespace KPF virtual void mousePressEvent(TQMouseEvent *); /** - * Updates the tqlayout, moving AppletItem objects into proper positions. + * Updates the layout, moving AppletItem objects into proper positions. */ virtual void resetLayout(); diff --git a/kpf/src/AppletItem.cpp b/kpf/src/AppletItem.cpp index e5d3dc51..fc16ae00 100644 --- a/kpf/src/AppletItem.cpp +++ b/kpf/src/AppletItem.cpp @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include #include @@ -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 546aa630..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 @@ -112,7 +112,7 @@ namespace KPF p.drawPixmap( ( width()-bgPix_.width() )/2, ( height()-bgPix_.height() )/2, bgPix_ ); - p.setPen(tqcolorGroup().dark()); + p.setPen(colorGroup().dark()); for (uint i = 0; i < history_.size(); i++) { @@ -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" ); @@ -280,13 +280,13 @@ namespace KPF } TQSize - BandwidthGraph::tqsizeHint() const + BandwidthGraph::sizeHint() const { return TQSize(32, 32); } TQSize - BandwidthGraph::tqminimumSizeHint() const + BandwidthGraph::minimumSizeHint() const { return TQSize(12, 12); } diff --git a/kpf/src/BandwidthGraph.h b/kpf/src/BandwidthGraph.h index 8684c71f..eac25f76 100644 --- a/kpf/src/BandwidthGraph.h +++ b/kpf/src/BandwidthGraph.h @@ -74,14 +74,14 @@ namespace KPF void setTooltip(); /** - * Overridden to provide reasonable default size and tqshape. + * Overridden to provide reasonable default size and shape. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /** - * Overridden to provide reasonable minimum size and tqshape. + * Overridden to provide reasonable minimum size and shape. */ - virtual TQSize tqminimumSizeHint() const; + virtual TQSize minimumSizeHint() const; /** * @return the WebServer object given on construction. diff --git a/kpf/src/ConfigDialogPage.cpp b/kpf/src/ConfigDialogPage.cpp index 657e96f0..830ede9e 100644 --- a/kpf/src/ConfigDialogPage.cpp +++ b/kpf/src/ConfigDialogPage.cpp @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include #include diff --git a/kpf/src/DirectoryLister.cpp b/kpf/src/DirectoryLister.cpp index 18aa7a98..1a196373 100644 --- a/kpf/src/DirectoryLister.cpp +++ b/kpf/src/DirectoryLister.cpp @@ -26,9 +26,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -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..04749b3e 100644 --- a/kpf/src/ErrorMessageConfigDialog.cpp +++ b/kpf/src/ErrorMessageConfigDialog.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include @@ -62,7 +62,7 @@ namespace KPF TQFrame * w = makeMainWidget(); - TQVBoxLayout * tqlayout = + TQVBoxLayout * layout = new TQVBoxLayout(w, KDialog::marginHint(), KDialog::spacingHint()); TQLabel * info = @@ -84,9 +84,9 @@ namespace KPF w ); - tqlayout->addWidget(info); + layout->addWidget(info); - TQGridLayout * grid = new TQGridLayout(tqlayout, codeList.count(), 2); + TQGridLayout * grid = new TQGridLayout(layout, codeList.count(), 2); TQString pattern(i18n("%1 %2")); @@ -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 028697d3..bd3b9638 100644 --- a/kpf/src/PropertiesDialogPlugin.cpp +++ b/kpf/src/PropertiesDialogPlugin.cpp @@ -21,7 +21,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include +#include #include #include #include @@ -136,7 +136,7 @@ namespace KPF TQLabel * l_bandwidthLimit; // TQLabel * l_connectionLimit; TQLabel * l_serverName; - TQLabel * l_kpftqStatus; + TQLabel * l_kpfStatus; TQSpinBox * sb_listenPort; TQSpinBox * sb_bandwidthLimit; @@ -298,10 +298,10 @@ namespace KPF l->addWidget(about); - d->l_kpftqStatus = + d->l_kpfStatus = new TQLabel(i18n("Applet status: not running"), w); - l->addWidget(d->l_kpftqStatus); + l->addWidget(d->l_kpfStatus); TQHBoxLayout * l2 = new TQHBoxLayout(l); @@ -395,7 +395,7 @@ namespace KPF " (%1)" "

" ) - .tqarg(TQDir::homeDirPath()); + .arg(TQDir::homeDirPath()); TQString listenPortHelp = i18n @@ -507,7 +507,7 @@ namespace KPF void PropertiesDialogPlugin::slotStartKPF() { - d->l_kpftqStatus + d->l_kpfStatus ->setText(i18n("Applet status: starting...")); kapp->dcopClient() @@ -519,7 +519,7 @@ namespace KPF void PropertiesDialogPlugin::slotStartKPFFailed() { - d->l_kpftqStatus + d->l_kpfStatus ->setText(i18n("Applet status: failed to start")); d->pb_startKPF->setEnabled(true); @@ -532,7 +532,7 @@ namespace KPF { d->kpfRunning = true; - d->l_kpftqStatus + d->l_kpfStatus ->setText(i18n("Applet status: running")); d->pb_startKPF->setEnabled(false); @@ -554,7 +554,7 @@ namespace KPF d->pb_startKPF->setEnabled(true); - d->l_kpftqStatus + d->l_kpfStatus ->setText(i18n("Applet status: not running")); d->stack->raiseWidget(d->initWidget); diff --git a/kpf/src/Response.cpp b/kpf/src/Response.cpp index 67d4f206..da25a8a6 100644 --- a/kpf/src/Response.cpp +++ b/kpf/src/Response.cpp @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include @@ -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/Server.cpp b/kpf/src/Server.cpp index 87d3c733..868a88d3 100644 --- a/kpf/src/Server.cpp +++ b/kpf/src/Server.cpp @@ -53,7 +53,7 @@ namespace KPF d->followSymlinks = followSymlinks; - d->birth = TQDateTime::tqcurrentDateTime(); + d->birth = TQDateTime::currentDateTime(); d->socket.setSocket(socket); @@ -754,7 +754,7 @@ namespace KPF d->socket.close(); - d->death = TQDateTime::tqcurrentDateTime(); + d->death = TQDateTime::currentDateTime(); emit(finished(this)); } diff --git a/kpf/src/ServerWizard.cpp b/kpf/src/ServerWizard.cpp index b48a2bf2..80266ca5 100644 --- a/kpf/src/ServerWizard.cpp +++ b/kpf/src/ServerWizard.cpp @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include #include @@ -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); @@ -171,59 +171,59 @@ namespace KPF sb_bandwidthLimit_ ->setSuffix(i18n(" kB/s")); // sb_connectionLimit_ ->setValue(Config::DefaultConnectionLimit); - TQVBoxLayout * tqlayout1 = + TQVBoxLayout * layout1 = new TQVBoxLayout(page1_, KDialog::marginHint(), KDialog::spacingHint()); - TQVBoxLayout * tqlayout2 = + TQVBoxLayout * layout2 = new TQVBoxLayout(page2_, KDialog::marginHint(), KDialog::spacingHint()); - TQVBoxLayout * tqlayout3 = + TQVBoxLayout * layout3 = new TQVBoxLayout(page3_, KDialog::marginHint(), KDialog::spacingHint()); -// TQVBoxLayout * tqlayout4 = +// TQVBoxLayout * layout4 = // new TQVBoxLayout(page4_, KDialog::marginHint(), KDialog::spacingHint()); - TQVBoxLayout * tqlayout5 = + TQVBoxLayout * layout5 = new TQVBoxLayout(page5_, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout1->addWidget(l_rootDirectoryHelp); - tqlayout2->addWidget(l_listenPortHelp); - tqlayout3->addWidget(l_bandwidthLimitHelp); -// tqlayout4->addWidget(l_connectionLimitHelp); - tqlayout5->addWidget(l_serverNameHelp); + layout1->addWidget(l_rootDirectoryHelp); + layout2->addWidget(l_listenPortHelp); + layout3->addWidget(l_bandwidthLimitHelp); +// layout4->addWidget(l_connectionLimitHelp); + layout5->addWidget(l_serverNameHelp); - TQHBoxLayout * tqlayout10 = new TQHBoxLayout(tqlayout1); + TQHBoxLayout * layout10 = new TQHBoxLayout(layout1); - tqlayout10->addWidget(l_root_); - tqlayout10->addWidget(kur_root_); + layout10->addWidget(l_root_); + layout10->addWidget(kur_root_); - tqlayout1->addStretch(1); + layout1->addStretch(1); - TQHBoxLayout * tqlayout20 = new TQHBoxLayout(tqlayout2); + TQHBoxLayout * layout20 = new TQHBoxLayout(layout2); - tqlayout20->addWidget(l_listenPort_); - tqlayout20->addWidget(sb_listenPort_); + layout20->addWidget(l_listenPort_); + layout20->addWidget(sb_listenPort_); - tqlayout2->addStretch(1); + layout2->addStretch(1); - TQHBoxLayout * tqlayout30 = new TQHBoxLayout(tqlayout3); + TQHBoxLayout * layout30 = new TQHBoxLayout(layout3); - tqlayout30->addWidget(l_bandwidthLimit_); - tqlayout30->addWidget(sb_bandwidthLimit_); + layout30->addWidget(l_bandwidthLimit_); + layout30->addWidget(sb_bandwidthLimit_); - tqlayout3->addStretch(1); + layout3->addStretch(1); -// TQHBoxLayout * tqlayout40 = new TQHBoxLayout(tqlayout4); +// TQHBoxLayout * layout40 = new TQHBoxLayout(layout4); -// tqlayout40->addWidget(l_connectionLimit_); -// tqlayout40->addWidget(sb_connectionLimit_); +// layout40->addWidget(l_connectionLimit_); +// layout40->addWidget(sb_connectionLimit_); -// tqlayout4->addStretch(1); +// layout4->addStretch(1); - TQHBoxLayout * tqlayout50 = new TQHBoxLayout(tqlayout5); + TQHBoxLayout * layout50 = new TQHBoxLayout(layout5); - tqlayout50->addWidget(l_serverName_); - tqlayout50->addWidget(le_serverName_); + layout50->addWidget(l_serverName_); + layout50->addWidget(le_serverName_); addPage(page1_, i18n("Root Directory")); addPage(page2_, i18n("Listen Port")); @@ -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 diff --git a/kpf/src/StartingKPFDialog.cpp b/kpf/src/StartingKPFDialog.cpp index 94709edc..9f1d0d21 100644 --- a/kpf/src/StartingKPFDialog.cpp +++ b/kpf/src/StartingKPFDialog.cpp @@ -21,7 +21,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include +#include #include #include #include @@ -71,9 +71,9 @@ namespace KPF mainWidget ); - TQVBoxLayout * tqlayout = new TQVBoxLayout(mainWidget); + TQVBoxLayout * layout = new TQVBoxLayout(mainWidget); - tqlayout->addWidget(about); + layout->addWidget(about); kapp->dcopClient()->setNotifications(true); diff --git a/kpf/src/Utils.cpp b/kpf/src/Utils.cpp index 8dc5c373..631059a7 100644 --- a/kpf/src/Utils.cpp +++ b/kpf/src/Utils.cpp @@ -105,7 +105,7 @@ namespace KPF TQString dateString() { - return dateString(TQDateTime::tqcurrentDateTime()); + return dateString(TQDateTime::currentDateTime()); } -- cgit v1.2.1