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

8 files changed, 27 insertions, 27 deletions

diff --git a/wifi/interface_wireless_wirelessextensions.cpp b/wifi/interface_wireless_wirelessextensions.cpp
index aad56fa6..7521391e 100644
--- a/wifi/interface_wireless_wirelessextensions.cpp
+++ b/wifi/interface_wireless_wirelessextensions.cpp
@@ -541,7 +541,7 @@ TQTable* Interface_wireless_wirelessextensions::get_available_networks ()
 
 //    connect ( iwlist, TQT_SIGNAL ( readReady ( KProcIO * ) ), this, TQT_SLOT ( parseScanData ( KProcIO * ) ) );
 	    
-   if ( !iwlist->start ( KProcess::Block ) )
+   if ( !iwlist->start ( TDEProcess::Block ) )
         KMessageBox::sorry ( 0, i18n ( "Unable to perform the scan. Please make sure the executable \"iwlist\" is in your $PATH." ),
 				i18n ( "Scanning not possible" ) );
 
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 );
     }
   }
 
diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp
index 1d6bcbe3..8c2f976a 100644
--- a/wifi/kwifimanager.cpp
+++ b/wifi/kwifimanager.cpp
@@ -452,7 +452,7 @@ KWiFiManagerApp::slotDisableRadio ()
     onOrOff = "off";
   }
 
-  disablePower = new KProcess;
+  disablePower = new TDEProcess;
 
   // FIXME my Cisco Aironet 350 has two interfaces eth1 and wifi1,
   // kwifimanager works on wifi 1 where txpower does not work -- jriddell
@@ -460,8 +460,8 @@ KWiFiManagerApp::slotDisableRadio ()
   //*disablePower << "tdesu" << "iwconfig" << "eth1" << "txpower" << onOrOff;
 
   *disablePower << "tdesu" << "iwconfig" << interface << "txpower" << onOrOff;
-  connect( disablePower, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotDisablePowerProcessExited()) );
-  disablePower->start(KProcess::NotifyOnExit);
+  connect( disablePower, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotDisablePowerProcessExited()) );
+  disablePower->start(TDEProcess::NotifyOnExit);
 }
 
 void
@@ -557,9 +557,9 @@ KWiFiManagerApp::slotFileQuit ()
 void
 KWiFiManagerApp::slotStartConfigEditor ()
 {
-  KProcess startConf;
+  TDEProcess startConf;
   startConf << "tdesu" << locate("exe", "kcmshell") << "kcmwifi";
-  startConf.start (KProcess::DontCare);
+  startConf.start (TDEProcess::DontCare);
 }
 
 void KWiFiManagerApp::saveProperties( KConfig* conf)
diff --git a/wifi/kwifimanager.h b/wifi/kwifimanager.h
index 00fe62a3..90234772 100644
--- a/wifi/kwifimanager.h
+++ b/wifi/kwifimanager.h
@@ -33,7 +33,7 @@ class TQStringList;
 #include <kmainwindow.h>
 class KSystemTray;
 class KToggleAction;
-class KProcess;
+class TDEProcess;
 
 // application specific includes
 #include "interface_wireless.h"
@@ -135,7 +135,7 @@ private:
   Interface_wireless *device;
   TQPushButton * scan;
   Led *led;
-  KProcess* disablePower;
+  TDEProcess* disablePower;
   bool showStrength;
   bool showStatsNoise;
   bool m_startDocked;
diff --git a/wifi/kwireless/kwireless.cpp b/wifi/kwireless/kwireless.cpp
index 39b66a76..8e4944d6 100644
--- a/wifi/kwireless/kwireless.cpp
+++ b/wifi/kwireless/kwireless.cpp
@@ -78,7 +78,7 @@ extern "C"
 {
     KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile)
     {
-        KGlobal::locale()->insertCatalogue("kwireless");
+        TDEGlobal::locale()->insertCatalogue("kwireless");
         return new KWireLess(configFile, KPanelApplet::Normal,
                              KPanelApplet::About,
                              // | KPanelApplet::Help | KPanelApplet::Preferences,
diff --git a/wifi/kwireless/kwirelesswidget.cpp b/wifi/kwireless/kwirelesswidget.cpp
index 77e20128..362740e1 100644
--- a/wifi/kwireless/kwirelesswidget.cpp
+++ b/wifi/kwireless/kwirelesswidget.cpp
@@ -217,7 +217,7 @@ void KWireLessWidget::paintEvent(TQPaintEvent*)
     }
 
     painter.setPen(TQPen(TQt::black, frameWidth));
-    painter.setBrush(KGlobalSettings::baseColor());
+    painter.setBrush(TDEGlobalSettings::baseColor());
     painter.drawRect(0, 0, w, h);
 
     int x = qualityBarWidth + frameWidth;
diff --git a/wifi/networkscanning.cpp b/wifi/networkscanning.cpp
index 509e1f9f..d7f07db7 100644
--- a/wifi/networkscanning.cpp
+++ b/wifi/networkscanning.cpp
@@ -124,14 +124,14 @@ NetworkScanning::switchToNetwork()
 
   cmdline = (TQString)"iwconfig %1 essid %2 mode %3 enc %4\n";
   cmdline = cmdline.arg( device->get_interface_name() );
-  cmdline = cmdline.arg( KProcess::quote( networks->text( networks->currentRow(), 0 ) ) );
+  cmdline = cmdline.arg( TDEProcess::quote( networks->text( networks->currentRow(), 0 ) ) );
 
   TQString modetemp;
   if (networks->text( networks->currentRow(), 1 ) == i18n("Managed") ) modetemp = "Managed"; else modetemp = "Ad-Hoc"; 
   cmdline = cmdline.arg( modetemp );
 
   if ( encryption != NONE ) {
-    cmdline = cmdline.arg( (encryption == VALID_STRING ? "s:" : "" ) + KProcess::quote( networks->text( networks->currentRow(), 3 ) ) );
+    cmdline = cmdline.arg( (encryption == VALID_STRING ? "s:" : "" ) + TDEProcess::quote( networks->text( networks->currentRow(), 3 ) ) );
   } else {
     cmdline = cmdline.arg("off");
   }
@@ -143,9 +143,9 @@ NetworkScanning::switchToNetwork()
 
   delete tempfile; // autoDeletion off, so the file remains on disk
 
-  KProcess switchProc;
+  TDEProcess switchProc;
   switchProc << "tdesu" << tempfilename;
-  switchProc.start( KProcess::Block );
+  switchProc.start( TDEProcess::Block );
 
   remove(tempfilename.ascii());