[ #10724 ] Move the dataengine to the new KDE lib

kde/plasma/CMakeLists.txt

 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
-add_subdirectory(dataengine)
 add_subdirectory(plasmoid)

kde/src/klib/CMakeLists.txt

@@ -11,6 +11,8 @@ PROJECT(ksflphone)
 
 SET ( KDE4_KABC_LIBS  -lkabc )
 
+add_subdirectory(dataengine)
+
 SET(LOCAL_CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/")
 SET(CMAKE_MODULE_PATH "${LOCAL_CMAKE_MODULE_PATH}")
 

kde/plasma/dataengine/sflphonEngine.cpp → kde/src/klib/dataengine/sflphonEngine.cpp

@@ -2,14 +2,14 @@
 
 #include <Plasma/DataContainer>
 
-#include "../../src/lib/Call.h"
-#include "../../src/lib/Account.h"
-#include "../../src/lib/AccountList.h"
-#include "../../src/lib/dbus/metatypes.h"
-#include "../../src/lib/instance_interface_singleton.h"
-#include "../../src/lib/configurationmanager_interface_singleton.h"
-#include "../../src/lib/callmanager_interface_singleton.h"
-#include "../../src/lib/sflphone_const.h"
+#include "../../lib/Call.h"
+#include "../../lib/Account.h"
+#include "../../lib/AccountList.h"
+#include "../../lib/dbus/metatypes.h"
+#include "../../lib/instance_interface_singleton.h"
+#include "../../lib/configurationmanager_interface_singleton.h"
+#include "../../lib/callmanager_interface_singleton.h"
+#include "../../lib/sflphone_const.h"
 #include "sflphoneService.h"
 
 CallModel<>* SFLPhoneEngine::m_pModel = NULL;

kde/plasma/dataengine/sflphonEngine.h → kde/src/klib/dataengine/sflphonEngine.h

@@ -25,7 +25,7 @@
 #include <Plasma/Service>
 #include <QHash>
 
-#include "../../src/lib/CallModel.h"
+#include "../../lib/CallModel.h"
 
 typedef QHash<QString,QVariant> HashStringString;
 class Call;

kde/plasma/dataengine/sflphoneService.cpp → kde/src/klib/dataengine/sflphoneService.cpp

 #include "sflphoneService.h"
 
-#include "../../src/lib/Call.h"
+#include "../../lib/Call.h"
 
 SFLPhoneService::SFLPhoneService(SFLPhoneEngine *engine)
 

kde/plasma/dataengine/sflphoneService.h → kde/src/klib/dataengine/sflphoneService.h

@@ -6,8 +6,8 @@
 #include <Plasma/Service>
 #include <Plasma/ServiceJob>
 
-#include "../../src/lib/Call.h"
-#include "../../src/lib/CallModel.h"
+#include "../../lib/Call.h"
+#include "../../lib/CallModel.h"
 
 using namespace Plasma;