TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 14 insertions, 14 deletions

diff --git a/lanbrowsing/kcmlisa/kcmlisa.cpp b/lanbrowsing/kcmlisa/kcmlisa.cpp
index 7819b217..36ab9ba6 100644
--- a/lanbrowsing/kcmlisa/kcmlisa.cpp
+++ b/lanbrowsing/kcmlisa/kcmlisa.cpp
@@ -48,15 +48,15 @@
 
 #include <kdebug.h>
 
-LisaSettings::LisaSettings(const TQString& config, TQWidget *parent)
-: KCModule(parent, "kcmlanbrowser")
+LisaSettings::LisaSettings(const TQString& config, TQWidget *tqparent)
+: KCModule(tqparent, "kcmlanbrowser")
 ,m_config(config,false,true)
 ,m_wizard(0)
 ,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,10 +83,10 @@ 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;)");
+   comment=i18n("Your network address/subnet tqmask (e.g. 192.168.0.0/255.255.255.0;)");
    TQToolTip::add(label, comment);
 
    m_broadcastNetwork=new KRestrictedLine(addressesGrid,"a","0123456789./;");
@@ -94,7 +94,7 @@ LisaSettings::LisaSettings(const TQString& config, TQWidget *parent)
    label->setBuddy(m_broadcastNetwork);
 
    label=new TQLabel(i18n("&Trusted IP addresses:"),addressesGrid);
-   comment = i18n("Usually your network address/subnet mask (e.g. 192.168.0.0/255.255.255.0;)");
+   comment = i18n("Usually your network address/subnet tqmask (e.g. 192.168.0.0/255.255.255.0;)");
    TQToolTip::add(label, comment);
 
    m_allowedAddresses=new KRestrictedLine(addressesGrid,"a","0123456789./;");
@@ -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,17 +288,17 @@ 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<<"kdesu"<<"-c"<<suCommand;
-         KApplication::setOverrideCursor(Qt::waitCursor);
+         KApplication::setOverrideCursor(TQt::waitCursor);
          setEnabled(false);
          if ( !proc->start() )
              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));
    }
 }
 
@@ -335,9 +335,9 @@ void LisaSettings::suggestSettings()
       //not that easy to handle
       for (MyNIC* tmp=nics->first(); tmp!=0; tmp=nics->next())
       {
-         msg+="<b>"+tmp->name+": </b>"+tmp->addr+"/"+tmp->netmask+";<br>";
+         msg+="<b>"+tmp->name+": </b>"+tmp->addr+"/"+tmp->nettqmask+";<br>";
       }
-      KMessageBox::information(0,TQString("<html>%1</html>").arg(msg));
+      KMessageBox::information(0,TQString("<html>%1</html>").tqarg(msg));
    }
 
    emit changed();