From de9b6c9ad15f9f51812daae17cce635d1050a9ba Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 4 Feb 2013 14:14:55 -0600
Subject: Rename KIcon to enhance compatibility with KDE4

---
 kicker/applets/clock/clock.cpp           |  8 ++++----
 kicker/applets/launcher/quickbutton.cpp  | 12 ++++++------
 kicker/applets/launcher/quickbutton.h    |  2 +-
 kicker/applets/minipager/pagerbutton.cpp |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'kicker/applets')

diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 2c4083443..5cfd3a308 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -370,7 +370,7 @@ void DigitalClock::loadSettings()
     setSegmentStyle(TQLCDNumber::Flat);
 
     if (_prefs->digitalLCDStyle())
-        lcdPattern = KIconLoader("clockapplet").loadIcon("lcd", KIcon::User);
+        lcdPattern = TDEIconLoader("clockapplet").loadIcon("lcd", TDEIcon::User);
 
     setNumDigits(_prefs->digitalShowSeconds() ? 8:5);
 
@@ -477,14 +477,14 @@ void AnalogClock::initBackgroundPixmap()
     //if no antialiasing, use pixmap as-is
     if (_prefs->analogAntialias() == 0)
     {
-      lcdPattern = KIconLoader("clockapplet").loadIcon("lcd",KIcon::User);
+      lcdPattern = TDEIconLoader("clockapplet").loadIcon("lcd",TDEIcon::User);
       _bgScale = 1;
     }
     else
     {
         //make a scaled pixmap -- so when image is reduced it'll look "OK".
         _bgScale = _prefs->analogAntialias()+1;
-        TQImage bgImage = KIconLoader("clockapplet").loadIcon("lcd", KIcon::User).convertToImage();
+        TQImage bgImage = TDEIconLoader("clockapplet").loadIcon("lcd", TDEIcon::User).convertToImage();
         lcdPattern = TQPixmap(bgImage.scale(bgImage.width() * _bgScale,
                              bgImage.height() * _bgScale));
 
@@ -1780,7 +1780,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
         TZoffset = zone->calc_TZ_offset(activeZone);
     }
 
-    data.icon = DesktopIcon("date", KIcon::SizeMedium);
+    data.icon = DesktopIcon("date", TDEIcon::SizeMedium);
     data.direction = popupDirection();
     data.duration = 4000;
 }
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index 199a7b750..eb5a3b2de 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -126,7 +126,7 @@ void QuickURL::run() const
 }
 
 //similar to MimeType::pixmapForURL
-TQPixmap QuickURL::pixmap( mode_t _mode, KIcon::Group _group,
+TQPixmap QuickURL::pixmap( mode_t _mode, TDEIcon::Group _group,
                           int _force_size, int _state, TQString *) const
 {
    TQPixmap pxmap;
@@ -206,8 +206,8 @@ void QuickButton::loadIcon()
     // Set Icon Dimension from size
    _iconDim=std::min(size().width(),size().height())-2*ICON_MARGIN;
    // Load icons
-   _icon = _qurl->pixmap(0, KIcon::Panel, _iconDim, KIcon::DefaultState);
-   _iconh = _qurl->pixmap(0, KIcon::Panel, _iconDim, KIcon::ActiveState);
+   _icon = _qurl->pixmap(0, TDEIcon::Panel, _iconDim, TDEIcon::DefaultState);
+   _iconh = _qurl->pixmap(0, TDEIcon::Panel, _iconDim, TDEIcon::ActiveState);
    setPixmap(_icon);
 }
 
@@ -262,7 +262,7 @@ void QuickButton::launch()
    if (!KickerSettings::showDeepButtons()) {
        setDown(false);
        update();
-       KIconEffect::visualActivate(this, rect());
+       TDEIconEffect::visualActivate(this, rect());
    }
    if (_qurl->kurl().url() == "SPECIAL_BUTTON__SHOW_DESKTOP") {
        if (isOn()) {
@@ -344,10 +344,10 @@ void QuickButton::updateKickerTip(KickerTip::Data &data)
         data.subtext = data.message;
     }
     if (_qurl->url() == "SPECIAL_BUTTON__SHOW_DESKTOP") {
-        data.icon = TDEGlobal::iconLoader()->loadIcon("desktop", KIcon::Panel, KIcon::SizeHuge, KIcon::DefaultState);
+        data.icon = TDEGlobal::iconLoader()->loadIcon("desktop", TDEIcon::Panel, TDEIcon::SizeHuge, TDEIcon::DefaultState);
     }
     else {
-        data.icon = KMimeType::pixmapForURL(_qurl->kurl(), 0, KIcon::Panel, KIcon::SizeHuge, KIcon::DefaultState);
+        data.icon = KMimeType::pixmapForURL(_qurl->kurl(), 0, TDEIcon::Panel, TDEIcon::SizeHuge, TDEIcon::DefaultState);
     }
 }
 
diff --git a/kicker/applets/launcher/quickbutton.h b/kicker/applets/launcher/quickbutton.h
index 4629093cc..ea5ed21aa 100644
--- a/kicker/applets/launcher/quickbutton.h
+++ b/kicker/applets/launcher/quickbutton.h
@@ -53,7 +53,7 @@ public:
     TQString name() const { return m_name; }
     KService::Ptr service() const {return _service;};
     void run() const;
-    TQPixmap pixmap(mode_t _mode = 0, KIcon::Group _group = KIcon::Desktop,
+    TQPixmap pixmap(mode_t _mode = 0, TDEIcon::Group _group = TDEIcon::Desktop,
                    int _force_size = 0, int _state = 0, TQString * _path = 0L) const;
 
 private:
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index eb1ba784c..3e51a199e 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -829,7 +829,7 @@ void KMiniPagerButton::updateKickerTip(KickerTip::Data &data)
     }
 
     data.duration = 4000;
-    data.icon = DesktopIcon("window_list", KIcon::SizeMedium);
+    data.icon = DesktopIcon("window_list", TDEIcon::SizeMedium);
     data.message = TQStyleSheet::escape(m_desktopName);
     data.direction = m_pager->popupDirection();
 }
-- 
cgit v1.2.1