Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

2 files changed, 13 insertions, 13 deletions

diff --git a/wifi/kcmwifi/kcmwifi.cpp b/wifi/kcmwifi/kcmwifi.cpp
index 743f3d2e..79802e32 100644
--- a/wifi/kcmwifi/kcmwifi.cpp
+++ b/wifi/kcmwifi/kcmwifi.cpp
@@ -75,9 +75,9 @@ KCMWifi::KCMWifi(TQWidget * parent, const char *name, const TQStringList &)
   }
   else
   {
-    KProcess iwconfigtest;
+    TDEProcess iwconfigtest;
     iwconfigtest << "iwconfig";
-    if (!iwconfigtest.start(KProcess::DontCare))
+    if (!iwconfigtest.start(TDEProcess::DontCare))
     {
       KMessageBox::sorry(0, i18n("Error executing iwconfig. WLAN "
           "configurations can only be altered if the wireless tools are "
@@ -201,7 +201,7 @@ void KCMWifi::delConfigTab( int count )
 
 void KCMWifi::activate()
 {
-  KProcess proc;
+  TDEProcess proc;
 
   TQStringList failedParts;
 
@@ -233,7 +233,7 @@ void KCMWifi::activate()
        << tempInterface
        << "down";
   kdDebug() << "Command: " << proc.args() << endl;
-  proc.start (KProcess::Block);
+  proc.start (TDEProcess::Block);
 
   if ( (!proc.normalExit()) || (proc.exitStatus() != 0) ) 
 	failedParts << i18n("Interface could not be shut down.  It is likely that your settings have not been applied.");
@@ -246,7 +246,7 @@ void KCMWifi::activate()
        << ifconfig.m_networkName;
 
   kdDebug() << "Command: " << proc.args() << endl;
-  proc.start (KProcess::Block);
+  proc.start (TDEProcess::Block);
 
   if ( (!proc.normalExit()) || (proc.exitStatus() != 0) )
         failedParts << i18n("SSID could not be set.");
@@ -259,7 +259,7 @@ void KCMWifi::activate()
        << ifconfig.wifimodeAsString();
 
   kdDebug() << "Command: " << proc.args() << endl;
-  proc.start (KProcess::Block);
+  proc.start (TDEProcess::Block);
 
   if ( (!proc.normalExit()) || (proc.exitStatus() != 0) )
         failedParts << i18n("Operation mode could not be set.");
@@ -272,7 +272,7 @@ void KCMWifi::activate()
        << ifconfig.speedAsString();
 
   kdDebug() << "Command: " << proc.args() << endl;
-  proc.start (KProcess::Block);
+  proc.start (TDEProcess::Block);
 
   if ( (!proc.normalExit()) || (proc.exitStatus() != 0) )
         failedParts << i18n("Speed settings could not be modified.");
@@ -315,7 +315,7 @@ void KCMWifi::activate()
   }
   
   kdDebug() << "Command: " << proc.args() << endl;
-  proc.start (KProcess::Block);
+  proc.start (TDEProcess::Block);
 
   if ( (ifconfig.m_useCrypto) && ((!proc.normalExit()) || (proc.exitStatus() != 0)) )
         failedParts << i18n("Encryption settings could not be set.");
@@ -342,7 +342,7 @@ void KCMWifi::activate()
   }
 
   kdDebug() << "Command: " << proc.args() << endl;
-  proc.start (KProcess::Block);
+  proc.start (TDEProcess::Block);
 
   if ( (ifconfig.m_pmEnabled) && ((!proc.normalExit()) || (proc.exitStatus() != 0)) )
         failedParts << i18n("Power management settings could not be set.");
@@ -353,7 +353,7 @@ void KCMWifi::activate()
        << "up";
   
   kdDebug() << "Command: " << proc.args() << endl;
-  proc.start (KProcess::Block);
+  proc.start (TDEProcess::Block);
 
   if ( (!proc.normalExit()) || (proc.exitStatus() != 0) )
         failedParts << i18n("Interface could not be re-enabled.");
@@ -363,7 +363,7 @@ void KCMWifi::activate()
     proc.clearArguments();
     proc << TQStringList::split( " ", ifconfig.m_connectScript );
 
-    proc.start(KProcess::DontCare);
+    proc.start(TDEProcess::DontCare);
   }
 
 if (!failedParts.empty()) KMessageBox::informationList(0,i18n("The following settings could not be applied:"),failedParts);
diff --git a/wifi/kcmwifi/wificonfig.cpp b/wifi/kcmwifi/wificonfig.cpp
index 1cd6b3f2..6941b80e 100644
--- a/wifi/kcmwifi/wificonfig.cpp
+++ b/wifi/kcmwifi/wificonfig.cpp
@@ -186,7 +186,7 @@ WifiConfig *WifiConfig::instance()
 
 WifiConfig::WifiConfig()
 {
-  //m_config = KGlobal::config();
+  //m_config = TDEGlobal::config();
   m_config = new KSimpleConfig( "kcmwifirc" );
 
   load();
@@ -270,7 +270,7 @@ TQString WifiConfig::autoDetectInterface()
       test << *it;
       connect( &test, TQT_SIGNAL( readReady( KProcIO * ) ),
                this, TQT_SLOT( slotTestInterface( KProcIO * ) ) );
-      test.start ( KProcess::Block );
+      test.start ( TDEProcess::Block );
     }
   }