Rename KApplication to TDEApplication to avoid conflicts with KDE4

11 files changed, 19 insertions, 19 deletions

diff --git a/displayconfig/displayconfig.py b/displayconfig/displayconfig.py
index 13a37cf..e7ed624 100755
--- a/displayconfig/displayconfig.py
+++ b/displayconfig/displayconfig.py
@@ -1729,7 +1729,7 @@ class DpmsPage(QWidget):
 def create_displayconfig(parent,name):
     """ Factory function for KControl """
     global kapp
-    kapp = KApplication.kApplication()
+    kapp = TDEApplication.kApplication()
     return DisplayApp(parent, name)
 
 ############################################################################
@@ -1750,7 +1750,7 @@ if standalone:
     aboutdata = MakeAboutData()
     KCmdLineArgs.init(sys.argv,aboutdata)
 
-    kapp = KApplication()
+    kapp = TDEApplication()
 
     displayapp = DisplayApp()
     displayapp.exec_loop()
diff --git a/grubconfig/grubconfig.py b/grubconfig/grubconfig.py
index c138ba6..cf0859d 100644
--- a/grubconfig/grubconfig.py
+++ b/grubconfig/grubconfig.py
@@ -692,6 +692,6 @@ if standalone:
 
     KCmdLineArgs.init(sys.argv,aboutdata)
 
-    kapp = KApplication()
+    kapp = TDEApplication()
     grubconfigapp = GrubConfigAppClass()
     grubconfigapp.exec_loop()
diff --git a/mountconfig/fuser.py b/mountconfig/fuser.py
index 4e7f511..9bc54c9 100644
--- a/mountconfig/fuser.py
+++ b/mountconfig/fuser.py
@@ -289,7 +289,7 @@ if standalone:
     # print args.count()
     # ----------------------------------------------------------------------------
 
-    kapp = KApplication()
+    kapp = TDEApplication()
     KGlobal.iconLoader().addAppDir("guidance")
     fuserapp = FUser(device)
 
diff --git a/mountconfig/mountconfig.py b/mountconfig/mountconfig.py
index e29d3cb..67c5fed 100755
--- a/mountconfig/mountconfig.py
+++ b/mountconfig/mountconfig.py
@@ -3281,7 +3281,7 @@ class MountConfigApp(programbase):
 def create_mountconfig(parent,name):
     global kapp, microhal
     microhal = MicroHAL.MicroHAL()
-    kapp = KApplication.kApplication()    
+    kapp = TDEApplication.kApplication()    
     return MountConfigApp(parent, name)
 
 ############################################################################
@@ -3298,6 +3298,6 @@ if standalone:
     KCmdLineArgs.init(sys.argv,aboutdata)
 
     microhal = MicroHAL.MicroHAL()
-    kapp = KApplication()
+    kapp = TDEApplication()
     sysvapp = MountConfigApp()
     sysvapp.exec_loop()
diff --git a/powermanager/guidance-power-manager.py b/powermanager/guidance-power-manager.py
index c707285..480a856 100755
--- a/powermanager/guidance-power-manager.py
+++ b/powermanager/guidance-power-manager.py
@@ -1099,7 +1099,7 @@ class PowermanagerApp(KDialogBase):
 
 # There's a bug in KUniqueApplication that shows the pid in the dcop name,
 # this fugly hack works around it.
-class PMApp(KApplication):
+class PMApp(TDEApplication):
 
     def name(self):
         return "power-manager"
@@ -1116,7 +1116,7 @@ if __name__ == "__main__":
     aboutdata.setProgramLogo(QImage("power-manager.png"))
     KCmdLineArgs.init(sys.argv, aboutdata)
     #kapp = KUniqueApplication(True, True, False)
-    #kapp = KApplication()
+    #kapp = TDEApplication()
     kapp = PMApp(True, True)
     mainWindow = PowermanagerApp(None, "main window")
     doDcop(kapp)
diff --git a/powermanager/guidance_power_manager_ui.py b/powermanager/guidance_power_manager_ui.py
index a5755a5..dcaf270 100644
--- a/powermanager/guidance_power_manager_ui.py
+++ b/powermanager/guidance_power_manager_ui.py
@@ -10,7 +10,7 @@
 
 import sys
 from qt import *
-from tdecore import KCmdLineArgs, KApplication
+from tdecore import KCmdLineArgs, TDEApplication
 from tdecore import i18n
 from tdeui import *
 
@@ -232,7 +232,7 @@ if __name__ == "__main__":
     version     = ""
 
     KCmdLineArgs.init (sys.argv, appname, description, version)
-    a = KApplication ()
+    a = TDEApplication ()
 
     QObject.connect(a,SIGNAL("lastWindowClosed()"),a,SLOT("quit()"))
     w = PowerManagerUI()
diff --git a/powermanager/notify.py b/powermanager/notify.py
index 3c04030..52e6eb2 100644
--- a/powermanager/notify.py
+++ b/powermanager/notify.py
@@ -10,7 +10,7 @@
 
 import sys
 from qt import *
-from tdecore import KCmdLineArgs, KApplication
+from tdecore import KCmdLineArgs, TDEApplication
 from tdecore import i18n
 from tdeui import *
 
@@ -59,7 +59,7 @@ if __name__ == "__main__":
     version     = ""
 
     KCmdLineArgs.init (sys.argv, appname, description, version)
-    a = KApplication ()
+    a = TDEApplication ()
 
     QObject.connect(a,SIGNAL("lastWindowClosed()"),a,SLOT("quit()"))
     w = NotifyWidget()
diff --git a/powermanager/tooltip.py b/powermanager/tooltip.py
index 1107090..6de4814 100644
--- a/powermanager/tooltip.py
+++ b/powermanager/tooltip.py
@@ -10,7 +10,7 @@
 
 import sys
 from qt import *
-from tdecore import KCmdLineArgs, KApplication
+from tdecore import KCmdLineArgs, TDEApplication
 from tdecore import i18n
 from tdeui import *
 
@@ -48,7 +48,7 @@ if __name__ == "__main__":
     version     = ""
 
     KCmdLineArgs.init (sys.argv, appname, description, version)
-    a = KApplication ()
+    a = TDEApplication ()
 
     QObject.connect(a,SIGNAL("lastWindowClosed()"),a,SLOT("quit()"))
     w = ToolTip()
diff --git a/serviceconfig/serviceconfig.py b/serviceconfig/serviceconfig.py
index b8bec48..70e958b 100755
--- a/serviceconfig/serviceconfig.py
+++ b/serviceconfig/serviceconfig.py
@@ -1459,7 +1459,7 @@ class CommandRunner(KDialogBase):
 # Factory function for KControl
 def create_serviceconfig(parent,name):
     global kapp
-    kapp = KApplication.kApplication()
+    kapp = TDEApplication.kApplication()
     return SysVInitApp(parent, name)
 
 ############################################################################
@@ -1476,6 +1476,6 @@ if standalone:
     aboutdata = MakeAboutData()
     KCmdLineArgs.init(sys.argv,aboutdata)
 
-    kapp = KApplication()
+    kapp = TDEApplication()
     sysvapp = SysVInitApp()
     sysvapp.exec_loop()
diff --git a/userconfig/userconfig.py b/userconfig/userconfig.py
index ac1064c..053a681 100755
--- a/userconfig/userconfig.py
+++ b/userconfig/userconfig.py
@@ -1748,6 +1748,6 @@ if standalone:
 
     KCmdLineArgs.init(sys.argv,aboutdata)
 
-    kapp = KApplication()
+    kapp = TDEApplication()
     userconfigapp = UserConfigApp()
     userconfigapp.exec_loop()
diff --git a/wineconfig/wineconfig.py b/wineconfig/wineconfig.py
index f662915..c766f7d 100755
--- a/wineconfig/wineconfig.py
+++ b/wineconfig/wineconfig.py
@@ -3521,7 +3521,7 @@ class LibrariesPage(QWidget):
 def create_wineconfig(parent,name):
     """ Factory function for KControl """
     global kapp
-    kapp = KApplication.kApplication()
+    kapp = TDEApplication.kApplication()
     return WineConfigApp(parent, name)
 
 ############################################################################
@@ -3546,7 +3546,7 @@ if standalone:
     options = [("+[appname]", str(i18n("Application to change settings for")))]
     KCmdLineArgs.addCmdLineOptions( options )
 
-    kapp = KApplication()
+    kapp = TDEApplication()
 
     wineconfigapp = WineConfigApp()
     wineconfigapp.exec_loop(None)