Rename KInstance and KAboutData to avoid conflicts with KDE4

9 files changed, 29 insertions, 29 deletions

diff --git a/templates/annotated/basicapp.py b/templates/annotated/basicapp.py
index b5abe80..a725004 100644
--- a/templates/annotated/basicapp.py
+++ b/templates/annotated/basicapp.py
@@ -35,7 +35,7 @@ copyright holder.
 
 import sys
 
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData
 from tdeui import KMainWindow
 
 """
@@ -58,17 +58,17 @@ class MainWin (KMainWindow):
 #-------------------- main ------------------------------------------------
 
 # set up some basic information about the program in
-# a KAboutData object - this affects the application's
+# a TDEAboutData object - this affects the application's
 # title bar caption and makes it easy to set up a
 # Help | About dialog box for your app
 appName     = "some app"
 programName = "some program"
 description = "A basic application template"
-license     = KAboutData.License_GPL
+license     = TDEAboutData.License_GPL
 version     = "1.0"
 copyright   = "(C) 2003 whoever the author is"
 
-aboutData   = KAboutData (appName, programName, version, description, license, copyright)
+aboutData   = TDEAboutData (appName, programName, version, description, license, copyright)
 
 # you can add the names of the app's authors here
 aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
diff --git a/templates/annotated/menuapp1.py b/templates/annotated/menuapp1.py
index faa8662..93b2a90 100644
--- a/templates/annotated/menuapp1.py
+++ b/templates/annotated/menuapp1.py
@@ -45,7 +45,7 @@ import sys
 
 from qt import TQPopupMenu, SIGNAL
 
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, i18n, KStdAccel, KIcon, KIconLoader
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, KStdAccel, KIcon, KIconLoader
 from tdeui import KMainWindow, KMessageBox
 
 TOOLBAR_NEW   = 1
@@ -136,7 +136,7 @@ class MainWin (KMainWindow):
 
         # Let KDE generate a nifty help menu
 
-        # The KAboutData/TDECmdLineArgs data from the main part of the program
+        # The TDEAboutData/TDECmdLineArgs data from the main part of the program
         # will be used to generate the About dialog
 
         helpMenu = self.helpMenu ("")
@@ -253,8 +253,8 @@ class MainWin (KMainWindow):
 
 description = "A basic application template"
 version     = "1.0"
-aboutData   = KAboutData ("", "",\
-    version, description, KAboutData.License_GPL,\
+aboutData   = TDEAboutData ("", "",\
+    version, description, TDEAboutData.License_GPL,\
     "(C) 2003 whoever the author is")
 
 aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
diff --git a/templates/annotated/menuapp2.py b/templates/annotated/menuapp2.py
index 1924eef..6447d1c 100644
--- a/templates/annotated/menuapp2.py
+++ b/templates/annotated/menuapp2.py
@@ -43,7 +43,7 @@ import sys
 
 from qt import TQPopupMenu, SIGNAL
 
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, i18n
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n
 from tdeui import KMainWindow, KMessageBox, KStdAction, KAction
 
 STATUSBAR_LEFT   = 1
@@ -147,7 +147,7 @@ class MainWin (KMainWindow):
         self.specialAction.plug (editMenu)
         self.menuBar ().insertItem (i18n ("&Edit"), editMenu)
 
-        # Uses the info from KAboutData (specified below)
+        # Uses the info from TDEAboutData (specified below)
         # to construct the "About" box in the Help menu
 
         helpMenu = self.helpMenu ("")
@@ -227,8 +227,8 @@ class MainWin (KMainWindow):
 
 description = "A basic application template"
 version     = "1.0"
-aboutData   = KAboutData ("", "",\
-    version, description, KAboutData.License_GPL,\
+aboutData   = TDEAboutData ("", "",\
+    version, description, TDEAboutData.License_GPL,\
     "(C) 2003 whoever the author is")
 
 aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
diff --git a/templates/annotated/menuapp3.py b/templates/annotated/menuapp3.py
index 84a90f7..59b0a6a 100644
--- a/templates/annotated/menuapp3.py
+++ b/templates/annotated/menuapp3.py
@@ -43,7 +43,7 @@ import sys
 
 from qt import TQPopupMenu, SIGNAL
 
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, i18n
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n
 from tdeui import KMainWindow, KMessageBox, KStdAction, KAction, KActionCollection
 
 STATUSBAR_LEFT   = 1
@@ -188,11 +188,11 @@ description = "A basic application template"
 version     = "1.0"
 
 # To use the XMLGUI mechanism, you MUST provide an appName
-# (the first argument to KAboutData below) - the XML spec
+# (the first argument to TDEAboutData below) - the XML spec
 # for the interface will be in <appName>ui.rc (don't forget
 # the "ui" suffix to the application name)
-aboutData   = KAboutData ("menuapp3", "",\
-    version, description, KAboutData.License_GPL,\
+aboutData   = TDEAboutData ("menuapp3", "",\
+    version, description, TDEAboutData.License_GPL,\
     "(C) 2003 whoever the author is")
 
 aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
diff --git a/templates/annotated/systray1.py b/templates/annotated/systray1.py
index db017c3..faf97e0 100644
--- a/templates/annotated/systray1.py
+++ b/templates/annotated/systray1.py
@@ -74,7 +74,7 @@ class MainWin (KMainWindow):
 
 #-------------------- main ------------------------------------------------
 
-# The usual stuff - you can also use the KAboutData/TDECmdLineArgs version
+# The usual stuff - you can also use the TDEAboutData/TDECmdLineArgs version
 # for program startup used in other templates - the TDEApplication constructor
 # used here may be obsoleted eventually
 appName = "template"
diff --git a/templates/basic/basicapp.py b/templates/basic/basicapp.py
index 01ce1af..53e0c51 100644
--- a/templates/basic/basicapp.py
+++ b/templates/basic/basicapp.py
@@ -30,7 +30,7 @@ copyright holder.
 import sys
 
 from qt import SIGNAL
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData
 from tdeui import KMainWindow
 
 class MainWin (KMainWindow):
@@ -42,8 +42,8 @@ class MainWin (KMainWindow):
 
 description = "A basic application template"
 version     = "1.0"
-aboutData   = KAboutData ("", "",\
-    version, description, KAboutData.License_GPL,\
+aboutData   = TDEAboutData ("", "",\
+    version, description, TDEAboutData.License_GPL,\
     "(C) 2003 whoever the author is")
 
 aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
diff --git a/templates/basic/menuapp1.py b/templates/basic/menuapp1.py
index 7809cef..6bd548e 100644
--- a/templates/basic/menuapp1.py
+++ b/templates/basic/menuapp1.py
@@ -44,7 +44,7 @@ import sys
 
 from qt import TQPopupMenu, SIGNAL
 
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, i18n, KStdAccel, KIcon, KIconLoader
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, KStdAccel, KIcon, KIconLoader
 from tdeui import KMainWindow, KMessageBox
 
 TOOLBAR_NEW   = 1
@@ -177,8 +177,8 @@ class MainWin (KMainWindow):
 
 description = "A basic application template"
 version     = "1.0"
-aboutData   = KAboutData ("", "",\
-    version, description, KAboutData.License_GPL,\
+aboutData   = TDEAboutData ("", "",\
+    version, description, TDEAboutData.License_GPL,\
     "(C) 2003 whoever the author is")
 
 aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
diff --git a/templates/basic/menuapp2.py b/templates/basic/menuapp2.py
index f765692..1f68d59 100644
--- a/templates/basic/menuapp2.py
+++ b/templates/basic/menuapp2.py
@@ -43,7 +43,7 @@ import sys
 
 from qt import TQPopupMenu, SIGNAL
 
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, i18n, KShortcut
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, KShortcut
 from tdeui import KMainWindow, KMessageBox, KStdAction, KAction
 
 STATUSBAR_LEFT   = 1
@@ -183,8 +183,8 @@ class MainWin (KMainWindow):
 
 description = "A basic application template"
 version     = "1.0"
-aboutData   = KAboutData ("", "",\
-    version, description, KAboutData.License_GPL,\
+aboutData   = TDEAboutData ("", "",\
+    version, description, TDEAboutData.License_GPL,\
     "(C) 2003 whoever the author is")
 
 aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
diff --git a/templates/basic/menuapp3.py b/templates/basic/menuapp3.py
index 9051661..cd46f81 100644
--- a/templates/basic/menuapp3.py
+++ b/templates/basic/menuapp3.py
@@ -43,7 +43,7 @@ import sys
 
 from qt import TQPopupMenu, SIGNAL
 
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, i18n, KShortcut
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, KShortcut
 from tdeui import KMainWindow, KMessageBox, KStdAction, KAction, KActionCollection
 
 STATUSBAR_LEFT   = 1
@@ -144,8 +144,8 @@ class MainWin (KMainWindow):
 
 description = "A basic application template"
 version     = "1.0"
-aboutData   = KAboutData ("menuapp3", "",\
-    version, description, KAboutData.License_GPL,\
+aboutData   = TDEAboutData ("menuapp3", "",\
+    version, description, TDEAboutData.License_GPL,\
     "(C) 2003 whoever the author is")
 
 aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")