adjustments for libkscreen

diff --git a/kscreen/CMakeLists.txt b/kscreen/CMakeLists.txt
index 76ae027..d2c91a2 100644 (file)
--- a/kscreen/CMakeLists.txt
+++ b/kscreen/CMakeLists.txt
@@ -21,6 +21,7 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${QJSON_INCLUDE_DIR}
     ${CMAKE_SOURCE_DIR}/libkscreen
+    ${CMAKE_SOURCE_DIR}
 )
 
 add_subdirectory(icons)

diff --git a/kscreen/console/console.cpp b/kscreen/console/console.cpp
index 135ee65..d12d766 100644 (file)
--- a/kscreen/console/console.cpp
+++ b/kscreen/console/console.cpp
@@ -27,11 +27,11 @@
 #include <qjson/parser.h>
 #include <qjson/serializer.h>
 
-#include <kscreen/config.h>
-#include <kscreen/output.h>
-#include <kscreen/mode.h>
-#include <kscreen/configmonitor.h>
-#include <kscreen/edid.h>
+#include <libkscreen/src/config.h>
+#include <libkscreen/src/output.h>
+#include <libkscreen/src/mode.h>
+#include <libkscreen/src/configmonitor.h>
+#include <libkscreen/src/edid.h>
 
 #include <KStandardDirs>
 

diff --git a/kscreen/console/console.h b/kscreen/console/console.h
index 9831d1c..a843475 100644 (file)
--- a/kscreen/console/console.h
+++ b/kscreen/console/console.h
@@ -20,7 +20,7 @@
 #define LOOP2
 
 #include <QObject>
-#include <kscreen/output.h>
+#include <libkscreen/src/output.h>
 
 namespace KScreen
 {

diff --git a/kscreen/kcm/src/kcm_kscreen.cpp b/kscreen/kcm/src/kcm_kscreen.cpp
index f3c600f..7f8b091 100644 (file)
--- a/kscreen/kcm/src/kcm_kscreen.cpp
+++ b/kscreen/kcm/src/kcm_kscreen.cpp
@@ -38,9 +38,9 @@
 #include <QDeclarativeView>
 #include <QDeclarativeContext>
 
-#include <kscreen/config.h>
-#include <kscreen/edid.h>
-#include <kscreen/configmonitor.h>
+#include <libkscreen/src/config.h>
+#include <libkscreen/src/edid.h>
+#include <libkscreen/src/configmonitor.h>
 
 K_PLUGIN_FACTORY(KCMDisplayConfigurationFactory, registerPlugin<KCMKScreen>();)
 K_EXPORT_PLUGIN(KCMDisplayConfigurationFactory ("kcm_kscreen" /* kcm name */,

diff --git a/kscreen/kcm/src/modeselectionwidget.cpp b/kscreen/kcm/src/modeselectionwidget.cpp
index 3a04e86..abed78c 100644 (file)
--- a/kscreen/kcm/src/modeselectionwidget.cpp
+++ b/kscreen/kcm/src/modeselectionwidget.cpp
@@ -22,7 +22,7 @@
 #include <QGridLayout>
 #include <QPainter>
 #include <QGraphicsProxyWidget>
-#include <kscreen/output.h>
+#include <libkscreen/src/output.h>
 #include <KDebug>
 #include <QRectF>
 #include <sys/socket.h>

diff --git a/kscreen/kcm/src/qmloutput.cpp b/kscreen/kcm/src/qmloutput.cpp
index 1f7be9c..6265bb9 100644 (file)
--- a/kscreen/kcm/src/qmloutput.cpp
+++ b/kscreen/kcm/src/qmloutput.cpp
@@ -18,7 +18,7 @@
 
 
 #include "qmloutput.h"
-#include <kscreen/output.h>
+#include <libkscreen/src/output.h>
 #include <KDebug>
 
 #include <QStandardItem>

diff --git a/kscreen/kcm/src/qmloutput.h b/kscreen/kcm/src/qmloutput.h
index d702a8c..5bf9e50 100644 (file)
--- a/kscreen/kcm/src/qmloutput.h
+++ b/kscreen/kcm/src/qmloutput.h
@@ -21,7 +21,7 @@
 #define QMLOUTPUT_H
 
 #include <QDeclarativeItem>
-#include <kscreen/mode.h>
+#include <libkscreen/src/mode.h>
 
 class QStandardItemModel;
 class QAbstractItemModel;

diff --git a/kscreen/kcm/src/qmloutputcomponent.cpp b/kscreen/kcm/src/qmloutputcomponent.cpp
index 64c4d2c..33fd4e8 100644 (file)
--- a/kscreen/kcm/src/qmloutputcomponent.cpp
+++ b/kscreen/kcm/src/qmloutputcomponent.cpp
@@ -27,7 +27,7 @@
 #include <KDebug>
 #include <KUrl>
 
-#include <kscreen/output.h>
+#include <libkscreen/src/output.h>
 
 Q_DECLARE_METATYPE(KScreen::Output*)
 

diff --git a/kscreen/kded/daemon.cpp b/kscreen/kded/daemon.cpp
index 756e5a7..f47ef3f 100644 (file)
--- a/kscreen/kded/daemon.cpp
+++ b/kscreen/kded/daemon.cpp
@@ -31,8 +31,8 @@
 #include <KActionCollection>
 #include <KPluginFactory>
 
-#include <kscreen/config.h>
-#include <kscreen/configmonitor.h>
+#include <libkscreen/src/config.h>
+#include <libkscreen/src/configmonitor.h>
 
 K_PLUGIN_FACTORY(KScreenDaemonFactory, registerPlugin<KScreenDaemon>();)
 K_EXPORT_PLUGIN(KScreenDaemonFactory("kscreen", "kscreen"))

diff --git a/kscreen/kded/daemon.h b/kscreen/kded/daemon.h
index 53ed374..c4f310d 100644 (file)
--- a/kscreen/kded/daemon.h
+++ b/kscreen/kded/daemon.h
@@ -23,7 +23,7 @@
 
 #include <kdedmodule.h>
 
-#include <kscreen/config.h>
+#include <libkscreen/src/config.h>
 
 class QTimer;
 

diff --git a/kscreen/kded/generator.cpp b/kscreen/kded/generator.cpp
index 131e13b..505db5f 100644 (file)
--- a/kscreen/kded/generator.cpp
+++ b/kscreen/kded/generator.cpp
@@ -24,7 +24,7 @@
 #include <QDBusConnection>
 
 #include <kdebug.h>
-#include <kscreen/config.h>
+#include <libkscreen/src/config.h>
 
 Generator* Generator::instance = 0;
 

diff --git a/kscreen/kded/generator.h b/kscreen/kded/generator.h
index 3b2df2d..6c77bd0 100644 (file)
--- a/kscreen/kded/generator.h
+++ b/kscreen/kded/generator.h
@@ -22,8 +22,8 @@
 #include <QtCore/QObject>
 #include <QtCore/QString>
 
-#include <kscreen/output.h>
-#include <kscreen/mode.h>
+#include <libkscreen/src/output.h>
+#include <libkscreen/src/mode.h>
 
 namespace KScreen
 {

diff --git a/kscreen/kded/serializer.cpp b/kscreen/kded/serializer.cpp
index f9641ca..4a3aabe 100644 (file)
--- a/kscreen/kded/serializer.cpp
+++ b/kscreen/kded/serializer.cpp
@@ -30,9 +30,9 @@
 
 #include <kdebug.h>
 
-#include <kscreen/config.h>
-#include <kscreen/output.h>
-#include <kscreen/edid.h>
+#include <libkscreen/src/config.h>
+#include <libkscreen/src/output.h>
+#include <libkscreen/src/edid.h>
 #include <KStandardDirs>
 
 QString Serializer::currentId()

diff --git a/kscreen/plasma/kscreenapplet.cpp b/kscreen/plasma/kscreenapplet.cpp
index 492e89b..e5dbb71 100644 (file)
--- a/kscreen/plasma/kscreenapplet.cpp
+++ b/kscreen/plasma/kscreenapplet.cpp
@@ -32,10 +32,10 @@
 #include <Plasma/DeclarativeWidget>
 #include <KToolInvocation>
 
-#include <kscreen/config.h>
-#include <kscreen/output.h>
-#include <kscreen/edid.h>
-#include <kscreen/configmonitor.h>
+#include <libkscreen/src/config.h>
+#include <libkscreen/src/output.h>
+#include <libkscreen/src/edid.h>
+#include <libkscreen/src/configmonitor.h>
 
 bool leftPos(KScreen::Output* output1, KScreen::Output* output2) {
     return (output1->pos().x() < output2->pos().x());

diff --git a/kscreen/tests/testgenerator.cpp b/kscreen/tests/testgenerator.cpp
index 8ed8263..eaa6b51 100644 (file)
--- a/kscreen/tests/testgenerator.cpp
+++ b/kscreen/tests/testgenerator.cpp
@@ -21,7 +21,7 @@
 #include <QtTest>
 #include <QtCore/QObject>
 
-#include <kscreen/config.h>
+#include <libkscreen/src/config.h>
 
 using namespace KScreen;
 

diff --git a/libkscreen/CMakeLists.txt b/libkscreen/CMakeLists.txt
index 9910cad..e80277f 100644 (file)
--- a/libkscreen/CMakeLists.txt
+++ b/libkscreen/CMakeLists.txt
@@ -11,7 +11,7 @@ if(POLICY CMP0017)
   cmake_policy(SET CMP0017 NEW)
 endif()
 
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
 enable_testing()
 find_package(Qt4 REQUIRED)
 find_package(KDE4 REQUIRED)
@@ -59,7 +59,7 @@ set(INSTALL_TARGETS_DEFAULT_ARGS  RUNTIME DESTINATION "${BIN_INSTALL_DIR}"
                                   LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
                                   ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT Devel )
 
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES} ${KDE4_INCLUDES})
+include_directories(${PROJECT_SOURCE_DIR}/src ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES} ${KDE4_INCLUDES})
 
 add_subdirectory(src)
 add_subdirectory(backends)

diff --git a/libkscreen/src/CMakeLists.txt b/libkscreen/src/CMakeLists.txt
index 3c734a0..e076eb0 100644 (file)
--- a/libkscreen/src/CMakeLists.txt
+++ b/libkscreen/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES})
+include_directories(${PROJECT_SOURCE_DIR}  ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES})
 
 set(libkscreen_SRCS
     backendloader.cpp

diff --git a/okular/CMakeLists.txt b/okular/CMakeLists.txt
index 07c014f..5d08552 100644 (file)
--- a/okular/CMakeLists.txt
+++ b/okular/CMakeLists.txt
@@ -18,6 +18,7 @@ include_directories(
    ${KDE4_INCLUDES}
    ${QIMAGEBLITZ_INCLUDES}
    ${CMAKE_SOURCE_DIR}/libkscreen
+   ${CMAKE_SOURCE_DIR}
 )
 
 add_subdirectory( active )

diff --git a/okular/core/utils.cpp b/okular/core/utils.cpp
index a3558b0..1dca4e2 100644 (file)
--- a/okular/core/utils.cpp
+++ b/okular/core/utils.cpp
@@ -19,10 +19,8 @@
 
 #ifdef Q_WS_X11
   #include "config-okular.h"
-  #if HAVE_LIBKSCREEN
-   #include <kscreen/config.h>
-   #include <kscreen/edid.h>
-  #endif
+  #include <libkscreen/src/config.h>
+  #include <libkscreen/src/edid.h>
   #include <QX11Info>
 #endif
 
@@ -101,7 +99,6 @@ QSizeF Utils::realDpi(QWidget* widgetOnScreen)
     if (widgetOnScreen)
     {
         // Firstly try to retrieve DPI via LibKScreen
-#if HAVE_LIBKSCREEN
         KScreen::Config* config = KScreen::Config::current();
         if (config) {
             KScreen::OutputList outputs = config->outputs();
@@ -166,7 +163,6 @@ QSizeF Utils::realDpi(QWidget* widgetOnScreen)
         {
             kDebug() << "Didn't find a KScreen config to calculate DPI. Falling back";
         }
-#endif
     }
     // this is also fallback for LibKScreen branch if KScreen::Output
     // for particular widget was not found