Switch to use kiconloader instead of hard-coded path

kdocker.desktop

@@ -4,7 +4,7 @@ GenericName=Docking utility
 Comment=Docks any application into system tray
 Exec=kdocker
 TryExec=kdocker
-Icon=/usr/local/share/kdocker/icons/kdocker.png
+Icon=kdocker.png
 Terminal=false
 Type=Application
 Categories=Application;Utility;

src/customtraylabel.cpp

@@ -29,6 +29,7 @@
 #include <qsize.h>
 #include <stdlib.h>
 
+#include <kiconloader.h>
 #include <kglobal.h>
 #include <klocale.h>
 
@@ -55,9 +56,7 @@ CustomTrayLabel::CustomTrayLabel(const QStringList& argv, pid_t pid,
  */
 void CustomTrayLabel::installMenu()
 {
-  QPixmap kdocker_png(QString(ICONS_PATH) + "/kdocker.png");
-  if (kdocker_png.isNull()) 
-    kdocker_png.load(qApp->applicationDirPath() + "/icons/kdocker.png");
+  QPixmap kdocker_png(KGlobal::iconLoader()->loadIcon("kdocker", KIcon::NoGroup, KIcon::SizeSmall));
   setIcon(kdocker_png);
   TrayLabelMgr *tlMgr = TrayLabelMgr::instance();
 

src/qtraylabel.cpp

@@ -32,6 +32,7 @@
 #include "trace.h"
 #include "qtraylabel.h"
 
+#include <kiconloader.h>
 #include <kglobal.h>
 
 #include <X11/cursorfont.h>
@@ -620,8 +621,7 @@ void QTrayLabel::handleIconChange(void)
   QImage image;
   if (!window_icon) 
   {
-    if (!image.load(QString(ICONS_PATH) + "/question.png"))
-      image.load(qApp->applicationDirPath() + "/icons/question.png");
+    image = KGlobal::iconLoader()->loadIcon("question", KIcon::NoGroup, KIcon::SizeMedium);
   }
   else image = QPixmap((const char **) window_icon).convertToImage();
   if (window_icon) XpmFree(window_icon);