[rkward/frameworks] rkward: Fix some lookup failures of KF5 includes, and remove more KDE 4 headers.

[Thomas Friedrichsmeier]

Git commit 891d634b5d2ec14361f41288a7e719003aa8f507 by Thomas Friedrichsmeier.
Committed on 19/02/2016 at 16:26.
Pushed by tfry into branch 'frameworks'.

Fix some lookup failures of KF5 includes, and remove more KDE 4 headers.

M  +1    -1    rkward/core/CMakeLists.txt
M  +0    -1    rkward/dialogs/rkreadlinedialog.cpp
M  +1    -1    rkward/misc/CMakeLists.txt
M  +1    -1    rkward/rbackend/rkwarddevice/CMakeLists.txt
M  +0    -1    rkward/robjectviewer.cpp
M  +0    -1    rkward/windows/rkcommandeditorwindow.cpp
M  +0    -1    rkward/windows/rkcommandlog.cpp
M  +0    -1    rkward/windows/rkhtmlwindow.cpp
M  +0    -1    rkward/windows/rkworkplace.cpp

http://commits.kde.org/rkward/891d634b5d2ec14361f41288a7e719003aa8f507

diff --git a/rkward/core/CMakeLists.txt b/rkward/core/CMakeLists.txt
index 3a5f36c..226a777 100644
--- a/rkward/core/CMakeLists.txt
+++ b/rkward/core/CMakeLists.txt
@@ -13,5 +13,5 @@ SET(core_STAT_SRCS
    )
 
 ADD_LIBRARY(core STATIC ${core_STAT_SRCS})
-TARGET_LINK_LIBRARIES(core Qt5::Core Qt5::Widgets KF5::WidgetsAddons KF5::I18n)
+TARGET_LINK_LIBRARIES(core Qt5::Core Qt5::Widgets KF5::WidgetsAddons KF5::I18n KF5::Parts)
 
diff --git a/rkward/dialogs/rkreadlinedialog.cpp b/rkward/dialogs/rkreadlinedialog.cpp
index b8ab55b..d39b27f 100644
--- a/rkward/dialogs/rkreadlinedialog.cpp
+++ b/rkward/dialogs/rkreadlinedialog.cpp
@@ -28,7 +28,6 @@
 #include <QFontDatabase>
 
 #include <KLocalizedString>
-#include <kglobalsettings.h>
 
 #include "../rbackend/rcommand.h"
 #include "../misc/rkdialogbuttonbox.h"
diff --git a/rkward/misc/CMakeLists.txt b/rkward/misc/CMakeLists.txt
index 2009536..726f27a 100644
--- a/rkward/misc/CMakeLists.txt
+++ b/rkward/misc/CMakeLists.txt
@@ -30,7 +30,7 @@ SET(misc_STAT_SRCS
    )
 
 ADD_LIBRARY(misc STATIC ${misc_STAT_SRCS})
-TARGET_LINK_LIBRARIES(misc Qt5::Widgets KF5::WidgetsAddons KF5::KIOWidgets Qt5::Xml KF5::ConfigCore KF5::Parts)
+TARGET_LINK_LIBRARIES(misc Qt5::Widgets KF5::WidgetsAddons KF5::KIOWidgets Qt5::Xml KF5::ConfigCore KF5::Parts KF5::WindowSystem)
 
 ########### install files ###############
 
diff --git a/rkward/rbackend/rkwarddevice/CMakeLists.txt b/rkward/rbackend/rkwarddevice/CMakeLists.txt
index 0eb58c4..03ffee4 100644
--- a/rkward/rbackend/rkwarddevice/CMakeLists.txt
+++ b/rkward/rbackend/rkwarddevice/CMakeLists.txt
@@ -14,7 +14,7 @@ SET (
 )
 
 ADD_LIBRARY(rkgraphicsdevice.frontend STATIC ${rkgraphicsdevice_frontend_SRCS})
-TARGET_LINK_LIBRARIES(rkgraphicsdevice.frontend Qt5::Widgets Qt5::Core Qt5::Network KF5::WidgetsAddons KF5::I18n)
+TARGET_LINK_LIBRARIES(rkgraphicsdevice.frontend Qt5::Widgets Qt5::Core Qt5::Network KF5::CoreAddons KF5::WidgetsAddons KF5::I18n KF5::ConfigCore KF5::Parts)
 
 ADD_LIBRARY(rkgraphicsdevice.backend STATIC ${rkgraphicsdevice_backend_SRCS})
 TARGET_LINK_LIBRARIES(rkgraphicsdevice.backend Qt5::Core Qt5::Network)
diff --git a/rkward/robjectviewer.cpp b/rkward/robjectviewer.cpp
index ad56452..956156e 100644
--- a/rkward/robjectviewer.cpp
+++ b/rkward/robjectviewer.cpp
@@ -25,7 +25,6 @@
 #include <QTabWidget>
 
 #include <KLocalizedString>
-#include <kglobalsettings.h>
 #include <QFontDatabase>
 
 #include "rbackend/rinterface.h"
diff --git a/rkward/windows/rkcommandeditorwindow.cpp b/rkward/windows/rkcommandeditorwindow.cpp
index 60baa4b..f16cbda 100644
--- a/rkward/windows/rkcommandeditorwindow.cpp
+++ b/rkward/windows/rkcommandeditorwindow.cpp
@@ -1090,7 +1090,6 @@ KTextEditor::View* RKCommandHighlighter::getView () {
 	return _view;
 }
 
-#include <ktexteditor/highlightinterface.h>
 #include <QTextDocument>
 
 //////////
diff --git a/rkward/windows/rkcommandlog.cpp b/rkward/windows/rkcommandlog.cpp
index f58e241..8a2c7f1 100644
--- a/rkward/windows/rkcommandlog.cpp
+++ b/rkward/windows/rkcommandlog.cpp
@@ -34,7 +34,6 @@
 
 #include <KLocalizedString>
 #include <kactioncollection.h>
-#include <kglobalsettings.h>
 
 #include "../debug.h"
 
diff --git a/rkward/windows/rkhtmlwindow.cpp b/rkward/windows/rkhtmlwindow.cpp
index 98afd16..1599b44 100644
--- a/rkward/windows/rkhtmlwindow.cpp
+++ b/rkward/windows/rkhtmlwindow.cpp
@@ -25,7 +25,6 @@
 #include <kservice.h>
 #include <kwebview.h>
 #include <kcodecaction.h>
-#include <kglobalsettings.h>
 
 #include <qfileinfo.h>
 #include <qwidget.h>
diff --git a/rkward/windows/rkworkplace.cpp b/rkward/windows/rkworkplace.cpp
index 929adaf..8c99c98 100644
--- a/rkward/windows/rkworkplace.cpp
+++ b/rkward/windows/rkworkplace.cpp
@@ -20,7 +20,6 @@
 #include <kparts/partmanager.h>
 #include <kmessagebox.h>
 #include <KLocalizedString>
-#include <kglobalsettings.h>
 #include <kactioncollection.h>
 #include <krun.h>
 #include <KSharedConfig>