Cleanup unneeded version checks

kcms/colors/colors.cpp

@@ -47,10 +47,7 @@
 #include <KIO/DeleteJob>
 #include <KIO/JobUiDelegate>
 
-#include <knewstuffcore_version.h>
-#if KNEWSTUFFCORE_VERSION_MAJOR==5 && KNEWSTUFFCORE_VERSION_MINOR>=68
 #include <KNSCore/EntryWrapper>
-#endif
 
 #include <algorithm>
 
@@ -124,7 +121,6 @@ void KCMColors::reloadModel(const QQmlListReference &changedEntries)
 {
     m_model->load();
 
-#if KNEWSTUFFCORE_VERSION_MAJOR==5 && KNEWSTUFFCORE_VERSION_MINOR>=68
     // If a new theme was installed, select the first color file in it
     if (changedEntries.count() > 0) {
         QStringList installedThemes;
@@ -157,7 +153,6 @@ void KCMColors::reloadModel(const QQmlListReference &changedEntries)
             }
         }
     }
-#endif
 }
 
 void KCMColors::installSchemeFromFile(const QUrl &url)

kcms/cursortheme/kcmcursortheme.cpp

@@ -40,10 +40,7 @@
 #include <KTar>
 #include <KGlobalSettings>
 
-#include <knewstuffcore_version.h>
-#if KNEWSTUFFCORE_VERSION_MAJOR==5 && KNEWSTUFFCORE_VERSION_MINOR>=68
 #include <KNSCore/EntryWrapper>
-#endif
 
 #include <QQmlListReference>
 #include <QX11Info>
@@ -415,7 +412,6 @@ bool CursorThemeConfig::isSaveNeeded() const
 
 void CursorThemeConfig::ghnsEntriesChanged(const QQmlListReference &changedEntries)
 {
-#if KNEWSTUFFCORE_VERSION_MAJOR==5 && KNEWSTUFFCORE_VERSION_MINOR>=68
     for (int i = 0; i < changedEntries.count(); ++i) {
         KNSCore::EntryWrapper* entry = qobject_cast<KNSCore::EntryWrapper*>(changedEntries.at(i));
         if (entry) {
@@ -448,7 +444,6 @@ void CursorThemeConfig::ghnsEntriesChanged(const QQmlListReference &changedEntri
             }
         }
     }
-#endif
 }
 
 void CursorThemeConfig::installThemeFromFile(const QUrl &url)

shell/panelview.cpp

@@ -38,7 +38,6 @@
 #include <kwindowsystem.h>
 #include <kwindoweffects.h>
 
-#include <plasma_version.h>
 #include <Plasma/Containment>
 #include <Plasma/Package>
 
@@ -770,10 +769,6 @@ void PanelView::resizeEvent(QResizeEvent *ev)
     emit m_corona->availableScreenRegionChanged();
 
     PlasmaQuick::ContainmentView::resizeEvent(ev);
-
-#if PLASMA_VERSION < QT_VERSION_CHECK(5,59,0)
-    updateMask();
-#endif
 }
 
 void PanelView::moveEvent(QMoveEvent *ev)
@@ -781,9 +776,6 @@ void PanelView::moveEvent(QMoveEvent *ev)
     updateEnabledBorders();
     m_strutsTimer.start(STRUTSTIMERDELAY);
     PlasmaQuick::ContainmentView::moveEvent(ev);
-#if PLASMA_VERSION < QT_VERSION_CHECK(5,59,0)
-    updateMask();
-#endif
 }
 
 void PanelView::integrateScreen()