From: Ivailo Monev <xakepa10@laimg.moc>
Date: Mon, 15 Aug 2016 14:20:31 +0000 (+0000)
Subject: plasma: Katie has the API again for alpha channel
X-Git-Tag: 4.22.0~1440
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=05ae44b02b80a1a779c37b57a52008cabb837a21;p=kde%2Fkde-workspace.git

plasma: Katie has the API again for alpha channel

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---

diff --git a/plasma/wallpapers/image/removebutton.cpp b/plasma/wallpapers/image/removebutton.cpp
index 9ae8c28e..81aefb73 100644
--- a/plasma/wallpapers/image/removebutton.cpp
+++ b/plasma/wallpapers/image/removebutton.cpp
@@ -159,7 +159,6 @@ void RemoveButton::paintEvent(QPaintEvent* event)
         QPixmap activeIcon = iconEffect.apply(m_icon, KIconLoader::Desktop, KIconLoader::ActiveState);
         painter.drawPixmap(0, 0, activeIcon);
     } else {
-#ifndef QT_KATIE
         if (m_fadingValue < 255) {
             // apply an alpha mask respecting the fading value to the icon
             QPixmap icon = m_icon;
@@ -169,14 +168,9 @@ void RemoveButton::paintEvent(QPaintEvent* event)
             icon.setAlphaChannel(alphaMask);
             painter.drawPixmap(0, 0, icon);
         } else {
-#else
-#warning no fading support with Katie
-#endif
             // no fading is required
             painter.drawPixmap(0, 0, m_icon);
-#ifndef QT_KATIE
         }
-#endif
     }
 }