Rename a number of old tq methods that are no longer tq specific

1 files changed, 32 insertions, 32 deletions

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 <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqspinbox.h>
 #include <tqdir.h>
 #include <tqptrlist.h>
@@ -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