Rename KInstance and KAboutData to avoid conflicts with KDE4

13 files changed, 36 insertions, 36 deletions

diff --git a/examples/example_dcopexport.py b/examples/example_dcopexport.py
index 6c9efdb..2e7a504 100644
--- a/examples/example_dcopexport.py
+++ b/examples/example_dcopexport.py
@@ -34,7 +34,7 @@ copyright holder.
 # which was written by Torben Weis and Julian Rockey
 
 import sys
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData
 from dcopexport import DCOPExObj
 from qt import TQString, TQStringList
 
@@ -102,8 +102,8 @@ class DeadParrotObject (DCOPExObj):
 
 description = "A basic application template"
 version     = "1.0"
-aboutData   = KAboutData ("testdcopexport", "petshop",\
-    version, description, KAboutData.License_GPL,\
+aboutData   = TDEAboutData ("testdcopexport", "petshop",\
+    version, description, TDEAboutData.License_GPL,\
     "(C) 2003 whoever the author is")
 
 aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
diff --git a/examples/example_dcopext.py b/examples/example_dcopext.py
index e206a21..721df50 100644
--- a/examples/example_dcopext.py
+++ b/examples/example_dcopext.py
@@ -30,7 +30,7 @@ copyright holder.
 import sys, time
 import dcop
 import dcopext
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData
 from qt import TQString, TQCString
 
 
@@ -54,8 +54,8 @@ def getAnyApplication (client, appName):
 
 description = "A basic application template"
 version     = "1.0"
-aboutData   = KAboutData ("testdcopext", "testdcopext",\
-    version, description, KAboutData.License_GPL,\
+aboutData   = TDEAboutData ("testdcopext", "testdcopext",\
+    version, description, TDEAboutData.License_GPL,\
     "(C) 2003 whoever the author is")
 
 aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
diff --git a/examples/kurldemo.py b/examples/kurldemo.py
index 0c03007..2ef56d3 100644
--- a/examples/kurldemo.py
+++ b/examples/kurldemo.py
@@ -31,7 +31,7 @@ urls = ["http://slashdot.org", "http://www.kde.org", "http://www.riverbankcomput
 
 import sys
 
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, KURL
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, KURL
 from tdeui import KMainWindow, KEdit
 
 class MainWin (KMainWindow):
@@ -81,8 +81,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/examples/menudemo.py b/examples/menudemo.py
index f6426ce..59931e8 100644
--- a/examples/menudemo.py
+++ b/examples/menudemo.py
@@ -43,7 +43,7 @@ import sys
 
 from qt import TQPopupMenu, SIGNAL, TQLabel, TQIconSet
 
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, i18n, KIcon, KIconLoader, KShortcut
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, KIcon, KIconLoader, KShortcut
 from tdeui import KMainWindow, KMessageBox, KStdAction, KAction, KToggleAction, KFontSizeAction, KFontAction, KRadioAction,\
                   KActionSeparator, KActionMenu, KWindowListMenu
 
@@ -274,8 +274,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/examples/mimetype.py b/examples/mimetype.py
index fc85699..e9d0031 100644
--- a/examples/mimetype.py
+++ b/examples/mimetype.py
@@ -41,7 +41,7 @@ import sys
 
 from qt import TQWidget, TQButtonGroup, TQt, TQLabel, TQListView, TQListViewItem
 
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, KURL
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, KURL
 from tdeui import KMainWindow, KTabCtl, KListBox
 from kio import KMimeType, KService, KServiceGroup, KServiceType, KTrader, KServiceTypeProfile, KServiceGroup
 
@@ -255,8 +255,8 @@ class KMimeTypeTab (TQWidget):
 
 description = "Test/demo KSharedPtr related methods/classes"
 version     = "1.0"
-aboutData   = KAboutData ("", "",\
-    version, description, KAboutData.License_GPL,\
+aboutData   = TDEAboutData ("", "",\
+    version, description, TDEAboutData.License_GPL,\
     "(C) 2003 Jim Bublitz")
 
 TDECmdLineArgs.init (sys.argv, aboutData)
diff --git a/examples/pyKHTMLPart.py b/examples/pyKHTMLPart.py
index bcccdc7..e483d6f 100644
--- a/examples/pyKHTMLPart.py
+++ b/examples/pyKHTMLPart.py
@@ -43,7 +43,7 @@ lifted from the KDE classref.
 # If you import more classes, don't forget to add them here (some of these
 # are extras/not used)
 
-from tdecore import TDECmdLineArgs, KURL, TDEApplication, i18n, KAboutData, BarIcon, KLibLoader
+from tdecore import TDECmdLineArgs, KURL, TDEApplication, i18n, TDEAboutData, BarIcon, KLibLoader
 
 from tdeui import KMainWindow, KMessageBox, KAction, KStdAction, KKeyDialog, KEditToolbar
 
@@ -186,8 +186,8 @@ description = "KHTMLPart - simple example"
 version = "0.1"
 
 # stuff for the "About" menu
-aboutData = KAboutData ("pyKHTMLPart", "pyHTMLPart",\
-    version, description, KAboutData.License_GPL,\
+aboutData = TDEAboutData ("pyKHTMLPart", "pyHTMLPart",\
+    version, description, TDEAboutData.License_GPL,\
     "(c) 2002, Jim Bublitz")
 
 aboutData.addAuthor ("Jim Bublitz", "Example for PyKDE", "jbublitz@nwinternet.com")
diff --git a/examples/pytde-sampler/about.py b/examples/pytde-sampler/about.py
index 108194b..f675b1c 100644
--- a/examples/pytde-sampler/about.py
+++ b/examples/pytde-sampler/about.py
@@ -1,11 +1,11 @@
 #!/usr/bin/env python
 """ About the PyKDE Sampler
 
-Defines the 'about' function to create a KAboutData instance for the
+Defines the 'about' function to create a TDEAboutData instance for the
 sampler application.
 """
 from os.path import dirname, join
-from tdecore import KAboutData
+from tdecore import TDEAboutData
 
 
 appName = 'pytdesampler'
@@ -14,7 +14,7 @@ authorName = 'Troy Melhase'
 authorEmail = bugsEmailAddress = 'troy@gci.net'
 version = '0.1'
 shortDescription = 'The PyKDE Sampler'
-licenseType = KAboutData.License_GPL_V2
+licenseType = TDEAboutData.License_GPL_V2
 copyrightStatement = '(c) 2006, %s' % (authorName, )
 homePageAddress = 'http://www.riverbankcomputing.co.uk/pytde/'
 aboutText = ("The application sampler for PyKDE.")
@@ -22,10 +22,10 @@ contributors = [] # module-level global for keeping the strings around; intentio
 
 
 def about():
-    """ creates KAboutData instance for the app
+    """ creates TDEAboutData instance for the app
 
     """
-    about = KAboutData(
+    about = TDEAboutData(
         appName,
         progName,
         version,
diff --git a/examples/pytde-sampler/qt_widgets/CONTRIB b/examples/pytde-sampler/qt_widgets/CONTRIB
index 3c741aa..4a37f4f 100644
--- a/examples/pytde-sampler/qt_widgets/CONTRIB
+++ b/examples/pytde-sampler/qt_widgets/CONTRIB
@@ -11,7 +11,7 @@ tdecore,BarIconSet,,,
 tdecore,DesktopIcon,,,
 tdecore,DesktopIconSet,,,
 tdecore,IconSize,,,
-tdecore,KAboutData,,,
+tdecore,TDEAboutData,,,
 tdecore,KAboutPerson,,,
 tdecore,KAboutTranslator,,,
 tdecore,KAccel,,,
@@ -57,7 +57,7 @@ tdecore,KIcon,,,
 tdecore,KIconEffect,,,
 tdecore,KIconLoader,,,
 tdecore,KIconTheme,,,
-tdecore,KInstance,,,
+tdecore,TDEInstance,,,
 tdecore,KKey,,,
 tdecore,KKeyNative,,,
 tdecore,KKeySequence,,,
diff --git a/examples/pytde-sampler/sampler.py b/examples/pytde-sampler/sampler.py
index 4e7eb43..f8048f8 100755
--- a/examples/pytde-sampler/sampler.py
+++ b/examples/pytde-sampler/sampler.py
@@ -14,7 +14,7 @@ from qt import SIGNAL, SLOT, PYSIGNAL, TQt
 from qt import TQVBoxLayout, TQLabel, TQPixmap, TQSplitter, TQFrame, TQDialog
 from qt import TQSizePolicy, TQHBoxLayout, TQSpacerItem, TQPushButton
 
-from tdecore import i18n, KAboutData, TDEApplication, TDECmdLineArgs, KGlobal
+from tdecore import i18n, TDEAboutData, TDEApplication, TDECmdLineArgs, KGlobal
 from tdecore import KGlobalSettings, KWin, KWinModule, KURL, KIcon
 
 from tdeui import KComboBox, KListView, KListViewItem, KTabWidget, KTextEdit
diff --git a/examples/uikmdi.py b/examples/uikmdi.py
index 32735ce..2b26dde 100644
--- a/examples/uikmdi.py
+++ b/examples/uikmdi.py
@@ -29,7 +29,7 @@ import os
 import sys
 
 from qt import SIGNAL, TQVBoxLayout, TQLabel
-from tdecore import i18n, KAboutData, TDEApplication, KGlobal, KIcon, TDECmdLineArgs
+from tdecore import i18n, TDEAboutData, TDEApplication, KGlobal, KIcon, TDECmdLineArgs
 from tdeui import KDockWidget, KListBox, KStdAction
 
 try:
@@ -189,11 +189,11 @@ if __name__ == '__main__':
     aname = 'PyKDE KMDI Sample'
     desc = 'A Simple PyKDE KMDI Sample'
     ver = '1.0'
-    lic = KAboutData.License_GPL
+    lic = TDEAboutData.License_GPL
     author = 'Troy Melhase'
     authormail = 'troy@gci.net'
 
-    about = KAboutData(aname, aname, ver, desc, lic, '%s (c) 2004' % authormail)
+    about = TDEAboutData(aname, aname, ver, desc, lic, '%s (c) 2004' % authormail)
     about.addAuthor(author, 'hi, mom!', authormail)
     about.addAuthor ('Jim Bublitz', 'For PyKDE', 'jbublitz@nwinternet.com')
     TDECmdLineArgs.init(sys.argv, about)
diff --git a/examples/uiqxembed.py b/examples/uiqxembed.py
index a204d7a..969f23a 100644
--- a/examples/uiqxembed.py
+++ b/examples/uiqxembed.py
@@ -6,7 +6,7 @@ import sys
 
 from qt import TQIconSet, TQProcess, TQTimer, SIGNAL, SLOT
 
-from tdecore import KAboutData, TDEApplication, TDECmdLineArgs, KGlobal, KIcon
+from tdecore import TDEAboutData, TDEApplication, TDECmdLineArgs, KGlobal, KIcon
 from tdecore import KWin, KWinModule
 from tdeui import KComboBox, KMainWindow, KPushButton, QXEmbed
 
@@ -104,11 +104,11 @@ if __name__ == '__main__':
     aname = 'PyKDE QXEmbed Sample'
     desc = 'A Simple PyKDE QXEmbed Sample'
     ver = '1.0'
-    lic = KAboutData.License_GPL
+    lic = TDEAboutData.License_GPL
     author = 'Troy Melhase'
     authormail = 'troy@gci.net'
 
-    about = KAboutData(aname, aname, ver, desc, lic, '%s (c) 2004' % authormail)
+    about = TDEAboutData(aname, aname, ver, desc, lic, '%s (c) 2004' % authormail)
     about.addAuthor(author, 'hi, mom!', authormail)
     about.addAuthor ('Jim Bublitz', 'For PyKDE', 'jbublitz@nwinternet.com')
     TDECmdLineArgs.init(sys.argv, about)
diff --git a/examples/uisampler.py b/examples/uisampler.py
index 3a1b00c..863a9f0 100644
--- a/examples/uisampler.py
+++ b/examples/uisampler.py
@@ -3,7 +3,7 @@ sys.path.append ("./uimodules")
 
 from qt import TQSplitter, TQWidgetStack, TQWidget, TQListViewItem, SIGNAL, TQCString , TQScrollView, TQRect, TQt
 
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData
 from tdeui import KMainWindow, KListView
 
 from uidialogs import *
diff --git a/examples/xmlmenudemo.py b/examples/xmlmenudemo.py
index bc9a9a2..5279896 100644
--- a/examples/xmlmenudemo.py
+++ b/examples/xmlmenudemo.py
@@ -43,7 +43,7 @@ import sys, os
 
 from qt import TQPopupMenu, SIGNAL, TQLabel, TQIconSet
 
-from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, i18n, KIcon, KIconLoader, KShortcut, KGlobal
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, KIcon, KIconLoader, KShortcut, KGlobal
 from tdeui import KMainWindow, KMessageBox, KStdAction, KAction, KToggleAction, KFontSizeAction, KFontAction, KRadioAction,\
                   KActionSeparator, KActionMenu, KWindowListMenu, KXMLGUIClient, KActionCollection
 
@@ -273,8 +273,8 @@ version     = "1.0"
 
 # The appName (xmlmenudemo - first argument) is required
 # if the program is to automatically locate it *ui.rc file
-aboutData   = KAboutData ("xmlmenudemo", "xmlmenudemo",\
-    version, description, KAboutData.License_GPL,\
+aboutData   = TDEAboutData ("xmlmenudemo", "xmlmenudemo",\
+    version, description, TDEAboutData.License_GPL,\
     "(C) 2003 whoever the author is")
 
 aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")