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

3 files changed, 4 insertions, 4 deletions

diff --git a/app_templates/kcontrol_module/src/kcontrol_module.py b/app_templates/kcontrol_module/src/kcontrol_module.py
index a33e43e..423b029 100755
--- a/app_templates/kcontrol_module/src/kcontrol_module.py
+++ b/app_templates/kcontrol_module/src/kcontrol_module.py
@@ -69,7 +69,7 @@ class KcontrolModuleApp(programbase):
 
         # The appdir needs to be explicitly otherwise we won't be able to
         # load our icons and images.
-        KGlobal.iconLoader().addAppDir("kcontrol_module")
+        TDEGlobal.iconLoader().addAppDir("kcontrol_module")
         
         if standalone:
             toplayout = QVBoxLayout( self.plainPage(), 0, KDialog.spacingHint() )
diff --git a/app_templates/kdeapp/src/kdeapp.py b/app_templates/kdeapp/src/kdeapp.py
index 12c30bd..2aa4899 100755
--- a/app_templates/kdeapp/src/kdeapp.py
+++ b/app_templates/kdeapp/src/kdeapp.py
@@ -223,13 +223,13 @@ class KdeApp(KMainWindow):
 
     def optionsConfigureToolbars(self):
         # use the standard toolbar editor
-        self.saveMainWindowSettings(KGlobal.config())
+        self.saveMainWindowSettings(TDEGlobal.config())
 
     def newToolbarConfig(self):
         # this slot is called when user clicks "Ok" or "Apply" in the toolbar editor.
         # recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.)
         self.createGUI()
-        self.applyMainWindowSettings(KGlobal.config())
+        self.applyMainWindowSettings(TDEGlobal.config())
 
     def changeStatusbar(self,text):
         # display the text on the statusbar
diff --git a/src/kdedistutils.py b/src/kdedistutils.py
index 5abc663..c9749c0 100644
--- a/src/kdedistutils.py
+++ b/src/kdedistutils.py
@@ -988,7 +988,7 @@ static KCModule* return_instance( QWidget *parent, const char *name ) {
     //pyize->releaseLock ();
 
     // take care of any translation info
-    KGlobal::locale()->insertCatalogue(script);
+    TDEGlobal::locale()->insertCatalogue(script);
 
     // Return the pointer to our new KCModule
     return kcmodule;