Rename KIcon to enhance compatibility with KDE4

3 files changed, 14 insertions, 14 deletions

diff --git a/templates/basic/menuapp1.py b/templates/basic/menuapp1.py
index c8f86db..dceec10 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, TDEAboutData, i18n, TDEStdAccel, KIcon, KIconLoader
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, TDEStdAccel, TDEIcon, TDEIconLoader
 from tdeui import TDEMainWindow, KMessageBox
 
 TOOLBAR_NEW   = 1
@@ -102,19 +102,19 @@ class MainWin (TDEMainWindow):
         self.menuBar ().insertItem (i18n ("&Help"), helpMenu)
 
     def initToolBar (self):
-        icons = KIconLoader ()
+        icons = TDEIconLoader ()
 
-        self.toolBar ().insertButton (icons.loadIcon ("filenew", KIcon.Toolbar), TOOLBAR_NEW, SIGNAL ("clicked (int)"), self.slotNew,\
+        self.toolBar ().insertButton (icons.loadIcon ("filenew", TDEIcon.Toolbar), TOOLBAR_NEW, SIGNAL ("clicked (int)"), self.slotNew,\
                                                        True, "New")
-        self.toolBar ().insertButton (icons.loadIcon ("fileopen", KIcon.Toolbar), TOOLBAR_OPEN, SIGNAL ("clicked (int)"), self.slotOpen,\
+        self.toolBar ().insertButton (icons.loadIcon ("fileopen", TDEIcon.Toolbar), TOOLBAR_OPEN, SIGNAL ("clicked (int)"), self.slotOpen,\
                                                        True, "Open")
-        self.toolBar ().insertButton (icons.loadIcon ("filesave", KIcon.Toolbar), TOOLBAR_SAVE, SIGNAL ("clicked (int)"), self.slotSave,\
+        self.toolBar ().insertButton (icons.loadIcon ("filesave", TDEIcon.Toolbar), TOOLBAR_SAVE, SIGNAL ("clicked (int)"), self.slotSave,\
                                                        True, "Save")
-        self.toolBar ().insertButton (icons.loadIcon ("editcut", KIcon.Toolbar), TOOLBAR_CUT, SIGNAL ("clicked (int)"), self.slotCut,\
+        self.toolBar ().insertButton (icons.loadIcon ("editcut", TDEIcon.Toolbar), TOOLBAR_CUT, SIGNAL ("clicked (int)"), self.slotCut,\
                                                        True, "Cut")
-        self.toolBar ().insertButton (icons.loadIcon ("editcopy", KIcon.Toolbar), TOOLBAR_COPY, SIGNAL ("clicked (int)"), self.slotCopy,\
+        self.toolBar ().insertButton (icons.loadIcon ("editcopy", TDEIcon.Toolbar), TOOLBAR_COPY, SIGNAL ("clicked (int)"), self.slotCopy,\
                                                        True, "Copy")
-        self.toolBar ().insertButton (icons.loadIcon ("editpaste", KIcon.Toolbar), TOOLBAR_PASTE, SIGNAL ("clicked (int)"), self.slotPaste,\
+        self.toolBar ().insertButton (icons.loadIcon ("editpaste", TDEIcon.Toolbar), TOOLBAR_PASTE, SIGNAL ("clicked (int)"), self.slotPaste,\
                                                        True, "Paste")
 
     def initStatusBar (self):
diff --git a/templates/basic/systray.py b/templates/basic/systray.py
index 5dc2a3d..b4bb489 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 TDEApplication, KIcon, KIconLoader
+from tdecore import TDEApplication, TDEIcon, TDEIconLoader
 from tdeui import  KSystemTray
 
 
@@ -47,11 +47,11 @@ appName = "template"
 app = TDEApplication (sys.argv, appName)
 mainWindow = MainWin (None, "main window")
 
-icons = KIconLoader ()
+icons = TDEIconLoader ()
 
 systray = KSystemTray (mainWindow)
 
-systray.setPixmap (icons.loadIcon("stop", KIcon.Desktop))
+systray.setPixmap (icons.loadIcon("stop", TDEIcon.Desktop))
 systray.connect (systray, SIGNAL ("quitSelected ()"), slotQuitSelected)
 systray.show ()
 
diff --git a/templates/basic/systray1.py b/templates/basic/systray1.py
index 0a660e7..ac5e508 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 TDEApplication, KIcon, KIconLoader
+from tdecore import TDEApplication, TDEIcon, TDEIconLoader
 from tdeui import TDEMainWindow, KSystemTray
 
 class MainWin (TDEMainWindow):
@@ -39,10 +39,10 @@ class MainWin (TDEMainWindow):
 
         self.exitFlag = False
 
-        icons = KIconLoader ()
+        icons = TDEIconLoader ()
 
         self.systray = KSystemTray (self)
-        self.systray.setPixmap (icons.loadIcon("stop", KIcon.Desktop))
+        self.systray.setPixmap (icons.loadIcon("stop", TDEIcon.Desktop))
         self.systray.connect (self.systray, SIGNAL ("quitSelected ()"), self.slotQuitSelected)
         self.systray.show ()