From 173ca20eff2d21ef7e549cb61410fdc18609baaa Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Mon, 25 Apr 2016 15:49:47 +0000
Subject: [PATCH] generic: misc cleanups

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 CMakeLists.txt                          | 25 ++++++++++++-------------
 kcontrol/emoticons/emoticonslist.cpp    |  3 +--
 pics/CMakeLists.txt                     |  2 +-
 plasma/runners/bookmarks/CMakeLists.txt | 10 +++++-----
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 516a0cdd..39ae5bac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -193,18 +193,17 @@ check_include_files(sys/wait.h HAVE_SYS_WAIT_H)
 check_include_files(sys/time.h HAVE_SYS_TIME_H)
 
 include(ConfigureChecks.cmake)
-configure_file (config-runtime.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-runtime.h )
-configure_file(config-unix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-unix.h )
-configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h )
+configure_file(config-runtime.h.cmake ${CMAKE_BINARY_DIR}/config-runtime.h)
+configure_file(config-unix.h.cmake ${CMAKE_BINARY_DIR}/config-unix.h )
+configure_file(config-X11.h.cmake ${CMAKE_BINARY_DIR}/config-X11.h )
 if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
   set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${CMAKE_INSTALL_PREFIX}/share/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH")
 endif(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
-configure_file(startkde.cmake ${CMAKE_CURRENT_BINARY_DIR}/startkde  @ONLY)
-configure_file(config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h )
+configure_file(startkde.cmake ${CMAKE_BINARY_DIR}/startkde  @ONLY)
+configure_file(config-workspace.h.cmake ${CMAKE_BINARY_DIR}/config-workspace.h )
 
-add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DHAVE_CONFIG_H=1)
-add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${CMAKE_SOURCE_DIR}/libs)
+add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${CMAKE_SOURCE_DIR}/libs)
 
 # libs
 add_subdirectory(libs)
@@ -300,7 +299,7 @@ macro_optional_add_subdirectory(kde-menu)
 
 ########### install files ###############
 # install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/kde4 DESTINATION ${BIN_INSTALL_DIR})
-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/startkde DESTINATION ${BIN_INSTALL_DIR})
+install(PROGRAMS ${CMAKE_BINARY_DIR}/startkde DESTINATION ${BIN_INSTALL_DIR})
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
@@ -352,19 +351,19 @@ set(KDE4WORKSPACE_TARGET_PREFIX KDE4Workspace::)
 
 configure_file(
     KDE4WorkspaceConfig.cmake.in
-    "${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfig.cmake"
+    "${CMAKE_BINARY_DIR}/KDE4WorkspaceConfig.cmake"
     @ONLY
 )
 configure_file(
     KDE4WorkspaceVersion.cmake.in
-    "${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceVersion.cmake"
+    "${CMAKE_BINARY_DIR}/KDE4WorkspaceVersion.cmake"
     @ONLY
 )
 
 install(
     FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfig.cmake
-    ${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceVersion.cmake
+    ${CMAKE_BINARY_DIR}/KDE4WorkspaceConfig.cmake
+    ${CMAKE_BINARY_DIR}/KDE4WorkspaceVersion.cmake
     DESTINATION ${DATA_INSTALL_DIR}/cmake/modules
 )
 
diff --git a/kcontrol/emoticons/emoticonslist.cpp b/kcontrol/emoticons/emoticonslist.cpp
index 8fe6bd5c..9cf1c9e6 100644
--- a/kcontrol/emoticons/emoticonslist.cpp
+++ b/kcontrol/emoticons/emoticonslist.cpp
@@ -23,7 +23,7 @@
 #include <QDir>
 #include <QIcon>
 #include <QLabel>
-#include <QtGui/qlistwidget.h>
+#include <QListWidget>
 #include <KMessageBox>
 #include <KDebug>
 #include <KIcon>
@@ -32,7 +32,6 @@
 #include <KFileDialog>
 #include <KInputDialog>
 #include <KUrlRequesterDialog>
-#include <kdecore_export.h>
 #include <kio/netaccess.h>
 #include <kpluginfactory.h>
 
diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt
index 46d4612b..5caf5662 100644
--- a/pics/CMakeLists.txt
+++ b/pics/CMakeLists.txt
@@ -4,7 +4,7 @@ add_subdirectory( emoticons )
 #add_subdirectory( oxygen )
 
 set(ksvgtopng_SRCS ksvgtopng.cpp )
-add_executable(ksvgtopng NOGUI ${ksvgtopng_SRCS})
+add_executable(ksvgtopng ${ksvgtopng_SRCS})
 target_link_libraries(ksvgtopng ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSVG_LIBRARY})
 install(TARGETS ksvgtopng ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
diff --git a/plasma/runners/bookmarks/CMakeLists.txt b/plasma/runners/bookmarks/CMakeLists.txt
index 7fb72114..1f8e7b25 100644
--- a/plasma/runners/bookmarks/CMakeLists.txt
+++ b/plasma/runners/bookmarks/CMakeLists.txt
@@ -21,11 +21,11 @@ set(krunner_bookmarksrunner_SRCS
 )
 
 if(QJSON_FOUND)
-set(krunner_bookmarksrunner_SRCS
-    ${krunner_bookmarksrunner_SRCS}
-    browsers/chromefindprofile.cpp
-    browsers/chrome.cpp
-)
+    set(krunner_bookmarksrunner_SRCS
+        ${krunner_bookmarksrunner_SRCS}
+        browsers/chromefindprofile.cpp
+        browsers/chrome.cpp
+    )
 endif(QJSON_FOUND)
 
 
-- 
2.11.0