Rename KInstance and KAboutData to avoid conflicts with KDE4

7 files changed, 17 insertions, 17 deletions

diff --git a/displayconfig/displayconfig.py b/displayconfig/displayconfig.py
index f1de404..c486a40 100755
--- a/displayconfig/displayconfig.py
+++ b/displayconfig/displayconfig.py
@@ -1734,8 +1734,8 @@ def create_displayconfig(parent,name):
 
 ############################################################################
 def MakeAboutData():
-    aboutdata = KAboutData("guidance",programname,version, \
-        "Display and Graphics Configuration Tool", KAboutData.License_GPL, \
+    aboutdata = TDEAboutData("guidance",programname,version, \
+        "Display and Graphics Configuration Tool", TDEAboutData.License_GPL, \
         "Copyright (C) 2003-2007 Simon Edwards", \
         "Thanks go to  Phil Thompson, Jim Bublitz and David Boddie.")
     aboutdata.addAuthor("Simon Edwards","Developer","simon@simonzone.com", \
diff --git a/grubconfig/grubconfig.py b/grubconfig/grubconfig.py
index 3fccfbd..435d701 100644
--- a/grubconfig/grubconfig.py
+++ b/grubconfig/grubconfig.py
@@ -679,9 +679,9 @@ def create_grubconfig(parent,name):
 
 ##########################################################################
 def MakeAboutData():
-    aboutdata = KAboutData("guidance", programname, version,
+    aboutdata = TDEAboutData("guidance", programname, version,
         unicode(i18n("Boot Loader Configuration Tool")).encode(locale.getpreferredencoding()),
-        KAboutData.License_GPL, "Copyright (C) 2006-2007 Martin Böhm")
+        TDEAboutData.License_GPL, "Copyright (C) 2006-2007 Martin Böhm")
     aboutdata.addAuthor("Martin Böhm", "Developer", "martin.bohm@kubuntu.org", "http://mhb.ath.cx/")
     aboutdata.addAuthor("Simon Edwards", "Developer", "simon@simonzone.com", "http://www.simonzone.com/software/")
     aboutdata.addAuthor("Sebastian Kügler", "Developer", "sebas@kde.org", "http://vizZzion.org")
diff --git a/mountconfig/mountconfig.py b/mountconfig/mountconfig.py
index 7f120d7..6ddec47 100755
--- a/mountconfig/mountconfig.py
+++ b/mountconfig/mountconfig.py
@@ -3270,7 +3270,7 @@ class MountConfigApp(programbase):
         pass
 
     def aboutData(self):
-        # Return the KAboutData object which we created during initialisation.
+        # Return the TDEAboutData object which we created during initialisation.
         return self.aboutdata
     def buttons(self):
         # Only supply a Help button. Other choices are Default and Apply.
@@ -3286,8 +3286,8 @@ def create_mountconfig(parent,name):
 
 ############################################################################
 def MakeAboutData():
-    aboutdata = KAboutData("mountconfig",programname,version,"Disk & Filesystem Configuration Tool", 
-                    KAboutData.License_GPL, "Copyright (C) 2003-2007 Simon Edwards")
+    aboutdata = TDEAboutData("mountconfig",programname,version,"Disk & Filesystem Configuration Tool", 
+                    TDEAboutData.License_GPL, "Copyright (C) 2003-2007 Simon Edwards")
     aboutdata.addAuthor("Simon Edwards","Developer","simon@simonzone.com",
                                 "http://www.simonzone.com/software/guidance")
     aboutdata.addAuthor("Sebastian Kügler","Developer","sebas@kde.org","http://vizZzion.org");
diff --git a/powermanager/guidance-power-manager.py b/powermanager/guidance-power-manager.py
index 765796b..0edeedb 100755
--- a/powermanager/guidance-power-manager.py
+++ b/powermanager/guidance-power-manager.py
@@ -1106,8 +1106,8 @@ class PMApp(TDEApplication):
 
 
 if __name__ == "__main__":
-    aboutdata = KAboutData("guidance", "Power Manager", "0.8.0", 
-        "Handles battery, display and suspend modes for your computer.", KAboutData.License_GPL, 
+    aboutdata = TDEAboutData("guidance", "Power Manager", "0.8.0", 
+        "Handles battery, display and suspend modes for your computer.", TDEAboutData.License_GPL, 
         "(C) 2006-2007 Sebastian Kügler, Canonical Ltd, Luka Renko", 
         None, None, "jriddell@ubuntu.com")
     aboutdata.addAuthor("Sebastian Kügler", "Developer", "sebas@kde.org","http://vizZzion.org")
diff --git a/serviceconfig/serviceconfig.py b/serviceconfig/serviceconfig.py
index fd2657a..7d6d952 100755
--- a/serviceconfig/serviceconfig.py
+++ b/serviceconfig/serviceconfig.py
@@ -1362,7 +1362,7 @@ class SysVInitApp(programbase):
         pass
 
     def aboutData(self):
-        # Return the KAboutData object which we created during initialisation.
+        # Return the TDEAboutData object which we created during initialisation.
         return self.aboutdata
 
     def buttons(self):
@@ -1464,8 +1464,8 @@ def create_serviceconfig(parent,name):
 
 ############################################################################
 def MakeAboutData():
-    aboutdata = KAboutData("guidance",programname,version, \
-        "Services Configuration Tool", KAboutData.License_GPL, \
+    aboutdata = TDEAboutData("guidance",programname,version, \
+        "Services Configuration Tool", TDEAboutData.License_GPL, \
         "Copyright (C) 2003-2007 Simon Edwards", \
         "Thanks go to  Phil Thompson, Jim Bublitz and David Boddie.")
     aboutdata.addAuthor("Simon Edwards","Developer","simon@simonzone.com","http://www.simonzone.com/software/")
diff --git a/userconfig/userconfig.py b/userconfig/userconfig.py
index cf1456f..dace835 100755
--- a/userconfig/userconfig.py
+++ b/userconfig/userconfig.py
@@ -568,7 +568,7 @@ class UserConfigApp(programbase):
         pass
 
     def aboutData(self):
-        # Return the KAboutData object which we created during initialisation.
+        # Return the TDEAboutData object which we created during initialisation.
         return self.aboutdata
     def buttons(self):
         # Only supply a Help button. Other choices are Default and Apply.
@@ -1736,9 +1736,9 @@ def create_userconfig(parent,name):
 
 ##########################################################################
 def MakeAboutData():
-    aboutdata = KAboutData("guidance", programname, version,
+    aboutdata = TDEAboutData("guidance", programname, version,
         unicode(i18n("User and Group Configuration Tool")).encode(locale.getpreferredencoding()),
-        KAboutData.License_GPL, "Copyright (C) 2003-2007 Simon Edwards")
+        TDEAboutData.License_GPL, "Copyright (C) 2003-2007 Simon Edwards")
     aboutdata.addAuthor("Simon Edwards", "Developer", "simon@simonzone.com", "http://www.simonzone.com/software/")
     aboutdata.addAuthor("Sebastian Kügler", "Developer", "sebas@kde.org", "http://vizZzion.org")
     return aboutdata
diff --git a/wineconfig/wineconfig.py b/wineconfig/wineconfig.py
index ec2c3e9..7828180 100755
--- a/wineconfig/wineconfig.py
+++ b/wineconfig/wineconfig.py
@@ -3526,8 +3526,8 @@ def create_wineconfig(parent,name):
 
 ############################################################################
 def MakeAboutData():
-    aboutdata = KAboutData("guidance",programname,version, \
-        "Wine Configuration Tool", KAboutData.License_GPL, \
+    aboutdata = TDEAboutData("guidance",programname,version, \
+        "Wine Configuration Tool", TDEAboutData.License_GPL, \
         "Copyright (C) 2006-2007 Yuriy Kozlov", \
         "Thanks go to  Simon Edwards, Sebastian Kügler")
     aboutdata.addAuthor("Yuriy Kozlov","Developer","yuriy.kozlov@gmail.com", \