From 1ce0f0e9d6689c93563de77e5e84515887789cfb Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Sat, 17 Oct 2015 19:10:20 +0300
Subject: [PATCH] generic: misc cleanups

---
 kcontrol/kdebug/kdebugconfig.cpp                       | 5 +++--
 kcontrol/kdebug/kdebugconfig.h                         | 2 +-
 kwin/sm.cpp                                            | 2 +-
 libs/taskmanager/CMakeLists.txt                        | 8 ++------
 plasma/generic/scriptengines/javascript/CMakeLists.txt | 6 ------
 5 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/kcontrol/kdebug/kdebugconfig.cpp b/kcontrol/kdebug/kdebugconfig.cpp
index abdac845..8422dc8e 100644
--- a/kcontrol/kdebug/kdebugconfig.cpp
+++ b/kcontrol/kdebug/kdebugconfig.cpp
@@ -173,13 +173,13 @@ void KCMDebug::load()
 {
     KConfigGroup topGroup(pConfig, QString());
     m_disableAll->setChecked(topGroup.readEntry("DisableAll", true));
-    m_loaded = true;
+    mLoaded = true;
     emit changed( false );
 }
 
 void KCMDebug::save()
 {
-    if (!m_loaded) {
+    if (!mLoaded) {
         return;
     }
     kDebug();
@@ -281,4 +281,5 @@ void KCMDebug::slotAbortFatalChanged()
 {
     save();
 }
+
 #include "moc_kdebugconfig.cpp"
diff --git a/kcontrol/kdebug/kdebugconfig.h b/kcontrol/kdebug/kdebugconfig.h
index 0af8b9d6..c7dbf6cb 100644
--- a/kcontrol/kdebug/kdebugconfig.h
+++ b/kcontrol/kdebug/kdebugconfig.h
@@ -64,7 +64,7 @@ private:
     void readAreas();
 
     QString mCurrentDebugArea;
-    bool m_loaded; // hack to avoid saving before loading
+    bool mLoaded; // hack to avoid saving before loading
 
     QMap<QString /*area name*/, QString /*description*/> mAreaMap;
 
diff --git a/kwin/sm.cpp b/kwin/sm.cpp
index 7e1e35c4..94c65153 100644
--- a/kwin/sm.cpp
+++ b/kwin/sm.cpp
@@ -257,7 +257,7 @@ SessionInfo* Workspace::takeSessionInfo(Client* c)
     // First search ``session''
     if (! sessionId.isEmpty()) {
         // look for a real session managed client (algorithm suggested by ICCCM)
-        foreach (SessionInfo * info, session) {
+        foreach (SessionInfo *info, session) {
             if (realInfo)
                 break;
             if (info->sessionId == sessionId && sessionInfoWindowTypeMatch(c, info)) {
diff --git a/libs/taskmanager/CMakeLists.txt b/libs/taskmanager/CMakeLists.txt
index dacbaf9e..d649d6a7 100644
--- a/libs/taskmanager/CMakeLists.txt
+++ b/libs/taskmanager/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=1204)
+include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kephal)
 
 ########### next target ###############
 
@@ -30,7 +31,7 @@ set(taskmanager_LIB_SRCS ${taskmanager_LIB_SRCS} task_x11.cpp)
 
 add_library(taskmanager SHARED ${taskmanager_LIB_SRCS})
 
-target_link_libraries(taskmanager processcore ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES})
+target_link_libraries(taskmanager processcore ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES} kephal)
 if (X11_Xfixes_FOUND)
   target_link_libraries(taskmanager ${X11_Xfixes_LIB})
 endif (X11_Xfixes_FOUND)
@@ -41,11 +42,6 @@ if (X11_Xcomposite_FOUND)
   target_link_libraries(taskmanager ${X11_Xcomposite_LIB})
 endif (X11_Xcomposite_FOUND)
 
-if (NOT KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
-    include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kephal)
-    target_link_libraries(taskmanager kephal)
- endif (NOT KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
-
 set_target_properties(taskmanager PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 install(TARGETS taskmanager EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
diff --git a/plasma/generic/scriptengines/javascript/CMakeLists.txt b/plasma/generic/scriptengines/javascript/CMakeLists.txt
index 8efc08b7..a488f895 100644
--- a/plasma/generic/scriptengines/javascript/CMakeLists.txt
+++ b/plasma/generic/scriptengines/javascript/CMakeLists.txt
@@ -1,11 +1,5 @@
 # APPLET
 
-if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
-    set(PLASMA_NO_KDEWEBKIT TRUE)
-    set(PLASMA_NO_SOLID TRUE)
-    set(PLASMA_NO_KIO TRUE)
-endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
-
 set(simple_javascript_engine_SRCS
     common/extension_launchapp.cpp
     common/extension_io.cpp