Rename obsolete tq methods to standard names

14 files changed, 21 insertions, 21 deletions

diff --git a/kppp/accounts.cpp b/kppp/accounts.cpp
index 81e44459..740755e6 100644
--- a/kppp/accounts.cpp
+++ b/kppp/accounts.cpp
@@ -450,7 +450,7 @@ QueryReset::QueryReset(TQWidget *parent) : TQDialog(parent, 0, true) {
 
   l1->activate();
 
-  // this activates the f-tqlayout and sets minimumSize()
+  // this activates the f-layout and sets minimumSize()
   f->show();
 
   tl->addWidget(f);
@@ -466,7 +466,7 @@ QueryReset::QueryReset(TQWidget *parent) : TQDialog(parent, 0, true) {
   connect(cancel, TQT_SIGNAL(clicked()),
 	  this, TQT_SLOT(reject()));
 
-  bbox->tqlayout();
+  bbox->layout();
   tl->addWidget(bbox);
 
   // TODO: activate if KGroupBox is fixed
diff --git a/kppp/conwindow.cpp b/kppp/conwindow.cpp
index 8f2c8a89..2e6f2281 100644
--- a/kppp/conwindow.cpp
+++ b/kppp/conwindow.cpp
@@ -118,11 +118,11 @@ void ConWindow::accounting(bool on) {
   accountingEnabled = on;
   volumeAccountingEnabled = gpppdata.VolAcctEnabled();
 
-  // delete old tqlayout
+  // delete old layout
   if(tl1 != 0)
     delete tl1;
 
-  // add tqlayout now
+  // add layout now
   tl1 = new TQVBoxLayout(this, 10, 10);
   tl1->addSpacing(5);
   TQHBoxLayout *tl = new TQHBoxLayout;
diff --git a/kppp/edit.cpp b/kppp/edit.cpp
index 19b78185..6e5b8553 100644
--- a/kppp/edit.cpp
+++ b/kppp/edit.cpp
@@ -892,7 +892,7 @@ ScriptWidget::ScriptWidget( TQWidget *parent, bool isnewaccount, const char *nam
   bbox->addStretch(1);
   remove = bbox->addButton(i18n("&Remove"));
   connect(remove, TQT_SIGNAL(clicked()), TQT_SLOT(removeButton()));
-  bbox->tqlayout();
+  bbox->layout();
   tl->addWidget(bbox);
 
   TQHBoxLayout *l12 = new TQHBoxLayout(0);
diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp
index 4d2d162c..4b78d330 100644
--- a/kppp/kpppwidget.cpp
+++ b/kppp/kpppwidget.cpp
@@ -515,7 +515,7 @@ void KPPPWidget::resetmodems() {
   }
   label7->setShown(m_bModemCShown);
   modem_c->setShown(m_bModemCShown);     
-  tqlayout()->invalidate();
+  layout()->invalidate();
   setFixedSize(sizeHint());
 
   //set the default modem
@@ -1046,7 +1046,7 @@ void KPPPWidget::showNews() {
     dlg.connect(ok, TQT_SIGNAL(clicked()),
 		&dlg, TQT_SLOT(accept()));
     bbox->addStretch(1);
-    bbox->tqlayout();
+    bbox->layout();
 
     l2->addWidget(l);
     l2->addWidget(cb);
diff --git a/kppp/logview/monthly.cpp b/kppp/logview/monthly.cpp
index fee59878..0844f85a 100644
--- a/kppp/logview/monthly.cpp
+++ b/kppp/logview/monthly.cpp
@@ -246,7 +246,7 @@ MonthlyWidget::MonthlyWidget(TQWidget *parent) :
 	  this, TQT_SLOT(exportWizard()));
 
   bbox->addStretch(8);
-  bbox->tqlayout();
+  bbox->layout();
 
   currentMonth();
   layoutWidget();
diff --git a/kppp/miniterm.cpp b/kppp/miniterm.cpp
index db73149f..5417a1a2 100644
--- a/kppp/miniterm.cpp
+++ b/kppp/miniterm.cpp
@@ -79,11 +79,11 @@ MiniTerm::MiniTerm(TQWidget *parent, const char *name)
 
   setupToolbar();
 
-  TQVBoxLayout *tqlayout=new TQVBoxLayout(this);
-  tqlayout->addWidget(menubar);
-  tqlayout->addWidget(toolbar);
-  tqlayout->addWidget(terminal);
-  tqlayout->addWidget(statusbar);
+  TQVBoxLayout *layout=new TQVBoxLayout(this);
+  layout->addWidget(menubar);
+  layout->addWidget(toolbar);
+  layout->addWidget(terminal);
+  layout->addWidget(statusbar);
 
   inittimer = new TQTimer(this);
   connect(inittimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(init()));
diff --git a/kppp/modemcmds.cpp b/kppp/modemcmds.cpp
index 69103683..d641918f 100644
--- a/kppp/modemcmds.cpp
+++ b/kppp/modemcmds.cpp
@@ -55,7 +55,7 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name)
   const int GRIDROWS = 22;
   int row = 0;
 
-  // toplevel tqlayout
+  // toplevel layout
   TQVBoxLayout *tl = new TQVBoxLayout(dummyWidget, 10, 4);
 
   // add grid + frame
diff --git a/kppp/modemdb.cpp b/kppp/modemdb.cpp
index 6f910a69..4f9e521e 100644
--- a/kppp/modemdb.cpp
+++ b/kppp/modemdb.cpp
@@ -73,7 +73,7 @@ ModemSelector::ModemSelector(TQWidget *parent) : TQDialog(parent, 0, true) {
   ok->setDefault(true);
   ok->setEnabled(false);
   cancel =   bbox->addButton(KStdGuiItem::cancel());
-  bbox->tqlayout();
+  bbox->layout();
   tl->addWidget(bbox);
   setFixedSize(sizeHint());
 
diff --git a/kppp/newwidget.cpp b/kppp/newwidget.cpp
index 28cc9fc6..ba8508e5 100644
--- a/kppp/newwidget.cpp
+++ b/kppp/newwidget.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 //
-// functions generating tqlayout-aware widgets
+// functions generating layout-aware widgets
 //
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/kppp/newwidget.h b/kppp/newwidget.h
index 07129c74..2cb2e717 100644
--- a/kppp/newwidget.h
+++ b/kppp/newwidget.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 //
-// functions generating tqlayout-aware widgets
+// functions generating layout-aware widgets
 //
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/kppp/pppdargs.cpp b/kppp/pppdargs.cpp
index e27b583a..72cf1f49 100644
--- a/kppp/pppdargs.cpp
+++ b/kppp/pppdargs.cpp
@@ -95,7 +95,7 @@ PPPdArguments::PPPdArguments(TQWidget *parent, const char *name)
   TQPushButton *cancel = bbox->addButton(KStdGuiItem::cancel());
   connect(cancel, TQT_SIGNAL(clicked()),
 	  this, TQT_SLOT(reject()));
-  bbox->tqlayout();
+  bbox->layout();
   l->addWidget(bbox);
 
   setFixedSize(sizeHint());
diff --git a/kppp/ppplog.cpp b/kppp/ppplog.cpp
index a98a9390..fe73a1ad 100644
--- a/kppp/ppplog.cpp
+++ b/kppp/ppplog.cpp
@@ -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->tqlayout();
+  bbox->layout();
   edit->setMinimumSize(600, 250);
   label->setMinimumSize(600, 15);
   diagnosis->setMinimumSize(600, 60);
diff --git a/kppp/pppstatdlg.cpp b/kppp/pppstatdlg.cpp
index 9a39746b..4a816121 100644
--- a/kppp/pppstatdlg.cpp
+++ b/kppp/pppstatdlg.cpp
@@ -144,7 +144,7 @@ PPPStatsDlg::PPPStatsDlg(TQWidget *parent, const char *name, TQWidget *,
     labela2[i]->setText("");
     labelb2[i]->setText("");
 
-    // add to tqlayout
+    // add to layout
     l112->addWidget(labela1[i], i, 0);
     l112->addWidget(labela2[i], i, 1);
     l112->addWidget(labelb1[i], i, 2);
diff --git a/kppp/providerdb.cpp b/kppp/providerdb.cpp
index 870db69b..d7f60046 100644
--- a/kppp/providerdb.cpp
+++ b/kppp/providerdb.cpp
@@ -461,7 +461,7 @@ void urlEncode(TQString &s) {
     if(TQString(UNENCODED_CHARS).find(s[i]) >= 0)
       s1 += s[i];
     else {
-      tmp.sprintf("%%%03i", s[i].tqunicode());
+      tmp.sprintf("%%%03i", s[i].unicode());
       s1 += tmp;
     }
   }