From 6677c2f8c66333c3951e8830f8760065c7a29074 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:05:23 -0600 Subject: [PATCH] Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- contrib/kdepyuic | 6 +-- doc/classref/allclasses.html | 6 +-- .../kfile/KApplicationPropsPlugin.html | 10 ++--- doc/classref/kfile/KApplicationTree.html | 10 ++--- doc/classref/kfile/index.html | 4 +- doc/classref/tdecore/KApplication.html | 38 +++++++++---------- doc/classref/tdecore/KUniqueApplication.html | 2 +- doc/classref/tdecore/index.html | 2 +- doc/dcopext.html | 6 +-- examples/example_dcopexport.py | 4 +- examples/example_dcopext.py | 6 +-- examples/kurldemo.py | 4 +- examples/menudemo.py | 4 +- examples/mimetype.py | 4 +- examples/pyKHTMLPart.py | 6 +-- examples/pytde-sampler/misc/window_info.py | 4 +- examples/pytde-sampler/qt_widgets/CONTRIB | 4 +- examples/pytde-sampler/runner.py | 4 +- examples/pytde-sampler/sampler.py | 4 +- examples/systray.py | 4 +- examples/uikmdi.py | 4 +- examples/uimodules/uimenus.py | 4 +- examples/uimodules/uiwidgets.py | 4 +- examples/uimodules/uixml.py | 4 +- examples/uiqxembed.py | 4 +- examples/uisampler.py | 4 +- examples/xmlmenudemo.py | 4 +- extensions/dcopext.py | 2 +- postproc | 4 +- sip/kfile/kfiledetailview.sip | 6 +-- sip/kfile/kopenwith.sip | 6 +-- sip/kfile/kpropertiesdialog.sip | 6 +-- sip/kfile/kpropsdlg.sip | 6 +-- sip/tdecore/kaccel.sip | 2 +- sip/tdecore/kapplication.sip | 26 ++++++------- sip/tdecore/kuniqueapplication.sip | 2 +- templates/annotated/basicapp.py | 14 +++---- templates/annotated/menuapp1.py | 4 +- templates/annotated/menuapp2.py | 4 +- templates/annotated/menuapp3.py | 4 +- templates/annotated/minimal.py | 10 ++--- templates/annotated/systray.py | 8 ++-- templates/annotated/systray1.py | 8 ++-- templates/basic/basicapp.py | 4 +- templates/basic/menuapp1.py | 4 +- templates/basic/menuapp2.py | 4 +- templates/basic/menuapp3.py | 4 +- templates/basic/minimal.py | 4 +- templates/basic/systray.py | 6 +-- templates/basic/systray1.py | 6 +-- 50 files changed, 152 insertions(+), 152 deletions(-) diff --git a/contrib/kdepyuic b/contrib/kdepyuic index 873b032..bdda64a 100755 --- a/contrib/kdepyuic +++ b/contrib/kdepyuic @@ -62,7 +62,7 @@ def getOptions (): kdepyuic [options] filename.ui Options: - -a, --noapp Don't add KApplication code + -a, --noapp Don't add TDEApplication code -i, --noimport Don't add tdecore, tdeui import statements -p, --pyuic Path to pyuic program --usekdei18n Adds KDEs default i18n functions to your Python KDE ui file @@ -95,7 +95,7 @@ def checkOptions (optlist): def addimport (n): if addApp: - n.write ('from tdecore import KCmdLineArgs, KApplication\n') + n.write ('from tdecore import KCmdLineArgs, TDEApplication\n') if i18nFunc: n.write ('from tdecore import i18n\n') n.write ('from tdeui import *\n\n') @@ -107,7 +107,7 @@ def addapp (indent, n): n.write (indent + 'version = ""\n') n.write ('\n') n.write (indent + 'KCmdLineArgs.init (sys.argv, appname, description, version)\n') - n.write (indent + 'a = KApplication ()\n\n') + n.write (indent + 'a = TDEApplication ()\n\n') def doPyuic (): diff --git a/doc/classref/allclasses.html b/doc/classref/allclasses.html index d5a4836..409c561 100644 --- a/doc/classref/allclasses.html +++ b/doc/classref/allclasses.html @@ -232,9 +232,9 @@ KActiveLabel KAnimWidget KAppTreeListItem -KApplication -KApplicationPropsPlugin -KApplicationTree +TDEApplication +TDEApplicationPropsPlugin +TDEApplicationTree KAr KArchive KArchiveDirectory diff --git a/doc/classref/kfile/KApplicationPropsPlugin.html b/doc/classref/kfile/KApplicationPropsPlugin.html index 5005f80..aa94fb5 100644 --- a/doc/classref/kfile/KApplicationPropsPlugin.html +++ b/doc/classref/kfile/KApplicationPropsPlugin.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/html4/loose.dtd""> - class KApplicationPropsPlugin + class TDEApplicationPropsPlugin @@ -12,7 +12,7 @@
-

class KApplicationPropsPlugin

+

class TDEApplicationPropsPlugin

 @@ -28,15 +28,15 @@ - +
kfile
ClassKApplicationPropsPluginTDEApplicationPropsPlugin
Inherits KPropsDlgPlugin

methods

    -
  • KApplicationPropsPlugin (_props) -
    +
  • TDEApplicationPropsPlugin (_props) +
    • returns a KApplicationPropsPlugin instance
    returns a TDEApplicationPropsPlugin instance
    ArgumentTypeDefault
    _propsKPropertiesDialog
    diff --git a/doc/classref/kfile/KApplicationTree.html b/doc/classref/kfile/KApplicationTree.html index 984be25..33aa877 100644 --- a/doc/classref/kfile/KApplicationTree.html +++ b/doc/classref/kfile/KApplicationTree.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/html4/loose.dtd""> - class KApplicationTree + class TDEApplicationTree @@ -12,7 +12,7 @@
    -

    class KApplicationTree

    +

    class TDEApplicationTree

    		 @@ -28,15 +28,15 @@ - +
    kfile
    ClassKApplicationTreeTDEApplicationTree
    Inherits KListView

    methods

      -
    • KApplicationTree (a0) -
      +
    • TDEApplicationTree (a0) +
      • returns a KApplicationTree instance
      returns a TDEApplicationTree instance
      In versions less than KDE 3.1.0 only
      diff --git a/doc/classref/kfile/index.html b/doc/classref/kfile/index.html index 1c3ac8d..0bea76f 100644 --- a/doc/classref/kfile/index.html +++ b/doc/classref/kfile/index.html @@ -26,8 +26,8 @@
      ArgumentTypeDefault
      a0TQWidget
      - - + + diff --git a/doc/classref/tdecore/KApplication.html b/doc/classref/tdecore/KApplication.html index a1c32b0..5180e20 100644 --- a/doc/classref/tdecore/KApplication.html +++ b/doc/classref/tdecore/KApplication.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/html4/loose.dtd""> - class KApplication + class TDEApplication @@ -12,7 +12,7 @@
      KAppTreeListItem - KFileFilterCombo
      KAppTreeListItem
      KApplicationPropsPlugin
      KApplicationTree
      TDEApplicationPropsPlugin
      TDEApplicationTree
      KBindingPropsPlugin
      KCombiView
      KCustomMenuEditor
      -

      class KApplication

      +

      class TDEApplication

      		 @@ -28,7 +28,7 @@ - + @@ -44,21 +44,21 @@ }
    • ShutdownType = {ShutdownTypeDefault, ShutdownTypeNone, ShutdownTypeReboot, ShutdownTypeHalt }

      methods

        -
      • KApplication (allowStyles = 1, GUIenabled = 1) -
      • tdecore
      ClassKApplicationTDEApplication
      Inherits TQApplication, KInstance
      +
    • TDEApplication (allowStyles = 1, GUIenabled = 1) +
      • returns a KApplication instance
      returns a TDEApplication instance
      ArgumentTypeDefault
      allowStylesbool1
      GUIenabledbool1
      -
    • KApplication (display, visual = 0, colormap = 0, allowStyles = 1) +
    • TDEApplication (display, visual = 0, colormap = 0, allowStyles = 1)
      Not Implemented
      • -
    • KApplication (display, rAppName, allowStyles = 1, GUIenabled = 1) +
    • TDEApplication (display, rAppName, allowStyles = 1, GUIenabled = 1)
      Not Implemented
      • -
    • KApplication (argv, rAppName, allowStyles = 1, GUIenabled = 1) -
      +
    • TDEApplication (argv, rAppName, allowStyles = 1, GUIenabled = 1) +
      • returns a KApplication instance
      returns a TDEApplication instance
      @@ -66,21 +66,21 @@
      ArgumentTypeDefault
      argva Python list of strings
      rAppNamePython string
      GUIenabledbool1
      -
    • KApplication (allowStyles, GUIenabled, _instance) -
      +
    • TDEApplication (allowStyles, GUIenabled, _instance) +
      • returns a KApplication instance
      returns a TDEApplication instance
      ArgumentTypeDefault
      allowStylesbool
      GUIenabledbool
      _instanceKInstance
      -
    • KApplication (display, visual, colormap, allowStyles, _instance) +
    • TDEApplication (display, visual, colormap, allowStyles, _instance)
      Not Implemented
      • -
    • KApplication (a0) - - + diff --git a/doc/dcopext.html b/doc/dcopext.html index 48d41a5..3f96826 100644 --- a/doc/dcopext.html +++ b/doc/dcopext.html @@ -92,7 +92,7 @@ object names have this property). import dcopext # ! other imports not shown ! -app = KApplication () +app = TDEApplication () dcop = app.dcopClient () d = dcopext.DCOPApp ("kicker", dcop) @@ -101,7 +101,7 @@ ok, panelPos = d.Panel.panelPosition ()
      +
    • TDEApplication (a0) +
      • returns a KApplication instance
      returns a TDEApplication instance
      - +
      ArgumentTypeDefault
      a0KApplication
      a0TDEApplication
    • addCmdLineOptions () @@ -364,7 +364,7 @@
      returns (bool)
    • kApplication () - - +
      +
      returns (KApplication)
      returns (TDEApplication)
      static
    • tdeinitExec (name, args, startup_id) @@ -499,9 +499,9 @@
    • requestShutDown (confirm = ShutdownConfirmDefault, sdtype = ShutdownTypeDefault, sdmode = ShutdownModeDefault)
      returns (bool)
      - - - + + +
      ArgumentTypeDefault
      confirmKApplication.ShutdownConfirmShutdownConfirmDefault
      sdtypeKApplication.ShutdownTypeShutdownTypeDefault
      sdmodeKApplication.ShutdownModeShutdownModeDefault
      confirmTDEApplication.ShutdownConfirmShutdownConfirmDefault
      sdtypeTDEApplication.ShutdownTypeShutdownTypeDefault
      sdmodeTDEApplication.ShutdownModeShutdownModeDefault
    • saveState (sm) diff --git a/doc/classref/tdecore/KUniqueApplication.html b/doc/classref/tdecore/KUniqueApplication.html index 6bcc055..865754c 100644 --- a/doc/classref/tdecore/KUniqueApplication.html +++ b/doc/classref/tdecore/KUniqueApplication.html @@ -31,7 +31,7 @@
      		• KUniqueApplication
      InheritsKApplication, DCOPObject TDEApplication, DCOPObject

      methods

        diff --git a/doc/classref/tdecore/index.html b/doc/classref/tdecore/index.html index 1779621..e808a60 100644 --- a/doc/classref/tdecore/index.html +++ b/doc/classref/tdecore/index.html @@ -34,7 +34,7 @@
      • KAccelActions
      KAccelBase
      KAccelShortcutList
      KApplication
      TDEApplication
      KAsyncIO
      KAudioPlayer
      KBufferedIO

      That's all there's to it in this case. We import dcopext, which contains the client extension -classes; from the KApplication instance, we "borrow" the DCOPClient instance (dcop); we create a +classes; from the TDEApplication instance, we "borrow" the DCOPClient instance (dcop); we create a DCOPApp instance, passing it the name of the app ("kicker") and the DCOPClient instance; we call kicker's Panel object's panelPosition method (d.Panel.panelPosition); lastly, the integer value is returned to our application (panelPos) as the second item in a tuple - the first element @@ -146,7 +146,7 @@ full id (app name + pid - eg konqueror-14409) when constructing DCOPApp or DCOPO

      If you instantiate the application you want to communicate with from your own application (that -will be making the DCOP calls), methods like KApplication.startServiceByDesktopName will +will be making the DCOP calls), methods like TDEApplication.startServiceByDesktopName will let you start the app and also return both the PID of the started app and the complete identifier string needed to initiate DCOP communications. The identifier's name portion may or may not be the same as the name of the application (see the example_dcopexport.py example program, 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() diff --git a/extensions/dcopext.py b/extensions/dcopext.py index 5956d26..e854996 100644 --- a/extensions/dcopext.py +++ b/extensions/dcopext.py @@ -76,7 +76,7 @@ allow transparent Python calls to DCOP methods. For example: d = DCOPApp ("kicker", dcop) (where "kicker" is the complete name of an application and 'dcop' is -the dcopClient instance owned by the KApplication creating the DCOPApp +the dcopClient instance owned by the TDEApplication creating the DCOPApp instance) creates a DCOPApp instance. All of the classes in this file "borrow" a DCOPClient instance from the calling application. diff --git a/postproc b/postproc index 2238d70..618dddf 100755 --- a/postproc +++ b/postproc @@ -327,7 +327,7 @@ def appQuit (filelist): tmp.write (buff [i] + "\nfrom qt import TQCloseEvent") i = i + 1 - while (i < nLines) and (string.find (buff [i], "class KApplication") < 0): + while (i < nLines) and (string.find (buff [i], "class TDEApplication") < 0): tmp.write (buff [i]) i = i + 1 @@ -343,7 +343,7 @@ def appQuit (filelist): tmp.write (\ """\tdef quit (self): -\t\tk = KApplication.kApplication () +\t\tk = TDEApplication.kApplication () \t\te = TQCloseEvent () \t\tfor w in k.topLevelWidgets (): diff --git a/sip/kfile/kfiledetailview.sip b/sip/kfile/kfiledetailview.sip index e667417..daf72fd 100644 --- a/sip/kfile/kfiledetailview.sip +++ b/sip/kfile/kfiledetailview.sip @@ -133,10 +133,10 @@ private: // must be sorted by name. static sipStringTypeClassMap map[] = { - {sipName_KApplicationPropsPlugin, &sipClass_KApplicationPropsPlugin}, - {sipName_KApplicationPropsPlugin, &sipClass_KApplicationPropsPlugin}, + {sipName_TDEApplicationPropsPlugin, &sipClass_TDEApplicationPropsPlugin}, + {sipName_TDEApplicationPropsPlugin, &sipClass_TDEApplicationPropsPlugin}, #if TDE_VERSION < 310 -// {sipName_KApplicationTree, &sipClass_KApplicationTree}, +// {sipName_TDEApplicationTree, &sipClass_TDEApplicationTree}, #endif {sipName_KBindingPropsPlugin, &sipClass_KBindingPropsPlugin}, {sipName_KBindingPropsPlugin, &sipClass_KBindingPropsPlugin}, diff --git a/sip/kfile/kopenwith.sip b/sip/kfile/kopenwith.sip index 4d83a21..840186d 100644 --- a/sip/kfile/kopenwith.sip +++ b/sip/kfile/kopenwith.sip @@ -116,7 +116,7 @@ protected: %If ( - KDE_3_1_0 ) -class KApplicationTree : KListView +class TDEApplicationTree : KListView { %TypeHeaderCode #include @@ -124,7 +124,7 @@ class KApplicationTree : KListView public: - KApplicationTree (TQWidget* /TransferThis/); + TDEApplicationTree (TQWidget* /TransferThis/); void addDesktopGroup (TQString, KAppTreeListItem* = 0); KAppTreeListItem* it; bool isDirSel (); @@ -140,7 +140,7 @@ signals: void selected (const TQString&, const TQString&); void highlighted (const TQString&, const TQString&); -}; // class KApplicationTree +}; // class TDEApplicationTree %End diff --git a/sip/kfile/kpropertiesdialog.sip b/sip/kfile/kpropertiesdialog.sip index 6f6df9c..fb84071 100644 --- a/sip/kfile/kpropertiesdialog.sip +++ b/sip/kfile/kpropertiesdialog.sip @@ -284,7 +284,7 @@ public slots: }; // class KExecPropsPlugin -class KApplicationPropsPlugin : KPropsDlgPlugin +class TDEApplicationPropsPlugin : KPropsDlgPlugin { %TypeHeaderCode #include @@ -292,7 +292,7 @@ class KApplicationPropsPlugin : KPropsDlgPlugin public: - KApplicationPropsPlugin (KPropertiesDialog*); + TDEApplicationPropsPlugin (KPropertiesDialog*); virtual void applyChanges (); static bool supports (KFileItemList); @@ -300,5 +300,5 @@ public slots: void slotDelExtension (); void slotAddExtension (); -}; // class KApplicationPropsPlugin +}; // class TDEApplicationPropsPlugin diff --git a/sip/kfile/kpropsdlg.sip b/sip/kfile/kpropsdlg.sip index 661a9cf..f94a1d1 100644 --- a/sip/kfile/kpropsdlg.sip +++ b/sip/kfile/kpropsdlg.sip @@ -158,7 +158,7 @@ public: }; // class KURLPropsPlugin -class KApplicationPropsPlugin : KPropsDlgPlugin +class TDEApplicationPropsPlugin : KPropsDlgPlugin { %TypeHeaderCode #include @@ -166,7 +166,7 @@ class KApplicationPropsPlugin : KPropsDlgPlugin public: - KApplicationPropsPlugin (KPropertiesDialog*); + TDEApplicationPropsPlugin (KPropertiesDialog*); virtual void applyChanges (); static bool supports (KFileItemList); @@ -174,7 +174,7 @@ public slots: void slotDelExtension (); void slotAddExtension (); -}; // class KApplicationPropsPlugin +}; // class TDEApplicationPropsPlugin class KBindingPropsPlugin : KPropsDlgPlugin diff --git a/sip/tdecore/kaccel.sip b/sip/tdecore/kaccel.sip index a91fa25..23f7f75 100644 --- a/sip/tdecore/kaccel.sip +++ b/sip/tdecore/kaccel.sip @@ -118,7 +118,7 @@ public: static sipStringTypeClassMap map[] = { {sipName_KAccel, &sipClass_KAccel}, - {sipName_KApplication, &sipClass_KApplication}, + {sipName_TDEApplication, &sipClass_TDEApplication}, {sipName_KAsyncIO, &sipClass_KAsyncIO}, {sipName_KAudioPlayer, &sipClass_KAudioPlayer}, {sipName_KBufferedIO, &sipClass_KBufferedIO}, diff --git a/sip/tdecore/kapplication.sip b/sip/tdecore/kapplication.sip index e7ab9e1..95b3212 100644 --- a/sip/tdecore/kapplication.sip +++ b/sip/tdecore/kapplication.sip @@ -24,7 +24,7 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -class KApplication : TQApplication, KInstance +class TDEApplication : TQApplication, KInstance { %TypeHeaderCode #include @@ -43,14 +43,14 @@ public: CaptionNoApp }; - KApplication (bool = 1, bool = 1); + TDEApplication (bool = 1, bool = 1); %If ( KDE_3_3_0 - ) -//ig KApplication (Display*, TQt::HANDLE = 0, TQt::HANDLE = 0, bool = 1); +//ig TDEApplication (Display*, TQt::HANDLE = 0, TQt::HANDLE = 0, bool = 1); %End -//ig KApplication (Display*, int&, char**, const TQCString&, bool = 1, bool = 1); - KApplication (SIP_PYLIST, TQCString&, bool = 1, bool = 1) [(int&, char**, const TQCString&, bool = 1, bool = 1)]; +//ig TDEApplication (Display*, int&, char**, const TQCString&, bool = 1, bool = 1); + TDEApplication (SIP_PYLIST, TQCString&, bool = 1, bool = 1) [(int&, char**, const TQCString&, bool = 1, bool = 1)]; %MethodCode //takes argv | (a Python list of strings) | rAppName | (Python string) | allowStyles | (bool = 1) | GUIenabled | (bool = 1) @@ -71,10 +71,10 @@ public: // The following two lines simulate the actual ctor call // which is commented out below KCmdLineArgs::init (nargc, argv, (char *)"unknown", (char *)"KDE Application", NULL, false); - sipCpp = new sipKApplication((bool)a1,(bool)a2); + sipCpp = new sipTDEApplication((bool)a1,(bool)a2); // This method calls KCmdLineArgs::initIgnore, which is a private method -// sipCpp = new sipKApplication (nargc,argv, qc, a1, a2); +// sipCpp = new sipTDEApplication (nargc,argv, qc, a1, a2); Py_END_ALLOW_THREADS @@ -84,7 +84,7 @@ public: %End static void addCmdLineOptions (); - static KApplication* kApplication (); + static TDEApplication* kApplication (); KConfig* sessionConfig (); bool isRestored () const; void disableSessionManagement (); @@ -120,7 +120,7 @@ public: ShutdownModeInteractive }; - bool requestShutDown (KApplication::ShutdownConfirm = ShutdownConfirmDefault , KApplication::ShutdownType = ShutdownTypeDefault , KApplication::ShutdownMode = ShutdownModeDefault ); + bool requestShutDown (TDEApplication::ShutdownConfirm = ShutdownConfirmDefault , TDEApplication::ShutdownType = ShutdownTypeDefault , TDEApplication::ShutdownMode = ShutdownModeDefault ); void propagateSessionManager (); void commitData (TQSessionManager&); void saveState (TQSessionManager&); @@ -291,10 +291,10 @@ public slots: void deref (); protected: - KApplication (bool, bool, KInstance*); + TDEApplication (bool, bool, KInstance*); %If ( KDE_3_3_0 - ) -//ig KApplication (Display*, TQt::HANDLE, TQt::HANDLE, bool, KInstance*); +//ig TDEApplication (Display*, TQt::HANDLE, TQt::HANDLE, bool, KInstance*); %End //ig bool x11EventFilter (XEvent*); @@ -357,7 +357,7 @@ signals: void shutDown (); private: - KApplication (const KApplication&); + TDEApplication (const TDEApplication&); protected: //igx virtual void virtual_hook (int, void*); @@ -369,7 +369,7 @@ public: %End -}; // class KApplication +}; // class TDEApplication class KSessionManaged diff --git a/sip/tdecore/kuniqueapplication.sip b/sip/tdecore/kuniqueapplication.sip index 0bc5476..972c3cd 100644 --- a/sip/tdecore/kuniqueapplication.sip +++ b/sip/tdecore/kuniqueapplication.sip @@ -24,7 +24,7 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -class KUniqueApplication : KApplication, DCOPObject +class KUniqueApplication : TDEApplication, DCOPObject { %TypeHeaderCode #include diff --git a/templates/annotated/basicapp.py b/templates/annotated/basicapp.py index 0a44593..44b6681 100644 --- a/templates/annotated/basicapp.py +++ b/templates/annotated/basicapp.py @@ -35,7 +35,7 @@ copyright holder. import sys -from tdecore import KApplication, KCmdLineArgs, KAboutData +from tdecore import TDEApplication, KCmdLineArgs, KAboutData from tdeui import KMainWindow """ @@ -76,9 +76,9 @@ aboutData.addAuthor ("author2", "they did something else", "another@email.addres # Pass the command line arguments and aboutData to # KCmdLineArgs - this is where KDE will look for -# this information. The KApplication constructor +# this information. The TDEApplication constructor # used below *requires* the args are processed -# *before* KApplication is instantiated. There +# *before* TDEApplication is instantiated. There # is an alternate constructor that takes sys.argv # as an argument (see minimal.py) @@ -96,10 +96,10 @@ KCmdLineArgs.init (sys.argv, aboutData) # of tuples KCmdLineArgs.addCmdLineOptions ([("+files", "File to open")]) -# instantiate KApplication - no other TQObject +# instantiate TDEApplication - no other TQObject # or TQWidget based classes can be instantiated -# until there is a KApplication instance -app = KApplication () +# until there is a TDEApplication instance +app = TDEApplication () # instantiate the subclass of KMainWindow mainWindow = MainWin (None, "main window") @@ -107,7 +107,7 @@ mainWindow = MainWin (None, "main window") # create the display mainWindow.show() -# run KApplication's event loop until the +# run TDEApplication's event loop until the # program exits app.exec_loop() diff --git a/templates/annotated/menuapp1.py b/templates/annotated/menuapp1.py index 0f0f3f5..d18ea00 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 KApplication, KCmdLineArgs, KAboutData, i18n, KStdAccel, KIcon, KIconLoader +from tdecore import TDEApplication, KCmdLineArgs, KAboutData, i18n, KStdAccel, KIcon, KIconLoader from tdeui import KMainWindow, KMessageBox TOOLBAR_NEW = 1 @@ -264,7 +264,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/templates/annotated/menuapp2.py b/templates/annotated/menuapp2.py index be0d100..c5cbe1b 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 KApplication, KCmdLineArgs, KAboutData, i18n +from tdecore import TDEApplication, KCmdLineArgs, KAboutData, i18n from tdeui import KMainWindow, KMessageBox, KStdAction, KAction STATUSBAR_LEFT = 1 @@ -238,7 +238,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/templates/annotated/menuapp3.py b/templates/annotated/menuapp3.py index a5f198d..19140ef 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 KApplication, KCmdLineArgs, KAboutData, i18n +from tdecore import TDEApplication, KCmdLineArgs, KAboutData, i18n from tdeui import KMainWindow, KMessageBox, KStdAction, KAction, KActionCollection STATUSBAR_LEFT = 1 @@ -202,7 +202,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/templates/annotated/minimal.py b/templates/annotated/minimal.py index e021851..817d140 100644 --- a/templates/annotated/minimal.py +++ b/templates/annotated/minimal.py @@ -34,7 +34,7 @@ copyright holder. import sys -from tdecore import KApplication +from tdecore import TDEApplication from tdeui import KMainWindow @@ -56,11 +56,11 @@ class MainWin (KMainWindow): #-------------------- main ------------------------------------------------ -# instantiate KApplication - no other TQObject +# instantiate TDEApplication - no other TQObject # or TQWidget based classes can be instantiated -# until there is a KApplication instance +# until there is a TDEApplication instance appName = "template" -app = KApplication (sys.argv, appName) +app = TDEApplication (sys.argv, appName) # instantiate the subclass of KMainWindow mainWindow = MainWin (None, "main window") @@ -68,7 +68,7 @@ mainWindow = MainWin (None, "main window") # create the display mainWindow.show() -# run KApplication's event loop until the +# run TDEApplication's event loop until the # program exits app.exec_loop() diff --git a/templates/annotated/systray.py b/templates/annotated/systray.py index 7f7dc93..dee4e90 100644 --- a/templates/annotated/systray.py +++ b/templates/annotated/systray.py @@ -30,7 +30,7 @@ copyright holder. import sys from qt import TQWidget, SIGNAL -from tdecore import KApplication, KIcon, KIconLoader +from tdecore import TDEApplication, KIcon, KIconLoader from tdeui import KSystemTray """ @@ -38,7 +38,7 @@ Typically an application's "main window" will be a KMainWindow or a subclass of KMainWindow (KMainWindow provides simple mechanisms for constructing mens, toolbars, statusbars, etc). The problem with using KMainWindow in a System Tray application is that when -KMainWindow is closed, it also shuts down KApplication and the +KMainWindow is closed, it also shuts down TDEApplication and the program terminates. One way around that (not necessarily the best way - see systray1.py) @@ -56,11 +56,11 @@ class MainWin (TQWidget): # when the user right clicks the icon in the system tray and # selects "Quit" from the popup menu def slotQuitSelected (): - KApplication.kApplication ().quit () + TDEApplication.kApplication ().quit () # The usual stuff appName = "template" -app = KApplication (sys.argv, appName) +app = TDEApplication (sys.argv, appName) mainWindow = MainWin (None, "main window") # System tray apps need an icon diff --git a/templates/annotated/systray1.py b/templates/annotated/systray1.py index e911f38..1537fbc 100644 --- a/templates/annotated/systray1.py +++ b/templates/annotated/systray1.py @@ -36,7 +36,7 @@ copyright holder. import sys from qt import TQLabel, TQWidget, SIGNAL -from tdecore import KApplication, KIcon, KIconLoader +from tdecore import TDEApplication, KIcon, KIconLoader from tdeui import KMainWindow, KSystemTray # This template uses KMainWindow as the main window widget @@ -70,15 +70,15 @@ class MainWin (KMainWindow): # system tray icon's menu def slotQuitSelected (self): self.exitFlag = True - KApplication.kApplication ().quit () + TDEApplication.kApplication ().quit () #-------------------- main ------------------------------------------------ # The usual stuff - you can also use the KAboutData/KCmdLineArgs version -# for program startup used in other templates - the KApplication constructor +# for program startup used in other templates - the TDEApplication constructor # used here may be obsoleted eventually appName = "template" -app = KApplication (sys.argv, appName) +app = TDEApplication (sys.argv, appName) mainWindow = MainWin (None, "main window") mainWindow.show() diff --git a/templates/basic/basicapp.py b/templates/basic/basicapp.py index 2de4996..b5b5f62 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 KApplication, KCmdLineArgs, KAboutData +from tdecore import TDEApplication, KCmdLineArgs, KAboutData from tdeui import KMainWindow class MainWin (KMainWindow): @@ -51,7 +51,7 @@ aboutData.addAuthor ("author2", "they did something else", "another@email.addres KCmdLineArgs.init (sys.argv, aboutData) -app = KApplication () +app = TDEApplication () mainWindow = MainWin (None, "main window") mainWindow.show() app.connect (app, SIGNAL ("lastWindowClosed ()"), app.quit) diff --git a/templates/basic/menuapp1.py b/templates/basic/menuapp1.py index 8312c7c..4b33bda 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 KApplication, KCmdLineArgs, KAboutData, i18n, KStdAccel, KIcon, KIconLoader +from tdecore import TDEApplication, KCmdLineArgs, KAboutData, i18n, KStdAccel, KIcon, KIconLoader from tdeui import KMainWindow, KMessageBox TOOLBAR_NEW = 1 @@ -188,7 +188,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/templates/basic/menuapp2.py b/templates/basic/menuapp2.py index 3a8b2ff..54d3593 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 KApplication, KCmdLineArgs, KAboutData, i18n, KShortcut +from tdecore import TDEApplication, KCmdLineArgs, KAboutData, i18n, KShortcut from tdeui import KMainWindow, KMessageBox, KStdAction, KAction STATUSBAR_LEFT = 1 @@ -194,7 +194,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/templates/basic/menuapp3.py b/templates/basic/menuapp3.py index 79bba36..e3328bc 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 KApplication, KCmdLineArgs, KAboutData, i18n, KShortcut +from tdecore import TDEApplication, KCmdLineArgs, KAboutData, i18n, KShortcut from tdeui import KMainWindow, KMessageBox, KStdAction, KAction, KActionCollection STATUSBAR_LEFT = 1 @@ -155,7 +155,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/templates/basic/minimal.py b/templates/basic/minimal.py index 8d74187..02dda02 100644 --- a/templates/basic/minimal.py +++ b/templates/basic/minimal.py @@ -29,7 +29,7 @@ copyright holder. import sys -from tdecore import KApplication +from tdecore import TDEApplication from tdeui import KMainWindow 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") mainWindow.show() app.exec_loop() diff --git a/templates/basic/systray.py b/templates/basic/systray.py index 406c095..5dc2a3d 100644 --- a/templates/basic/systray.py +++ b/templates/basic/systray.py @@ -30,7 +30,7 @@ copyright holder. import sys from qt import TQWidget, SIGNAL -from tdecore import KApplication, KIcon, KIconLoader +from tdecore import TDEApplication, KIcon, KIconLoader from tdeui import KSystemTray @@ -41,10 +41,10 @@ class MainWin (TQWidget): #-------------------- main ------------------------------------------------ def slotQuitSelected (): - KApplication.kApplication ().quit () + TDEApplication.kApplication ().quit () appName = "template" -app = KApplication (sys.argv, appName) +app = TDEApplication (sys.argv, appName) mainWindow = MainWin (None, "main window") icons = KIconLoader () diff --git a/templates/basic/systray1.py b/templates/basic/systray1.py index fdb8067..dfa2b7d 100644 --- a/templates/basic/systray1.py +++ b/templates/basic/systray1.py @@ -30,7 +30,7 @@ copyright holder. import sys from qt import TQLabel, TQWidget, SIGNAL -from tdecore import KApplication, KIcon, KIconLoader +from tdecore import TDEApplication, KIcon, KIconLoader from tdeui import KMainWindow, KSystemTray class MainWin (KMainWindow): @@ -52,13 +52,13 @@ class MainWin (KMainWindow): def slotQuitSelected (self): self.exitFlag = True - KApplication.kApplication ().quit () + TDEApplication.kApplication ().quit () #-------------------- main ------------------------------------------------ appName = "template" -app = KApplication (sys.argv, appName) +app = TDEApplication (sys.argv, appName) mainWindow = MainWin (None, "main window") mainWindow.show()