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, 7 insertions, 7 deletions

diff --git a/wifi/kcmwifi/vendorconfig.cpp b/wifi/kcmwifi/vendorconfig.cpp
index e415c276..01936667 100644
--- a/wifi/kcmwifi/vendorconfig.cpp
+++ b/wifi/kcmwifi/vendorconfig.cpp
@@ -89,7 +89,7 @@ VendorConfig::initSuSE_92plus (  )
 	      TQString var = buffer.section ( '=', 0, 0 );
 	      TQString value = buffer.section ( '=', 1, 1 );
 	      value = value.mid ( 1, value.length (  ) - 3 );
-	      kdDebug (  ) << "Variable " << var << " contains " << value << ".\n";
+	      kdDebug (  ) << "Variable " << var << " tqcontains " << value << ".\n";
 	      // evaluate the meaningful lines
 	      if ( var == "WIRELESS_ESSID" )
 		{
@@ -182,16 +182,16 @@ is incremented _after_ successful setup of each given config. */
 // lines look like wireless-defaultkey bla, so split it into wireless-defaultkey and bla
       TQString var = buffer.section ( ' ', 0, 0 );
       TQString value = buffer.section ( ' ', 1, 1 );
-      kdDebug (  ) << "Variable " << var << " contains " << value << ".\n";
+      kdDebug (  ) << "Variable " << var << " tqcontains " << value << ".\n";
 // evaluate the meaningful lines
-      if ( var.startsWith ( "wireless", false ) )
+      if ( var.tqstartsWith ( "wireless", false ) )
 	{
 	  if ( var.endsWith ( "essid" ) )
 	    {
 	      newtab->le_networkName->setText ( value );
 	    }
 
-	  else if ( var.endsWith ( "mode" ) && !var.contains ( "key" ) )
+	  else if ( var.endsWith ( "mode" ) && !var.tqcontains ( "key" ) )
 
 	    {
 	      newtab->cmb_wifiMode->setCurrentItem ( IfConfig::convertToWifiModeFromString ( value ) );
@@ -203,15 +203,15 @@ is incremented _after_ successful setup of each given config. */
 	      newtab->cmb_speed->setCurrentItem ( IfConfig::convertToSpeedFromString ( value ) );
 	    }
 
-	  else if ( var.contains ( "key" ) )
+	  else if ( var.tqcontains ( "key" ) )
 	    {
 // Could be any of key, key1, key2, ..., or defaultkey
-	      if ( var.contains ( "default" ) )
+	      if ( var.tqcontains ( "default" ) )
 		{
 		  crypto->cmb_activeKey->setCurrentItem ( value.toInt (  ) );
 		}
 
-	      else if ( var.contains ( "mode" ) )
+	      else if ( var.tqcontains ( "mode" ) )
 		{
 		  if ( value == "shared" || value == "sharedkey" || value == "restricted" )
 		    {