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

This reverts commit 808e453c56036211f57482ed847d54aca01bba68.

6 files changed, 38 insertions, 38 deletions

diff --git a/lanbrowsing/kcmlisa/findnic.cpp b/lanbrowsing/kcmlisa/findnic.cpp
index 721834c9..d7437848 100644
--- a/lanbrowsing/kcmlisa/findnic.cpp
+++ b/lanbrowsing/kcmlisa/findnic.cpp
@@ -275,21 +275,21 @@ TQString flags_tos (unsigned int flags)
 
   if (flags & IFF_BROADCAST) {
     if (tmp.length()) {
-      tmp += TQString::fromLatin1(", ");
+      tmp += TQString::tqfromLatin1(", ");
     }
     tmp += i18n("Broadcast");
   }
   
   if (flags & IFF_MULTICAST) {
     if (tmp.length()) {
-      tmp += TQString::fromLatin1(", ");
+      tmp += TQString::tqfromLatin1(", ");
     }
     tmp += i18n("Multicast");
   }
   
   if (flags & IFF_LOOPBACK) {
     if (tmp.length()) {
-      tmp += TQString::fromLatin1(", ");
+      tmp += TQString::tqfromLatin1(", ");
     }
     tmp += i18n("Loopback");
   }
diff --git a/lanbrowsing/kcmlisa/kcmkiolan.cpp b/lanbrowsing/kcmlisa/kcmkiolan.cpp
index b7abad2c..2f02e2fa 100644
--- a/lanbrowsing/kcmlisa/kcmkiolan.cpp
+++ b/lanbrowsing/kcmlisa/kcmkiolan.cpp
@@ -21,7 +21,7 @@
 #include "kcmkiolan.h"
 
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
@@ -35,8 +35,8 @@ IOSlaveSettings::IOSlaveSettings(const TQString& config, TQWidget *parent)
 :KCModule(parent)
 ,m_config(config,false,true)
 {
-   TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-   layout->setAutoAdd(true);
+   TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+   tqlayout->setAutoAdd(true);
 
    TQGroupBox* group=new TQGroupBox(1,Qt::Horizontal, i18n("Show Links for Following Services"), this);
 
@@ -53,13 +53,13 @@ IOSlaveSettings::IOSlaveSettings(const TQString& config, TQWidget *parent)
    label->setBuddy(m_defaultLisaHostLe);
 
    TQWidget *w=new TQWidget(this);
-   layout->setStretchFactor(m_ftpSettings,0);
-   layout->setStretchFactor(m_httpSettings,0);
-   layout->setStretchFactor(m_nfsSettings,0);
-   layout->setStretchFactor(m_smbSettings,0);
-   layout->setStretchFactor(m_shortHostnames,0);
-   layout->setStretchFactor(hbox,0);
-   layout->setStretchFactor(w,1);
+   tqlayout->setStretchFactor(m_ftpSettings,0);
+   tqlayout->setStretchFactor(m_httpSettings,0);
+   tqlayout->setStretchFactor(m_nfsSettings,0);
+   tqlayout->setStretchFactor(m_smbSettings,0);
+   tqlayout->setStretchFactor(m_shortHostnames,0);
+   tqlayout->setStretchFactor(hbox,0);
+   tqlayout->setStretchFactor(w,1);
 
    connect(m_ftpSettings,TQT_SIGNAL(changed()),this,TQT_SIGNAL(changed()));
    connect(m_httpSettings,TQT_SIGNAL(changed()),this,TQT_SIGNAL(changed()));
diff --git a/lanbrowsing/kcmlisa/kcmlisa.cpp b/lanbrowsing/kcmlisa/kcmlisa.cpp
index e17cf5b0..ea0ee2d9 100644
--- a/lanbrowsing/kcmlisa/kcmlisa.cpp
+++ b/lanbrowsing/kcmlisa/kcmlisa.cpp
@@ -55,8 +55,8 @@ LisaSettings::LisaSettings(const TQString& config, TQWidget *parent)
 ,m_configFilename(config)
 ,m_changed(false)
 {
-   TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-   layout->setAutoAdd(true);
+   TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+   tqlayout->setAutoAdd(true);
 
    TQWidget *dummy(0);
 
@@ -83,7 +83,7 @@ LisaSettings::LisaSettings(const TQString& config, TQWidget *parent)
 
    TQGrid *addressesGrid = new TQGrid(2, Qt::Horizontal, this);
    addressesGrid->setSpacing(10);
-   layout->setStretchFactor(addressesGrid,0);
+   tqlayout->setStretchFactor(addressesGrid,0);
 
    label=new TQLabel(i18n("&Broadcast network address:"),addressesGrid);
    comment=i18n("Your network address/subnet mask (e.g. 192.168.0.0/255.255.255.0;)");
@@ -102,13 +102,13 @@ LisaSettings::LisaSettings(const TQString& config, TQWidget *parent)
    label->setBuddy(m_allowedAddresses);
 
    dummy=new TQWidget(this);
-   layout->setStretchFactor(dummy,10);
+   tqlayout->setStretchFactor(dummy,10);
 
    hbox = new TQHBox(this);
    hbox->setSpacing(10);
 //   m_autoSetup=new TQPushButton(i18n("&Guided LISa Setup..."),hbox);
    m_autoSetup=new TQPushButton(i18n("Setup Wizard..."),hbox);
-   m_autoSetup->setFixedWidth( m_autoSetup->sizeHint().width() );
+   m_autoSetup->setFixedWidth( m_autoSetup->tqsizeHint().width() );
 
    m_suggestSettings=new TQPushButton(i18n("&Suggest Settings"),hbox);
 
@@ -288,7 +288,7 @@ void LisaSettings::save()
 
          confStream<<"PingNames = "<<writeStuff.latin1()<<"\n";
          tmp.close();
-         TQString suCommand=TQString("cp '%1' '%2'; chmod 644 '%3'; rm -f '%4'").arg(m_tmpFilename).arg(m_configFilename).arg(m_configFilename).arg(m_tmpFilename);
+         TQString suCommand=TQString("cp '%1' '%2'; chmod 644 '%3'; rm -f '%4'").tqarg(m_tmpFilename).tqarg(m_configFilename).tqarg(m_configFilename).tqarg(m_tmpFilename);
          KProcess *proc = new KProcess();
          connect(proc, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(saveDone(KProcess *)));
          *proc<<"tdesu"<<"-c"<<suCommand;
@@ -298,7 +298,7 @@ void LisaSettings::save()
              delete proc;
       }
       else
-         KMessageBox::sorry(0,i18n("Saving the results to %1 failed.").arg(m_configFilename));
+         KMessageBox::sorry(0,i18n("Saving the results to %1 failed.").tqarg(m_configFilename));
    }
 }
 
@@ -337,7 +337,7 @@ void LisaSettings::suggestSettings()
       {
          msg+="<b>"+tmp->name+": </b>"+tmp->addr+"/"+tmp->netmask+";<br>";
       }
-      KMessageBox::information(0,TQString("<html>%1</html>").arg(msg));
+      KMessageBox::information(0,TQString("<html>%1</html>").tqarg(msg));
    }
 
    emit changed();
diff --git a/lanbrowsing/kcmlisa/kcmreslisa.cpp b/lanbrowsing/kcmlisa/kcmreslisa.cpp
index 17c12671..1ced6c13 100644
--- a/lanbrowsing/kcmlisa/kcmreslisa.cpp
+++ b/lanbrowsing/kcmlisa/kcmreslisa.cpp
@@ -27,7 +27,7 @@
 #include <tqgrid.h>
 #include <tqlabel.h>
 #include <tqtooltip.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvbuttongroup.h>
 
 #include <kdialogbase.h>
@@ -53,8 +53,8 @@ ResLisaSettings::ResLisaSettings(const TQString& config, TQWidget *parent)
 ,m_maxPingsAtOnce(0)
 ,m_reslisaAdvancedDlg(0)
 {
-   TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-   layout->setAutoAdd(true);
+   TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+   tqlayout->setAutoAdd(true);
    
    TQVButtonGroup *gb=new TQVButtonGroup(i18n("Tell ResLISa Daemon How to Search for Hosts"),this);
    gb->setInsideSpacing(10);
@@ -237,9 +237,9 @@ void ResLisaSettings::suggestSettings()
       {
          msg+="<b>"+tmp->name+": </b>"+tmp->addr+"/"+tmp->netmask+";<br>";
       }
-      KMessageBox::information(0,TQString("<html>%1</html>").arg(msg));
+      KMessageBox::information(0,TQString("<html>%1</html>").tqarg(msg));
    }
-   KMessageBox::information(0,TQString("<html>%1</html>").arg(i18n("The ResLISa daemon is now configured "
+   KMessageBox::information(0,TQString("<html>%1</html>").tqarg(i18n("The ResLISa daemon is now configured "
                                                                   "correctly, hopefully.<br>Make sure that the reslisa binary is installed <i>suid root</i>.")));
 
    emit changed();
diff --git a/lanbrowsing/kcmlisa/setupwizard.cpp b/lanbrowsing/kcmlisa/setupwizard.cpp
index 53b5033d..f5b985e1 100644
--- a/lanbrowsing/kcmlisa/setupwizard.cpp
+++ b/lanbrowsing/kcmlisa/setupwizard.cpp
@@ -199,7 +199,7 @@ void SetupWizard::setupSearchPage()
    m_searchPage->setSpacing(KDialog::spacingHint());
    m_searchPage->setMargin(KDialog::marginHint());
    info=new TQLabel(i18n("<b>If unsure, keep it as is.</b>"),m_searchPage);
-   info->setAlignment(AlignRight|AlignVCenter);
+   info->tqsetAlignment(AlignRight|AlignVCenter);
 
    setHelpEnabled( m_searchPage, false );
 }
@@ -219,13 +219,13 @@ void SetupWizard::setupAddressesPage()
                         "4. ranges for each part of the address, like <code>10-10.1-5.1-25.1-3;</code><br>"
                         "You can also enter combinations of 1 to 4, separated by \";\", like<br>"
                         "<code>192.168.0.0/255.255.255.0;10.0.0.0;10.0.1.1-10.0.1.100;</code><br>"),m_addressesPage);
-   info->setAlignment(AlignLeft|AlignVCenter|WordBreak);
+   info->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak);
    TQWidget *dummy=new TQWidget(m_addressesPage);
    m_addressesPage->setStretchFactor(dummy,10);
    m_addressesPage->setSpacing(KDialog::spacingHint());
    m_addressesPage->setMargin(KDialog::marginHint());
    info=new TQLabel(i18n("<b>If unsure, keep it as is.</b>"), m_addressesPage);
-   info->setAlignment(AlignRight|AlignVCenter);
+   info->tqsetAlignment(AlignRight|AlignVCenter);
 
    setHelpEnabled( m_addressesPage, false );
 }
@@ -238,7 +238,7 @@ void SetupWizard::setupAllowedPage()
                                 "Only hosts which fit into the addresses given here are accepted by LISa as clients. "
                                 "The list of hosts published by LISa will also only contain hosts which fit into this scheme.<br>"
                                 "Usually you enter your IP address/network mask here."),m_allowedAddressesPage);
-   info->setAlignment(AlignLeft|AlignVCenter|WordBreak);
+   info->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak);
    m_allowedAddresses=new KRestrictedLine(m_allowedAddressesPage,"0123456789./-;");
    m_trustedHostsLabel=new TQLabel(m_allowedAddressesPage);
 
@@ -247,7 +247,7 @@ void SetupWizard::setupAllowedPage()
    m_allowedAddressesPage->setSpacing(KDialog::spacingHint());
    m_allowedAddressesPage->setMargin(KDialog::marginHint());
    info=new TQLabel(i18n("<b>If unsure, keep it as is.</b>"), m_allowedAddressesPage);
-   info->setAlignment(AlignRight|AlignVCenter);
+   info->tqsetAlignment(AlignRight|AlignVCenter);
 
    setHelpEnabled( m_allowedAddressesPage, false );
 }
@@ -256,18 +256,18 @@ void SetupWizard::setupBcastPage()
 {
    m_bcastPage=new TQVBox(this);
    TQLabel *info=new TQLabel(i18n("<br>Enter your IP address and network mask here, like <code>192.168.0.1/255.255.255.0</code>"),m_bcastPage);
-   info->setAlignment(AlignLeft|AlignVCenter|WordBreak);
+   info->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak);
    m_bcastAddress=new KRestrictedLine(m_bcastPage,"0123456789./");
    info=new TQLabel(i18n("<br>To reduce the network load, the LISa servers in one network<br>"
                         "cooperate with each other. Therefore you have to enter the broadcast<br>"
                         "address here. If you are connected to more than one network, choose <br>"
                         "one of the broadcast addresses."),m_bcastPage);
-   info->setAlignment(AlignLeft|AlignVCenter|WordBreak);
+   info->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak);
    TQWidget *dummy=new TQWidget(m_bcastPage);
    m_bcastPage->setStretchFactor(dummy,10);
    m_bcastPage->setSpacing(KDialog::spacingHint());
    info=new TQLabel(i18n("<b>If unsure, keep it as is.</b>"), m_bcastPage);
-   info->setAlignment(AlignRight|AlignVCenter);
+   info->tqsetAlignment(AlignRight|AlignVCenter);
 
    m_bcastPage->setSpacing(KDialog::spacingHint());
    m_bcastPage->setMargin(KDialog::marginHint());
@@ -287,13 +287,13 @@ void SetupWizard::setupUpdateIntervalPage()
                         "up to 16 times the value you enter here, if nobody accesses the LISa server. "
                         "So if you enter 300 sec = 5 min here, this does not mean that LISa will ping "
                         "your whole network every 5 minutes. The interval will increase up to 16 x 5 min = 80 min."),m_intervalPage);
-   info->setAlignment(AlignLeft|AlignVCenter|WordBreak);
+   info->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak);
    TQWidget *dummy=new TQWidget(m_intervalPage);
    m_intervalPage->setStretchFactor(dummy,10);
    m_intervalPage->setSpacing(KDialog::spacingHint());
    m_intervalPage->setMargin(KDialog::marginHint());
    info=new TQLabel(i18n("<b>If unsure, keep it as is.</b>"), m_intervalPage);
-   info->setAlignment(AlignRight|AlignVCenter);
+   info->tqsetAlignment(AlignRight|AlignVCenter);
    info->setTextFormat(TQt::RichText);
 
    setHelpEnabled( m_intervalPage, false );
@@ -338,7 +338,7 @@ void SetupWizard::setupAdvancedSettingsPage()
    //m_advancedPage->setMargin(KDialog::marginHint());
 
    info=new TQLabel(i18n("<b>If unsure, keep it as is.</b>"), m_advancedPage);
-   info->setAlignment(AlignRight|AlignVCenter);
+   info->tqsetAlignment(AlignRight|AlignVCenter);
 
    connect(m_secondScan,TQT_SIGNAL(toggled(bool)),m_secondWait,TQT_SLOT(setEnabled(bool)));
    setHelpEnabled( m_advancedPage, false );
diff --git a/lanbrowsing/kcmlisa/setupwizard.h b/lanbrowsing/kcmlisa/setupwizard.h
index 7e502b40..c67b330b 100644
--- a/lanbrowsing/kcmlisa/setupwizard.h
+++ b/lanbrowsing/kcmlisa/setupwizard.h
@@ -32,7 +32,7 @@
 #include <krestrictedline.h>
 #include <tqwizard.h>
 #include <kglobal.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqlistbox.h>
 #include <tqvbox.h>