Rename KIcon to enhance compatibility with KDE4

3 files changed, 15 insertions, 15 deletions

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
 
     """