[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdeplasma-addons/frameworks] /: Port Konsole Profiles DataEngine
From:       Bhushan Shah <bhush94 () gmail ! com>
Date:       2013-12-25 16:28:19
Message-ID: E1VvrJj-0004Hc-SS () scm ! kde ! org
[Download RAW message or body]

Git commit 76fcbd0a8e2cba7232f4e6ffe82dff4300d9c8e5 by Bhushan Shah.
Committed on 25/12/2013 at 21:57.
Pushed by bshah into branch 'frameworks'.

Port Konsole Profiles DataEngine

M  +1    -1    CMakeLists.txt
M  +15   -15   dataengines/CMakeLists.txt
M  +10   -3    dataengines/konsoleprofiles/CMakeLists.txt
M  +7    -5    dataengines/konsoleprofiles/konsoleprofilesengine.cpp
M  +2    -2    dataengines/konsoleprofiles/konsoleprofilesservice.cpp

http://commits.kde.org/kdeplasma-addons/76fcbd0a8e2cba7232f4e6ffe82dff4300d9c8e5

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c17d704..3b87f69 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -137,7 +137,7 @@ feature_summary(WHAT ALL   FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
 # add_subdirectory(libs)
 add_subdirectory(applets)
-# add_subdirectory(dataengines)
+add_subdirectory(dataengines)
 # add_subdirectory(runners)
 #
 # add_subdirectory(scriptengines)
diff --git a/dataengines/CMakeLists.txt b/dataengines/CMakeLists.txt
index 15c1aab..9934051 100644
--- a/dataengines/CMakeLists.txt
+++ b/dataengines/CMakeLists.txt
@@ -1,16 +1,16 @@
-add_subdirectory(comic)
-
-if (QCA2_FOUND AND QJSON_FOUND AND QTOAUTH_FOUND)
-      add_subdirectory(microblog)
-endif(QCA2_FOUND AND QJSON_FOUND AND QTOAUTH_FOUND)
-
-if(LIBATTICA_FOUND)
-  add_subdirectory(ocs)
-endif(LIBATTICA_FOUND)
-
-add_subdirectory(potd)
-add_subdirectory(rememberthemilk)
-add_subdirectory(kdeobservatory)
-add_subdirectory(kimpanel)
+# add_subdirectory(comic)
+# 
+# if (QCA2_FOUND AND QJSON_FOUND AND QTOAUTH_FOUND)
+#       add_subdirectory(microblog)
+# endif(QCA2_FOUND AND QJSON_FOUND AND QTOAUTH_FOUND)
+# 
+# if(LIBATTICA_FOUND)
+#   add_subdirectory(ocs)
+# endif(LIBATTICA_FOUND)
+# 
+# add_subdirectory(potd)
+# add_subdirectory(rememberthemilk)
+# add_subdirectory(kdeobservatory)
+# add_subdirectory(kimpanel)
 add_subdirectory(konsoleprofiles)
-add_subdirectory(konqprofiles)
+# add_subdirectory(konqprofiles)
diff --git a/dataengines/konsoleprofiles/CMakeLists.txt \
b/dataengines/konsoleprofiles/CMakeLists.txt index 2e2dd21..e2c9a71 100644
--- a/dataengines/konsoleprofiles/CMakeLists.txt
+++ b/dataengines/konsoleprofiles/CMakeLists.txt
@@ -3,10 +3,17 @@ set(konsoleprofilesengine_SRCS
     konsoleprofilesservice.cpp
 )
 
-kde4_add_plugin(plasma_engine_konsoleprofiles ${konsoleprofilesengine_SRCS})
-target_link_libraries(plasma_engine_konsoleprofiles ${KDE4_PLASMA_LIBS} \
${KDE4_KIO_LIBS}) +kservice_desktop_to_json(plasma-dataengine-konsoleprofiles.desktop)
  
-install(TARGETS plasma_engine_konsoleprofiles DESTINATION ${PLUGIN_INSTALL_DIR})
+add_library(plasma_engine_konsoleprofiles ${konsoleprofilesengine_SRCS})
+target_link_libraries(plasma_engine_konsoleprofiles
+    KF5::Plasma
+    KF5::Service
+    KF5::KIOCore
+    KF5::KDE4Support
+)
+
+install(TARGETS plasma_engine_konsoleprofiles DESTINATION \
${PLUGIN_INSTALL_DIR}/plasma/dataengine)  install(FILES \
plasma-dataengine-konsoleprofiles.desktop DESTINATION ${SERVICES_INSTALL_DIR} )  \
install(FILES org.kde.plasma.dataengine.konsoleprofiles.operations DESTINATION \
${DATA_INSTALL_DIR}/plasma/services)  
diff --git a/dataengines/konsoleprofiles/konsoleprofilesengine.cpp \
b/dataengines/konsoleprofiles/konsoleprofilesengine.cpp index 12e48b7..f79ac87 100644
--- a/dataengines/konsoleprofiles/konsoleprofilesengine.cpp
+++ b/dataengines/konsoleprofiles/konsoleprofilesengine.cpp
@@ -19,18 +19,20 @@
 #include "konsoleprofilesengine.h"
 #include "konsoleprofilesservice.h"
 
+#include <QDebug>
+
 #include <KStandardDirs>
 #include <KDirWatch>
 #include <QFileInfo>
 #include <kio/global.h>
+#include <KGlobal>
 #include <KGlobalSettings>
-#include <KDebug>
 
 KonsoleProfilesEngine::KonsoleProfilesEngine(QObject *parent, const QVariantList \
&args)  : Plasma::DataEngine(parent, args),
       m_dirWatch(0)
 {
-
+    init();
 }
 
 KonsoleProfilesEngine::~KonsoleProfilesEngine()
@@ -39,7 +41,7 @@ KonsoleProfilesEngine::~KonsoleProfilesEngine()
 
 void KonsoleProfilesEngine::init()
 {
-    kDebug() << "KonsoleProfilesDataEngine init";
+    qDebug() << "KonsoleProfilesDataEngine init";
 
     m_dirWatch = new KDirWatch( this );
     loadProfiles();
@@ -84,12 +86,12 @@ void KonsoleProfilesEngine::loadProfiles()
             }
 
             QString sourceName = "name:" + profileName;
-            kDebug() << "adding sourcename: " << profileName << " ++" << niceName;
+            qDebug() << "adding sourcename: " << profileName << " ++" << niceName;
             setData(profileName, "prettyName", niceName);
         }
     }
 }
 
-K_EXPORT_PLASMA_DATAENGINE(konsoleprofilesengine, KonsoleProfilesEngine)
+K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(konsoleprofilesengine, KonsoleProfilesEngine, \
"plasma-dataengine-konsoleprofiles.json")  
 #include "konsoleprofilesengine.moc"
diff --git a/dataengines/konsoleprofiles/konsoleprofilesservice.cpp \
b/dataengines/konsoleprofiles/konsoleprofilesservice.cpp index 20119a0..2b2754b \
                100644
--- a/dataengines/konsoleprofiles/konsoleprofilesservice.cpp
+++ b/dataengines/konsoleprofiles/konsoleprofilesservice.cpp
@@ -20,7 +20,7 @@
 
 #include <QtCore/QMap>
 #include <KToolInvocation>
-#include <KDebug>
+#include <QDebug>
 
 KonsoleProfilesService::KonsoleProfilesService(QObject* parent, const QString& \
profileName)  : Plasma::Service(parent)
@@ -45,7 +45,7 @@ void ProfileJob::start()
  //   QMap<QString, QVariant>jobParameters = parameters();
     const QString operation = operationName();
 
-kDebug() << "SERVICE START...operation: " << operation << " dest: " << \
destination(); +qDebug() << "SERVICE START...operation: " << operation << " dest: " \
<< destination();  if (operation == "open") {
   //      Q_ASSERT(!jobParameters.isEmpty());
 


[prev in list] [next in list] [prev in thread] [next in thread]