Rename a number of classes to enhance compatibility with KDE4

6 files changed, 36 insertions, 36 deletions

diff --git a/templates/basic/basicapp.py b/templates/basic/basicapp.py
index 53e0c51..65f5813 100644
--- a/templates/basic/basicapp.py
+++ b/templates/basic/basicapp.py
@@ -31,11 +31,11 @@ import sys
 
 from qt import SIGNAL
 from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData
-from tdeui import KMainWindow
+from tdeui import TDEMainWindow
 
-class MainWin (KMainWindow):
+class MainWin (TDEMainWindow):
     def __init__ (self, *args):
-        KMainWindow.__init__ (self)
+        TDEMainWindow.__init__ (self)
 
 
 #-------------------- main ------------------------------------------------
diff --git a/templates/basic/menuapp1.py b/templates/basic/menuapp1.py
index 6bd548e..c8f86db 100644
--- a/templates/basic/menuapp1.py
+++ b/templates/basic/menuapp1.py
@@ -44,8 +44,8 @@ import sys
 
 from qt import TQPopupMenu, SIGNAL
 
-from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, KStdAccel, KIcon, KIconLoader
-from tdeui import KMainWindow, KMessageBox
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, TDEStdAccel, KIcon, KIconLoader
+from tdeui import TDEMainWindow, KMessageBox
 
 TOOLBAR_NEW   = 1
 TOOLBAR_OPEN  = 2
@@ -58,9 +58,9 @@ STATUSBAR_LEFT   = 1
 STATUSBAR_MIDDLE = 2
 STATUSBAR_RIGHT  = 3
 
-class MainWin (KMainWindow):
+class MainWin (TDEMainWindow):
     def __init__ (self, *args):
-        apply (KMainWindow.__init__, (self,) + args)
+        apply (TDEMainWindow.__init__, (self,) + args)
 
         self.initMenus ()
         self.initToolBar ()
@@ -70,31 +70,31 @@ class MainWin (KMainWindow):
         fileMenu = TQPopupMenu (self)
 
         # "File" menu items
-        fileMenu.insertItem (i18n ("New"), self.slotNew, KStdAccel.openNew ().keyCodeQt ())
-        fileMenu.insertItem (i18n ("Open"), self.slotOpen, KStdAccel.open ().keyCodeQt ())
+        fileMenu.insertItem (i18n ("New"), self.slotNew, TDEStdAccel.openNew ().keyCodeQt ())
+        fileMenu.insertItem (i18n ("Open"), self.slotOpen, TDEStdAccel.open ().keyCodeQt ())
         fileMenu.insertSeparator ();
-        fileMenu.insertItem (i18n ("Save"), self.slotSave, KStdAccel.save ().keyCodeQt ())
+        fileMenu.insertItem (i18n ("Save"), self.slotSave, TDEStdAccel.save ().keyCodeQt ())
         fileMenu.insertItem (i18n ("SaveAs"), self.slotSaveAs)
         fileMenu.insertSeparator ();
-        fileMenu.insertItem (i18n ("Print"), self.slotPrint, KStdAccel.print_ ().keyCodeQt ())
+        fileMenu.insertItem (i18n ("Print"), self.slotPrint, TDEStdAccel.print_ ().keyCodeQt ())
         fileMenu.insertSeparator ();
-        fileMenu.insertItem (i18n ("&Quit"), self.slotQuit, KStdAccel.quit ().keyCodeQt ());
+        fileMenu.insertItem (i18n ("&Quit"), self.slotQuit, TDEStdAccel.quit ().keyCodeQt ());
 
         self.menuBar ().insertItem (i18n ("&File"), fileMenu)
 
         editMenu = TQPopupMenu (self)
 
         # "Edit" menu items
-        editMenu.insertItem (i18n ("Undo"), self.slotUndo, KStdAccel.undo ().keyCodeQt ())
-        editMenu.insertItem (i18n ("Redo"), self.slotRedo, KStdAccel.redo ().keyCodeQt ())
+        editMenu.insertItem (i18n ("Undo"), self.slotUndo, TDEStdAccel.undo ().keyCodeQt ())
+        editMenu.insertItem (i18n ("Redo"), self.slotRedo, TDEStdAccel.redo ().keyCodeQt ())
         editMenu.insertSeparator ();
-        editMenu.insertItem (i18n ("Cut"), self.slotCut, KStdAccel.cut ().keyCodeQt ())
-        editMenu.insertItem (i18n ("Copy"), self.slotCopy, KStdAccel.copy ().keyCodeQt ())
-        editMenu.insertItem (i18n ("Paste"), self.slotPaste, KStdAccel.paste ().keyCodeQt ())
+        editMenu.insertItem (i18n ("Cut"), self.slotCut, TDEStdAccel.cut ().keyCodeQt ())
+        editMenu.insertItem (i18n ("Copy"), self.slotCopy, TDEStdAccel.copy ().keyCodeQt ())
+        editMenu.insertItem (i18n ("Paste"), self.slotPaste, TDEStdAccel.paste ().keyCodeQt ())
         editMenu.insertSeparator ();
-        editMenu.insertItem (i18n ("Find"), self.slotFind, KStdAccel.find ().keyCodeQt ())
-        editMenu.insertItem (i18n ("Find Next"), self.slotFindNext, KStdAccel.findNext ().keyCodeQt ())
-        editMenu.insertItem (i18n ("Replace"), self.slotReplace, KStdAccel.replace ().keyCodeQt ())
+        editMenu.insertItem (i18n ("Find"), self.slotFind, TDEStdAccel.find ().keyCodeQt ())
+        editMenu.insertItem (i18n ("Find Next"), self.slotFindNext, TDEStdAccel.findNext ().keyCodeQt ())
+        editMenu.insertItem (i18n ("Replace"), self.slotReplace, TDEStdAccel.replace ().keyCodeQt ())
 
         self.menuBar ().insertItem (i18n ("&Edit"), editMenu)
 
diff --git a/templates/basic/menuapp2.py b/templates/basic/menuapp2.py
index 1f68d59..a9ec76f 100644
--- a/templates/basic/menuapp2.py
+++ b/templates/basic/menuapp2.py
@@ -43,16 +43,16 @@ import sys
 
 from qt import TQPopupMenu, SIGNAL
 
-from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, KShortcut
-from tdeui import KMainWindow, KMessageBox, KStdAction, KAction
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, TDEShortcut
+from tdeui import TDEMainWindow, KMessageBox, KStdAction, TDEAction
 
 STATUSBAR_LEFT   = 1
 STATUSBAR_MIDDLE = 2
 STATUSBAR_RIGHT  = 3
 
-class MainWin (KMainWindow):
+class MainWin (TDEMainWindow):
     def __init__ (self, *args):
-        apply (KMainWindow.__init__, (self,) + args)
+        apply (TDEMainWindow.__init__, (self,) + args)
 
         self.initActions ()
         self.initMenus ()
@@ -80,7 +80,7 @@ class MainWin (KMainWindow):
         self.findAction     = KStdAction.find (self.slotFind, self.actionCollection ())
         self.findNextAction = KStdAction.findNext (self.slotFindNext, self.actionCollection ())
         self.replaceAction  = KStdAction.replace (self.slotReplace, self.actionCollection ())
-        self.specialAction  = KAction (i18n ("Special"), KShortcut.null (), self.slotSpecial, self.actionCollection (), None)
+        self.specialAction  = TDEAction (i18n ("Special"), TDEShortcut.null (), self.slotSpecial, self.actionCollection (), None)
 
     def initMenus (self):
         fileMenu = TQPopupMenu (self)
diff --git a/templates/basic/menuapp3.py b/templates/basic/menuapp3.py
index cd46f81..ce0dfaf 100644
--- a/templates/basic/menuapp3.py
+++ b/templates/basic/menuapp3.py
@@ -43,16 +43,16 @@ import sys
 
 from qt import TQPopupMenu, SIGNAL
 
-from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, KShortcut
-from tdeui import KMainWindow, KMessageBox, KStdAction, KAction, KActionCollection
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, TDEShortcut
+from tdeui import TDEMainWindow, KMessageBox, KStdAction, TDEAction, TDEActionCollection
 
 STATUSBAR_LEFT   = 1
 STATUSBAR_MIDDLE = 2
 STATUSBAR_RIGHT  = 3
 
-class MainWin (KMainWindow):
+class MainWin (TDEMainWindow):
     def __init__ (self, *args):
-        apply (KMainWindow.__init__, (self,) + args)
+        apply (TDEMainWindow.__init__, (self,) + args)
 
         self.initActions ()
         self.createGUI ()
@@ -80,7 +80,7 @@ class MainWin (KMainWindow):
         self.findAction     = KStdAction.find (self.slotFind, self.actionCollection ())
         self.findNextAction = KStdAction.findNext (self.slotFindNext, self.actionCollection ())
         self.replaceAction  = KStdAction.replace (self.slotReplace, self.actionCollection ())
-        self.specialAction  = KAction (i18n ("Special"), KShortcut.null (), self.slotSpecial, self.actionCollection (), "specialActionName")
+        self.specialAction  = TDEAction (i18n ("Special"), TDEShortcut.null (), self.slotSpecial, self.actionCollection (), "specialActionName")
 
     def initStatusBar (self):
         self.statusBar ().insertItem ("", STATUSBAR_LEFT, 1000, True)
diff --git a/templates/basic/minimal.py b/templates/basic/minimal.py
index 02dda02..8ba815d 100644
--- a/templates/basic/minimal.py
+++ b/templates/basic/minimal.py
@@ -30,11 +30,11 @@ copyright holder.
 import sys
 
 from tdecore import TDEApplication
-from tdeui import KMainWindow
+from tdeui import TDEMainWindow
 
-class MainWin (KMainWindow):
+class MainWin (TDEMainWindow):
     def __init__ (self, *args):
-        apply (KMainWindow.__init__, (self,) + args)
+        apply (TDEMainWindow.__init__, (self,) + args)
 
 
 #-------------------- main ------------------------------------------------
diff --git a/templates/basic/systray1.py b/templates/basic/systray1.py
index dfa2b7d..0a660e7 100644
--- a/templates/basic/systray1.py
+++ b/templates/basic/systray1.py
@@ -31,11 +31,11 @@ import sys
 
 from qt import TQLabel, TQWidget, SIGNAL
 from tdecore import TDEApplication, KIcon, KIconLoader
-from tdeui import KMainWindow, KSystemTray
+from tdeui import TDEMainWindow, KSystemTray
 
-class MainWin (KMainWindow):
+class MainWin (TDEMainWindow):
     def __init__ (self, *args):
-        apply (KMainWindow.__init__, (self,) + args)
+        apply (TDEMainWindow.__init__, (self,) + args)
 
         self.exitFlag = False