From 3c81603a8bed351e62f0dbfea8fcffe21e2911be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= <sebas@kde.org>
Date: Sat, 5 Oct 2013 01:38:31 +0200
Subject: [PATCH] Crudely make corebindings kde4support free

---
 src/declarativeimports/core/CMakeLists.txt       |  3 +--
 src/declarativeimports/core/dialog.cpp           |  2 +-
 src/declarativeimports/core/iconitem.cpp         |  4 ++--
 src/declarativeimports/core/tests/CMakeLists.txt |  1 -
 src/declarativeimports/core/theme.cpp            | 10 +++++-----
 src/declarativeimports/core/windowthumbnail.cpp  |  2 +-
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/declarativeimports/core/CMakeLists.txt b/src/declarativeimports/core/CMakeLists.txt
index 7b7b16f4c..d6cac2a1c 100644
--- a/src/declarativeimports/core/CMakeLists.txt
+++ b/src/declarativeimports/core/CMakeLists.txt
@@ -44,7 +44,6 @@ target_link_libraries(corebindingsplugin
         ${Qt5Qml_LIBRARIES}
         ${KDeclarative_LIBRARIES}
         ${KCore_LIBRARIES}
-        ${KDE4Support_LIBRARIES}
         KF5::KIconThemes
         KF5::KWindowSystem
         plasma)
@@ -68,4 +67,4 @@ endif(X11_FOUND)
 install(TARGETS corebindingsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/core)
 install(FILES qmldir ToolTip.qml DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/core)
 
-add_subdirectory(tests)
+#add_subdirectory(tests)
diff --git a/src/declarativeimports/core/dialog.cpp b/src/declarativeimports/core/dialog.cpp
index c97713723..957d6caab 100644
--- a/src/declarativeimports/core/dialog.cpp
+++ b/src/declarativeimports/core/dialog.cpp
@@ -31,7 +31,7 @@
 #include <QLayout>
 #include <QScreen>
 
-#include <KWindowSystem>
+#include <kwindowsystem.h>
 #include <kwindoweffects.h>
 #include <Plasma/Plasma>
 #include <Plasma/Corona>
diff --git a/src/declarativeimports/core/iconitem.cpp b/src/declarativeimports/core/iconitem.cpp
index fa404d649..421360133 100644
--- a/src/declarativeimports/core/iconitem.cpp
+++ b/src/declarativeimports/core/iconitem.cpp
@@ -24,8 +24,8 @@
 #include <QPainter>
 #include <QPropertyAnimation>
 
-#include <KIconLoader>
-#include <KIconEffect>
+#include <kiconloader.h>
+#include <kiconeffect.h>
 
 #include <plasma/svg.h>
 
diff --git a/src/declarativeimports/core/tests/CMakeLists.txt b/src/declarativeimports/core/tests/CMakeLists.txt
index 3dbd235ca..f2a36bfe7 100644
--- a/src/declarativeimports/core/tests/CMakeLists.txt
+++ b/src/declarativeimports/core/tests/CMakeLists.txt
@@ -15,7 +15,6 @@ qt4_automoc(sortfiltermodeltest.cpp)
 
 target_link_libraries(sortfiltermodeltest
     plasma
-    ${KDE4Support_LIBRARIES}
     ${QT_QTGUI_LIBRARY}
     ${QT_QTTEST_LIBRARY}
     KF5::KI18n
diff --git a/src/declarativeimports/core/theme.cpp b/src/declarativeimports/core/theme.cpp
index d72997945..1b91a4cca 100644
--- a/src/declarativeimports/core/theme.cpp
+++ b/src/declarativeimports/core/theme.cpp
@@ -22,8 +22,8 @@
 #include <QQmlPropertyMap>
 
 #include <QFontMetrics>
-#include <KGlobalSettings>
-#include <KIconLoader>
+#include <QFontDatabase>
+#include <kiconloader.h>
 #include <QApplication>
 
 
@@ -46,8 +46,8 @@ ThemeProxy::ThemeProxy(QQmlEngine *parent)
     connect(this, &Plasma::Theme::themeChanged, this, &ThemeProxy::themeChanged);
     connect(KIconLoader::global(), SIGNAL(iconLoaderSettingsChanged()), this, SLOT(iconLoaderSettingsChanged()));
 
-    connect(KGlobalSettings::self(), &KGlobalSettings::kdisplayFontChanged, this, &ThemeProxy::defaultFontChanged);
-    connect(KGlobalSettings::self(), &KGlobalSettings::kdisplayFontChanged, this, &ThemeProxy::smallestFontChanged);
+    //connect(KGlobalSettings::self(), &KGlobalSettings::kdisplayFontChanged, this, &ThemeProxy::defaultFontChanged);
+    //connect(KGlobalSettings::self(), &KGlobalSettings::kdisplayFontChanged, this, &ThemeProxy::smallestFontChanged);
 }
 
 ThemeProxy::~ThemeProxy()
@@ -66,7 +66,7 @@ QFont ThemeProxy::defaultFont() const
 
 QFont ThemeProxy::smallestFont() const
 {
-    return KGlobalSettings::smallestReadableFont();
+    return QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont);
 }
 
 QSizeF ThemeProxy::mSize(const QFont &font) const
diff --git a/src/declarativeimports/core/windowthumbnail.cpp b/src/declarativeimports/core/windowthumbnail.cpp
index 3baf98145..b96d939b2 100644
--- a/src/declarativeimports/core/windowthumbnail.cpp
+++ b/src/declarativeimports/core/windowthumbnail.cpp
@@ -18,7 +18,7 @@
  */
 #include "windowthumbnail.h"
 // KF5
-#include <KWindowSystem>
+#include <kwindowsystem.h>
 // Qt
 #include <QGuiApplication>
 #include <QIcon>