Rename KInstance and KAboutData to avoid conflicts with KDE4

app_templates/kcontrol_module/src/kcontrol_module.py

@@ -30,8 +30,8 @@ version = "0.1"
 def AboutData():
     global version,description
     
-    about_data = KAboutData("kcontrol_module", "kcontrol_module", version, \
-        description, KAboutData.License_GPL, "(C) 2005 AUTHOR", None, None,\
+    about_data = TDEAboutData("kcontrol_module", "kcontrol_module", version, \
+        description, TDEAboutData.License_GPL, "(C) 2005 AUTHOR", None, None,\
         "your@email.com")
     about_data.addAuthor("AUTHOR", None, "your@email.com")
     return about_data
@@ -137,7 +137,7 @@ class KcontrolModuleApp(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):

app_templates/kdeapp/src/kdeapp.py

@@ -245,8 +245,8 @@ options = [ ("+[URL]", "Document to open", "") ]
 def main():
     global kapp,version,description,options
 
-    aboutdata = KAboutData("kdeapp", "KdeApp", version, description, \
-        KAboutData.License_GPL, "(C) 2005 AUTHOR", None, None, "your@email.com")
+    aboutdata = TDEAboutData("kdeapp", "KdeApp", version, description, \
+        TDEAboutData.License_GPL, "(C) 2005 AUTHOR", None, None, "your@email.com")
     aboutdata.addAuthor("AUTHOR", None, "your@email.com")
     TDECmdLineArgs.init(sys.argv,aboutdata)
     TDECmdLineArgs.addCmdLineOptions(options)

app_templates/kdeutility/src/kdeutility.py

@@ -36,8 +36,8 @@ options = [] # No command line options.
 def main():
     global kapp,version,description,options
 
-    aboutdata = KAboutData("kdeutility", "KdeUtility", version, description, \
-        KAboutData.License_GPL, "(C) 2005 AUTHOR", None, None, "your@email.com")
+    aboutdata = TDEAboutData("kdeutility", "KdeUtility", version, description, \
+        TDEAboutData.License_GPL, "(C) 2005 AUTHOR", None, None, "your@email.com")
     aboutdata.addAuthor("AUTHOR", None, "your@email.com")
     TDECmdLineArgs.init(sys.argv,aboutdata)
     #TDECmdLineArgs.addCmdLineOptions(options)

src/kdedistutils.py

@@ -1836,7 +1836,7 @@ PyObject* call_function(PyObject *callable, PyObject *args) {
 extern "C" {
     int kdemain( int argc, char **argv) {
         PyObject *pModule, *pName, *pDict;
-        KInstance slave(MODULE_NAME);
+        TDEInstance slave(MODULE_NAME);
         
         Py_SetProgramName(argv[0]);
         Py_Initialize();