Rename obsolete tq methods to standard names

5 files changed, 41 insertions, 41 deletions

diff --git a/kpf/src/ActiveMonitor.cpp b/kpf/src/ActiveMonitor.cpp
index 8b07f036..5a11848d 100644
--- a/kpf/src/ActiveMonitor.cpp
+++ b/kpf/src/ActiveMonitor.cpp
@@ -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
       (
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/ErrorMessageConfigDialog.cpp b/kpf/src/ErrorMessageConfigDialog.cpp
index 1fdf2c63..b7962b07 100644
--- a/kpf/src/ErrorMessageConfigDialog.cpp
+++ b/kpf/src/ErrorMessageConfigDialog.cpp
@@ -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"));
 
diff --git a/kpf/src/ServerWizard.cpp b/kpf/src/ServerWizard.cpp
index 79ec90f1..3c2e78f9 100644
--- a/kpf/src/ServerWizard.cpp
+++ b/kpf/src/ServerWizard.cpp
@@ -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"));
diff --git a/kpf/src/StartingKPFDialog.cpp b/kpf/src/StartingKPFDialog.cpp
index 94709edc..79f4f487 100644
--- a/kpf/src/StartingKPFDialog.cpp
+++ b/kpf/src/StartingKPFDialog.cpp
@@ -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);