Rename KIcon to enhance compatibility with KDE4

10 files changed, 32 insertions, 32 deletions

diff --git a/examples/menudemo.py b/examples/menudemo.py
index c0eb60d..c99e613 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, TDEAboutData, i18n, KIcon, KIconLoader, TDEShortcut
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, TDEIcon, TDEIconLoader, TDEShortcut
 from tdeui import TDEMainWindow, KMessageBox, KStdAction, TDEAction, TDEToggleAction, TDEFontSizeAction, TDEFontAction, TDERadioAction,\
                   TDEActionSeparator, TDEActionMenu, KWindowListMenu
 
@@ -97,8 +97,8 @@ class MainWin (TDEMainWindow):
         self.fontSizeAction = TDEFontSizeAction ("Font Size")
 
         # Need to assign an icon to actionMenu below
-        icons = KIconLoader ()
-        iconSet = TQIconSet (icons.loadIcon ("viewmag", KIcon.Toolbar))
+        icons = TDEIconLoader ()
+        iconSet = TQIconSet (icons.loadIcon ("viewmag", TDEIcon.Toolbar))
 
         # Nested menus using TDEActions (also nested on toolbar)
         self.actionMenu     = TDEActionMenu ("Action Menu")
diff --git a/examples/pytde-sampler/misc/passivepop.py b/examples/pytde-sampler/misc/passivepop.py
index fc37573..3619fc4 100644
--- a/examples/pytde-sampler/misc/passivepop.py
+++ b/examples/pytde-sampler/misc/passivepop.py
@@ -1,6 +1,6 @@
 from qt import TQt, TQFrame, TQHBoxLayout, TQVBoxLayout, TQLabel, SIGNAL
 from tdeui import KPassivePopup, KTextEdit, KPushButton
-from tdecore import TDEGlobal, KIcon
+from tdecore import TDEGlobal, TDEIcon
 
 iconName = 'popup'
 labelText = 'KPassivePopup'
@@ -35,8 +35,8 @@ class MainFrame(TQFrame):
         pos = pop.pos()
         pos.setY(pos.y() + pop.height() + 10)
         
-        ico = TDEGlobal.instance().iconLoader().loadIcon('help', KIcon.NoGroup,
-                                                       KIcon.SizeSmall)
+        ico = TDEGlobal.instance().iconLoader().loadIcon('help', TDEIcon.NoGroup,
+                                                       TDEIcon.SizeSmall)
         pop = KPassivePopup.message('<b>Hello</b>', 'With Icons', ico, self)
         pop.setTimeout(3000)
         pop.show()
diff --git a/examples/pytde-sampler/qt_widgets/CONTRIB b/examples/pytde-sampler/qt_widgets/CONTRIB
index 59209d8..6603cb5 100644
--- a/examples/pytde-sampler/qt_widgets/CONTRIB
+++ b/examples/pytde-sampler/qt_widgets/CONTRIB
@@ -53,10 +53,10 @@ tdecore,TDEGlobalAccel,,,
 tdecore,TDEGlobalSettings,,,
 tdecore,KIDNA,,,
 tdecore,KIPC,,,
-tdecore,KIcon,,,
-tdecore,KIconEffect,,,
-tdecore,KIconLoader,,,
-tdecore,KIconTheme,,,
+tdecore,TDEIcon,,,
+tdecore,TDEIconEffect,,,
+tdecore,TDEIconLoader,,,
+tdecore,TDEIconTheme,,,
 tdecore,TDEInstance,,,
 tdecore,KKey,,,
 tdecore,KKeyNative,,,
@@ -254,8 +254,8 @@ tdeui,KGuiItem,,,
 tdeui,KHSSelector,,,
 tdeui,KHelpMenu,,,
 tdeui,KHistoryCombo,,,
-tdeui,KIconView,,,
-tdeui,KIconViewItem,,,
+tdeui,TDEIconView,,,
+tdeui,TDEIconViewItem,,,
 tdeui,KInputDialog,,,
 tdeui,KIntNumInput,,,
 tdeui,KIntSpinBox,,,
@@ -372,9 +372,9 @@ tdefile,KFileTreeViewItem,,,
 tdefile,KFileTreeViewToolTip,,,
 tdefile,KFileView,,,
 tdefile,KFileViewSignaler,,,
-tdefile,KIconButton,,,
-tdefile,KIconCanvas,,,
-tdefile,KIconDialog,,,
+tdefile,TDEIconButton,,,
+tdefile,TDEIconCanvas,,,
+tdefile,TDEIconDialog,,,
 tdefile,KImageFilePreview,,,
 tdefile,KNotify,,,
 tdefile,KNotifyDialog,,,
diff --git a/examples/pytde-sampler/sampler.py b/examples/pytde-sampler/sampler.py
index 30e1828..eb485ac 100755
--- a/examples/pytde-sampler/sampler.py
+++ b/examples/pytde-sampler/sampler.py
@@ -15,7 +15,7 @@ from qt import TQVBoxLayout, TQLabel, TQPixmap, TQSplitter, TQFrame, TQDialog
 from qt import TQSizePolicy, TQHBoxLayout, TQSpacerItem, TQPushButton
 
 from tdecore import i18n, TDEAboutData, TDEApplication, TDECmdLineArgs, TDEGlobal
-from tdecore import TDEGlobalSettings, KWin, KWinModule, KURL, KIcon
+from tdecore import TDEGlobalSettings, KWin, KWinModule, KURL, TDEIcon
 
 from tdeui import KComboBox, TDEListView, TDEListViewItem, KTabWidget, KTextEdit
 from tdeui import TDEMainWindow, KPushButton, KSplashScreen, KStdAction
@@ -52,14 +52,14 @@ def appConfig(group=None):
     return config
 
 
-def getIcon(name, group=KIcon.NoGroup, size=KIcon.SizeSmall):
+def getIcon(name, group=TDEIcon.NoGroup, size=TDEIcon.SizeSmall):
     """ returns a kde icon by name
 
     """
     return TDEGlobal.instance().iconLoader().loadIcon(name, group, size)
 
 
-def getIconSet(name, group=KIcon.NoGroup, size=KIcon.SizeSmall):
+def getIconSet(name, group=TDEIcon.NoGroup, size=TDEIcon.SizeSmall):
     """ returns a kde icon set by name
 
     """
diff --git a/examples/systray.py b/examples/systray.py
index cc7a40a..0eeb6b7 100644
--- a/examples/systray.py
+++ b/examples/systray.py
@@ -30,7 +30,7 @@ copyright holder.
 import sys
 
 from qt import TQLabel
-from tdecore import TDEApplication, KIcon, KIconLoader
+from tdecore import TDEApplication, TDEIcon, TDEIconLoader
 from tdeui import TDEMainWindow, KSystemTray
 
 class MainWin (TDEMainWindow):
@@ -42,10 +42,10 @@ class MainWin (TDEMainWindow):
 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.show ()
 
 #mainWindow.show()
diff --git a/examples/uimodules/uiwidgets.py b/examples/uimodules/uiwidgets.py
index c6f4df4..a56fc92 100644
--- a/examples/uimodules/uiwidgets.py
+++ b/examples/uimodules/uiwidgets.py
@@ -678,7 +678,7 @@ def widTDEFontChooser (parent):
 def widKHSSelector (parent):
     parent.currentPageObj = Page4 (parent)
 
-def widKIconView (parent):
+def widTDEIconView (parent):
     parent.currentPageObj = PageNotImpl (parent)
 
 def widKJanusWidget (parent):
diff --git a/examples/uiqxembed.py b/examples/uiqxembed.py
index 487016b..981ceb4 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 TDEAboutData, TDEApplication, TDECmdLineArgs, TDEGlobal, KIcon
+from tdecore import TDEAboutData, TDEApplication, TDECmdLineArgs, TDEGlobal, TDEIcon
 from tdecore import KWin, KWinModule
 from tdeui import KComboBox, TDEMainWindow, KPushButton, QXEmbed
 
@@ -19,13 +19,13 @@ qxembedexample.KPushButton = KPushButton
 from qxembedexample import QXEmbedExample
 
 
-def getIcon(name, group=KIcon.NoGroup, size=KIcon.SizeSmall):
+def getIcon(name, group=TDEIcon.NoGroup, size=TDEIcon.SizeSmall):
     """ returns a kde icon by name
 
     """
     return TDEGlobal.instance().iconLoader().loadIcon(name, group, size)
 
-def getIconSet(name, group=KIcon.NoGroup, size=KIcon.SizeSmall):
+def getIconSet(name, group=TDEIcon.NoGroup, size=TDEIcon.SizeSmall):
     """ returns a kde icon set by name
 
     """
diff --git a/examples/uisampler.py b/examples/uisampler.py
index a166116..98437ee 100644
--- a/examples/uisampler.py
+++ b/examples/uisampler.py
@@ -49,7 +49,7 @@ listItems = {"Dialogs":
                  "KEditListBox": [],\
                  "TDEFontChooser": [],\
                  "KHSSelector": [],\
-                 "KIconView": [],\
+                 "TDEIconView": [],\
                  "KJanusWidget": ["KJanusWidget::IconListBox"],\
                  "KKeyChooser": [],\
                  "KLed": [],\
diff --git a/examples/uitdemdi.py b/examples/uitdemdi.py
index 7177a16..dfcaa74 100644
--- a/examples/uitdemdi.py
+++ b/examples/uitdemdi.py
@@ -29,7 +29,7 @@ import os
 import sys
 
 from qt import SIGNAL, TQVBoxLayout, TQLabel
-from tdecore import i18n, TDEAboutData, TDEApplication, TDEGlobal, KIcon, TDECmdLineArgs
+from tdecore import i18n, TDEAboutData, TDEApplication, TDEGlobal, TDEIcon, TDECmdLineArgs
 from tdeui import KDockWidget, TDEListBox, KStdAction
 
 try:
@@ -44,7 +44,7 @@ sigChildViewActivated = SIGNAL('viewActivated(KMdiChildView *)')
 sigBoxSelectionChanged = SIGNAL('selectionChanged(TQListBoxItem *)')
 
 
-def getIcon(name, group=KIcon.NoGroup, size=KIcon.SizeSmall):
+def getIcon(name, group=TDEIcon.NoGroup, size=TDEIcon.SizeSmall):
     """ returns a kde icon by name
 
     """
@@ -132,7 +132,7 @@ class KmdiExample(KMdiMainFrm):
         lbl = i18n('Label for a view with an icon named %s' % text)
         lbl = TQLabel(lbl, view)
         pxm = TQLabel('', view)
-        pxm.setPixmap(getIcon(icon, size=KIcon.SizeLarge))
+        pxm.setPixmap(getIcon(icon, size=TDEIcon.SizeLarge))
 
         self.addWindow(view)
         self.mainToolWidget.insertItem(label)
diff --git a/examples/xmlmenudemo.py b/examples/xmlmenudemo.py
index e50f934..f4cfdb1 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, TDEAboutData, i18n, KIcon, KIconLoader, TDEShortcut, TDEGlobal
+from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, TDEIcon, TDEIconLoader, TDEShortcut, TDEGlobal
 from tdeui import TDEMainWindow, KMessageBox, KStdAction, TDEAction, TDEToggleAction, TDEFontSizeAction, TDEFontAction, TDERadioAction,\
                   TDEActionSeparator, TDEActionMenu, KWindowListMenu, KXMLGUIClient, TDEActionCollection
 
@@ -133,8 +133,8 @@ class MainWin (TDEMainWindow):
         self.fontSizeAction.setComboWidth (75)
 
        # Need to assign an icon to actionMenu below
-        icons = KIconLoader ()
-        iconSet = TQIconSet (icons.loadIcon ("viewmag", KIcon.Toolbar))
+        icons = TDEIconLoader ()
+        iconSet = TQIconSet (icons.loadIcon ("viewmag", TDEIcon.Toolbar))
 
         # Nested menus using TDEActions (also nested on toolbar)
         self.actionMenu     = TDEActionMenu ("Action Menu", acts, "actionMenu")