Rename KApplication to TDEApplication to avoid conflicts with KDE4

18 files changed, 38 insertions, 38 deletions

diff --git a/examples/example_dcopexport.py b/examples/example_dcopexport.py
index 70b4e9c..1df6318 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 KApplication, KCmdLineArgs, KAboutData
+from tdecore import TDEApplication, KCmdLineArgs, KAboutData
 from dcopexport import DCOPExObj
 from qt import TQString, TQStringList
 
@@ -113,7 +113,7 @@ KCmdLineArgs.init (sys.argv, aboutData)
 
 KCmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
 
-app   = KApplication ()
+app   = TDEApplication ()
 dcop  = app.dcopClient ()
 appid = dcop.registerAs('petshop')
 print "DCOP Application: %s starting" % appid
diff --git a/examples/example_dcopext.py b/examples/example_dcopext.py
index a099904..05a906d 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 KApplication, KCmdLineArgs, KAboutData
+from tdecore import TDEApplication, KCmdLineArgs, KAboutData
 from qt import TQString, TQCString
 
 
@@ -65,7 +65,7 @@ KCmdLineArgs.init (sys.argv, aboutData)
 
 KCmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
 
-app  = KApplication ()
+app  = TDEApplication ()
 dcop = app.dcopClient ()
 
 #getAnyApplication (dcop, "konqueror")
@@ -118,7 +118,7 @@ print "--------------------------"
 print
 print
 print "Start a kwrite instance"
-errcode, error, dcopService, pid = KApplication.startServiceByDesktopName ("kwrite", "")
+errcode, error, dcopService, pid = TDEApplication.startServiceByDesktopName ("kwrite", "")
 dcopService = "kwrite-" + str (pid)
 print "errcode: %i   error: %s   dcopService: %s  pid: %i" % (errcode, error, dcopService, pid)
 print "--------------------------"
diff --git a/examples/kurldemo.py b/examples/kurldemo.py
index d10e338..30f0bb2 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 KApplication, KCmdLineArgs, KAboutData, KURL
+from tdecore import TDEApplication, KCmdLineArgs, KAboutData, KURL
 from tdeui import KMainWindow, KEdit
 
 class MainWin (KMainWindow):
@@ -92,7 +92,7 @@ KCmdLineArgs.init (sys.argv, aboutData)
 
 KCmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
 
-app = KApplication ()
+app = TDEApplication ()
 mainWindow = MainWin (None, "main window")
 mainWindow.show()
 app.exec_loop()
diff --git a/examples/menudemo.py b/examples/menudemo.py
index 8f605a2..9ddac1b 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 KApplication, KCmdLineArgs, KAboutData, i18n, KIcon, KIconLoader, KShortcut
+from tdecore import TDEApplication, KCmdLineArgs, KAboutData, i18n, KIcon, KIconLoader, KShortcut
 from tdeui import KMainWindow, KMessageBox, KStdAction, KAction, KToggleAction, KFontSizeAction, KFontAction, KRadioAction,\
                   KActionSeparator, KActionMenu, KWindowListMenu
 
@@ -285,7 +285,7 @@ KCmdLineArgs.init (sys.argv, aboutData)
 
 KCmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
 
-app = KApplication ()
+app = TDEApplication ()
 mainWindow = MainWin (None, "main window")
 mainWindow.show()
 app.exec_loop()
diff --git a/examples/mimetype.py b/examples/mimetype.py
index 5f7a18b..61d5545 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 KApplication, KCmdLineArgs, KAboutData, KURL
+from tdecore import TDEApplication, KCmdLineArgs, KAboutData, KURL
 from tdeui import KMainWindow, KTabCtl, KListBox
 from kio import KMimeType, KService, KServiceGroup, KServiceType, KTrader, KServiceTypeProfile, KServiceGroup
 
@@ -263,7 +263,7 @@ KCmdLineArgs.init (sys.argv, aboutData)
 
 KCmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
 
-app = KApplication ()
+app = TDEApplication ()
 mainWindow = MainWin (None, "main window")
 mainWindow.show()
 app.exec_loop()
diff --git a/examples/pyKHTMLPart.py b/examples/pyKHTMLPart.py
index 7873ad8..6d92c1c 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 KCmdLineArgs, KURL, KApplication, i18n, KAboutData, BarIcon, KLibLoader
+from tdecore import KCmdLineArgs, KURL, TDEApplication, i18n, KAboutData, BarIcon, KLibLoader
 
 from tdeui import KMainWindow, KMessageBox, KAction, KStdAction, KKeyDialog, KEditToolbar
 
@@ -192,10 +192,10 @@ aboutData = KAboutData ("pyKHTMLPart", "pyHTMLPart",\
 
 aboutData.addAuthor ("Jim Bublitz", "Example for PyKDE", "jbublitz@nwinternet.com")
 
-# This MUST go here (before KApplication () is called)
+# This MUST go here (before TDEApplication () is called)
 KCmdLineArgs.init (sys.argv, aboutData)
 
-app = KApplication ()
+app = TDEApplication ()
 
 if (app.isRestored()):
         RESTORE(KLess)
diff --git a/examples/pytde-sampler/misc/window_info.py b/examples/pytde-sampler/misc/window_info.py
index daef2e0..00252c6 100644
--- a/examples/pytde-sampler/misc/window_info.py
+++ b/examples/pytde-sampler/misc/window_info.py
@@ -3,7 +3,7 @@
 
 from qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL
 from tdeui import KWindowInfo, KPushButton, KTextEdit
-from tdecore import i18n, KApplication
+from tdecore import i18n, TDEApplication
 
 iconName = 'misc'
 labelText = 'KWindowInfo'
@@ -25,7 +25,7 @@ class MainFrame(TQFrame):
 
 
     def showWindowInfo(self):
-        main = KApplication.kApplication()
+        main = TDEApplication.kApplication()
         print main
         print main.mainWidget()
         
diff --git a/examples/pytde-sampler/qt_widgets/CONTRIB b/examples/pytde-sampler/qt_widgets/CONTRIB
index 3def876..3e0c57f 100644
--- a/examples/pytde-sampler/qt_widgets/CONTRIB
+++ b/examples/pytde-sampler/qt_widgets/CONTRIB
@@ -19,7 +19,7 @@ tdecore,KAccelAction,,,
 tdecore,KAccelActions,,,
 tdecore,KAccelBase,,,
 tdecore,KAccelShortcutList,,,
-tdecore,KApplication,,,
+tdecore,TDEApplication,,,
 tdecore,KAsyncIO,,,
 tdecore,KAudioPlayer,,,
 tdecore,KBufferedIO,,,
@@ -342,7 +342,7 @@ tdeui,KXMLGUIFactory,,,
 tdeui,KXYSelector,,,
 tdeui,QXEmbed,,,
 tdeui,testKActionList,,,
-kfile,KApplicationPropsPlugin,,,
+kfile,TDEApplicationPropsPlugin,,,
 kfile,KBindingPropsPlugin,,,
 kfile,KCombiView,,,
 kfile,KCustomMenuEditor,,,
diff --git a/examples/pytde-sampler/runner.py b/examples/pytde-sampler/runner.py
index e153fae..3f479f6 100755
--- a/examples/pytde-sampler/runner.py
+++ b/examples/pytde-sampler/runner.py
@@ -3,7 +3,7 @@
 
 """
 import sys
-from tdecore import KApplication, KCmdLineArgs
+from tdecore import TDEApplication, KCmdLineArgs
 from tdeui import KMainWindow
 from qt import TQVBoxLayout
 
@@ -52,7 +52,7 @@ if __name__ == '__main__':
         pathitem = args.arg(0)
         widget = importItem(pathitem)
 
-    app = KApplication()
+    app = TDEApplication()
     mainWindow = SamplerRunnerWindow(widget)
     mainWindow.show()
     app.exec_loop()
diff --git a/examples/pytde-sampler/sampler.py b/examples/pytde-sampler/sampler.py
index 83a4979..ec1d053 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, KApplication, KCmdLineArgs, KGlobal
+from tdecore import i18n, KAboutData, TDEApplication, KCmdLineArgs, KGlobal
 from tdecore import KGlobalSettings, KWin, KWinModule, KURL, KIcon
 
 from tdeui import KComboBox, KListView, KListViewItem, KTabWidget, KTextEdit
@@ -410,7 +410,7 @@ class SamplerMainWindow(KMainWindow):
 if __name__ == '__main__':
     aboutdata = about.about()    
     KCmdLineArgs.init(sys.argv, aboutdata)
-    app = KApplication()
+    app = TDEApplication()
 
     splashpix = TQPixmap(os.path.join(lib.samplerpath, 'aboutkde.png'))
     splash = KSplashScreen(splashpix)
diff --git a/examples/systray.py b/examples/systray.py
index a271f4e..6066d3e 100644
--- a/examples/systray.py
+++ b/examples/systray.py
@@ -30,7 +30,7 @@ copyright holder.
 import sys
 
 from qt import TQLabel
-from tdecore import KApplication, KIcon, KIconLoader
+from tdecore import TDEApplication, KIcon, KIconLoader
 from tdeui import KMainWindow, KSystemTray
 
 class MainWin (KMainWindow):
@@ -40,7 +40,7 @@ class MainWin (KMainWindow):
 #-------------------- main ------------------------------------------------
 
 appName = "template"
-app = KApplication (sys.argv, appName)
+app = TDEApplication (sys.argv, appName)
 mainWindow = MainWin (None, "main window")
 icons = KIconLoader ()
 
diff --git a/examples/uikmdi.py b/examples/uikmdi.py
index 90cd721..1034232 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, KApplication, KGlobal, KIcon, KCmdLineArgs
+from tdecore import i18n, KAboutData, TDEApplication, KGlobal, KIcon, KCmdLineArgs
 from tdeui import KDockWidget, KListBox, KStdAction
 
 try:
@@ -197,7 +197,7 @@ if __name__ == '__main__':
     about.addAuthor(author, 'hi, mom!', authormail)
     about.addAuthor ('Jim Bublitz', 'For PyKDE', 'jbublitz@nwinternet.com')
     KCmdLineArgs.init(sys.argv, about)
-    app = KApplication()
+    app = TDEApplication()
     mainWindow = KmdiExample()
     mainWindow.show()
     app.exec_loop()
diff --git a/examples/uimodules/uimenus.py b/examples/uimodules/uimenus.py
index 4e11157..6fc72ff 100644
--- a/examples/uimodules/uimenus.py
+++ b/examples/uimodules/uimenus.py
@@ -2,7 +2,7 @@ import os
 
 from qt import TQLabel
 
-from tdecore import KApplication
+from tdecore import TDEApplication
 
 class PageLaunch:
     def __init__ (self, parent):
@@ -17,7 +17,7 @@ class PageLaunch:
 
         self.page.show ()
 
-        KApplication.kApplication ().processEvents ()
+        TDEApplication.kApplication ().processEvents ()
 
 
 class PageNotImpl:
diff --git a/examples/uimodules/uiwidgets.py b/examples/uimodules/uiwidgets.py
index 6eb2592..35e6a34 100644
--- a/examples/uimodules/uiwidgets.py
+++ b/examples/uimodules/uiwidgets.py
@@ -3,7 +3,7 @@ import time, sys
 from qt import TQLabel, TQFrame, TQColor, TQPushButton, SIGNAL, TQButtonGroup, TQRadioButton, TQt, TQString, TQChar,\
                TQWidget, TQTimer
 
-from tdecore import KApplication
+from tdecore import TDEApplication
 from tdeui import KEdit, KComboBox, KColorCombo, KEditListBox, KListBox, KLineEdit, KRestrictedLine,\
                   KSqueezedTextLabel, KFontChooser, KButtonBox, KColorButton, KColorCells,\
                   KColorPatch, KDualColorButton,\
@@ -118,7 +118,7 @@ class Page1:
         grp.show ()
 
         self.page.show ()
-        kapp = KApplication.kApplication ()
+        kapp = TDEApplication.kApplication ()
         kapp.processEvents ()
 
         y = y + 195
diff --git a/examples/uimodules/uixml.py b/examples/uimodules/uixml.py
index 8e8ca8c..cabcc80 100644
--- a/examples/uimodules/uixml.py
+++ b/examples/uimodules/uixml.py
@@ -2,7 +2,7 @@ import os
 
 from qt import TQLabel
 
-from tdecore import KApplication
+from tdecore import TDEApplication
 
 class PageLaunch:
     def __init__ (self, parent):
@@ -17,7 +17,7 @@ class PageLaunch:
 
         self.page.show ()
 
-        KApplication.kApplication ().processEvents ()
+        TDEApplication.kApplication ().processEvents ()
 
 def xmlKActionCollection (parent):
     parent.currentPageObj = PageLaunch (parent)
diff --git a/examples/uiqxembed.py b/examples/uiqxembed.py
index 0f5f816..382739d 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, KApplication, KCmdLineArgs, KGlobal, KIcon
+from tdecore import KAboutData, TDEApplication, KCmdLineArgs, KGlobal, KIcon
 from tdecore import KWin, KWinModule
 from tdeui import KComboBox, KMainWindow, KPushButton, QXEmbed
 
@@ -112,7 +112,7 @@ if __name__ == '__main__':
     about.addAuthor(author, 'hi, mom!', authormail)
     about.addAuthor ('Jim Bublitz', 'For PyKDE', 'jbublitz@nwinternet.com')
     KCmdLineArgs.init(sys.argv, about)
-    app = KApplication()
+    app = TDEApplication()
     mainWindow = ExampleMain()
     mainWindow.show()
     app.connect(app, SIGNAL('lastWindowClosed()'), app, SLOT('quit()'))
diff --git a/examples/uisampler.py b/examples/uisampler.py
index e0912e2..29a0f92 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 KApplication, KCmdLineArgs, KAboutData
+from tdecore import TDEApplication, KCmdLineArgs, KAboutData
 from tdeui import KMainWindow, KListView
 
 from uidialogs import *
@@ -220,7 +220,7 @@ class MainWin (KMainWindow):
 #-------------------- main ------------------------------------------------
 
 appName = "UISampler"
-app = KApplication (sys.argv, appName)
+app = TDEApplication (sys.argv, appName)
 mainWindow = MainWin (None, "main window")
 mainWindow.show()
 app.exec_loop()
diff --git a/examples/xmlmenudemo.py b/examples/xmlmenudemo.py
index ad12f7e..f05d312 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 KApplication, KCmdLineArgs, KAboutData, i18n, KIcon, KIconLoader, KShortcut, KGlobal
+from tdecore import TDEApplication, KCmdLineArgs, KAboutData, i18n, KIcon, KIconLoader, KShortcut, KGlobal
 from tdeui import KMainWindow, KMessageBox, KStdAction, KAction, KToggleAction, KFontSizeAction, KFontAction, KRadioAction,\
                   KActionSeparator, KActionMenu, KWindowListMenu, KXMLGUIClient, KActionCollection
 
@@ -285,7 +285,7 @@ KCmdLineArgs.init (sys.argv, aboutData)
 
 KCmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
 
-app = KApplication ()
+app = TDEApplication ()
 mainWindow = MainWin (None, "main window")
 mainWindow.show()
 app.exec_loop()