Rename KIcon to enhance compatibility with KDE4

2 files changed, 19 insertions, 19 deletions

diff --git a/kmahjongg/Editor.cpp b/kmahjongg/Editor.cpp
index 657f7d3b..cfb4e83f 100644
--- a/kmahjongg/Editor.cpp
+++ b/kmahjongg/Editor.cpp
@@ -105,40 +105,40 @@ Editor::~Editor()
 void Editor::setupToolbar()
 {
 
-    KIconLoader *loader = TDEGlobal::iconLoader();
+    TDEIconLoader *loader = TDEGlobal::iconLoader();
     topToolbar = new TDEToolBar( this, "editToolBar" );
     TDEToolBarRadioGroup *radio = new TDEToolBarRadioGroup(topToolbar);
 
     // new game
-    topToolbar->insertButton(loader->loadIcon("filenew", KIcon::Toolbar),
+    topToolbar->insertButton(loader->loadIcon("filenew", TDEIcon::Toolbar),
             ID_TOOL_NEW, true, i18n("New board"));
     // open game
-    topToolbar->insertButton(loader->loadIcon("fileopen", KIcon::Toolbar),
+    topToolbar->insertButton(loader->loadIcon("fileopen", TDEIcon::Toolbar),
             ID_TOOL_LOAD, true, i18n("Open board"));
     // save game
-    topToolbar->insertButton(loader->loadIcon("filesave", KIcon::Toolbar),
+    topToolbar->insertButton(loader->loadIcon("filesave", TDEIcon::Toolbar),
             ID_TOOL_SAVE, true, i18n("Save board"));
-    topToolbar->setButtonIconSet(ID_TOOL_SAVE,loader->loadIconSet("filesave", KIcon::Toolbar));
+    topToolbar->setButtonIconSet(ID_TOOL_SAVE,loader->loadIconSet("filesave", TDEIcon::Toolbar));
     
 #ifdef FUTURE_OPTIONS
     // Select
     topToolbar->insertSeparator();
-    topToolbar->insertButton(loader->loadIcon("rectangle_select", KIcon::Toolbar),
+    topToolbar->insertButton(loader->loadIcon("rectangle_select", TDEIcon::Toolbar),
             ID_TOOL_SELECT, true, i18n("Select"));
-    topToolbar->insertButton(loader->loadIcon("editcut", KIcon::Toolbar),
+    topToolbar->insertButton(loader->loadIcon("editcut", TDEIcon::Toolbar),
             ID_TOOL_CUT, true, i18n("Cut"));
-    topToolbar->insertButton(loader->loadIcon("editcopy", KIcon::Toolbar),
+    topToolbar->insertButton(loader->loadIcon("editcopy", TDEIcon::Toolbar),
             ID_TOOL_COPY, true, i18n("Copy"));
-    topToolbar->insertButton(loader->loadIcon("editpaste", KIcon::Toolbar),
+    topToolbar->insertButton(loader->loadIcon("editpaste", TDEIcon::Toolbar),
             ID_TOOL_PASTE, true, i18n("Paste"));
 
     topToolbar->insertSeparator();
-    topToolbar->insertButton(loader->loadIcon("move", KIcon::Toolbar),
+    topToolbar->insertButton(loader->loadIcon("move", TDEIcon::Toolbar),
             ID_TOOL_MOVE, true, i18n("Move tiles"));
 #endif
-    topToolbar->insertButton(loader->loadIcon("pencil", KIcon::Toolbar),
+    topToolbar->insertButton(loader->loadIcon("pencil", TDEIcon::Toolbar),
             ID_TOOL_ADD, true, i18n("Add tiles"));
-    topToolbar->insertButton(loader->loadIcon("editdelete", KIcon::Toolbar),
+    topToolbar->insertButton(loader->loadIcon("editdelete", TDEIcon::Toolbar),
             ID_TOOL_DEL, true, i18n("Remove tiles"));
 
     topToolbar->setToggle(ID_TOOL_ADD);
@@ -154,17 +154,17 @@ void Editor::setupToolbar()
     // board shift
 
     topToolbar->insertSeparator();
-    topToolbar->insertButton(loader->loadIcon("back", KIcon::Toolbar),
+    topToolbar->insertButton(loader->loadIcon("back", TDEIcon::Toolbar),
             ID_TOOL_LEFT, true, i18n("Shift left"));
-    topToolbar->insertButton(loader->loadIcon("up", KIcon::Toolbar),
+    topToolbar->insertButton(loader->loadIcon("up", TDEIcon::Toolbar),
             ID_TOOL_UP, true, i18n("Shift up"));
-    topToolbar->insertButton(loader->loadIcon("down", KIcon::Toolbar),
+    topToolbar->insertButton(loader->loadIcon("down", TDEIcon::Toolbar),
             ID_TOOL_DOWN, true, i18n("Shift down"));
-    topToolbar->insertButton(loader->loadIcon("forward", KIcon::Toolbar),
+    topToolbar->insertButton(loader->loadIcon("forward", TDEIcon::Toolbar),
             ID_TOOL_RIGHT, true, i18n("Shift right"));
 
     topToolbar->insertSeparator();
-    topToolbar->insertButton(loader->loadIcon("exit", KIcon::Toolbar),
+    topToolbar->insertButton(loader->loadIcon("exit", TDEIcon::Toolbar),
             ID_META_EXIT, true, i18n("Exit"));
 
     // status in the toolbar for now (ick)
diff --git a/kmahjongg/HighScore.cpp b/kmahjongg/HighScore.cpp
index fab8d8f2..94782cff 100644
--- a/kmahjongg/HighScore.cpp
+++ b/kmahjongg/HighScore.cpp
@@ -127,8 +127,8 @@ HighScore::HighScore
 	resetBtn->setAutoRepeat( false );
 	resetBtn->setAutoResize( false );
 
- 	KIconLoader *loader = TDEGlobal::iconLoader();
-        resetBtn->setPixmap(loader->loadIcon("editdelete", KIcon::Toolbar));
+ 	TDEIconLoader *loader = TDEGlobal::iconLoader();
+        resetBtn->setPixmap(loader->loadIcon("editdelete", TDEIcon::Toolbar));