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

List:       kde-commits
Subject:    [kolor-manager/frameworks] /: port kmsettings to KF5
From:       Kai-Uwe Behrmann <ku.b () gmx ! de>
Date:       2015-05-08 20:40:05
Message-ID: E1Yqp41-0000Rh-1V () scm ! kde ! org
[Download RAW message or body]

Git commit 42d899656c730f72cb92929906400e52dcb41c19 by Kai-Uwe Behrmann.
Committed on 08/05/2015 at 20:33.
Pushed by behrmann into branch 'frameworks'.

port kmsettings to KF5

M  +1    -1    CMakeLists.txt
M  +14   -7    settings/CMakeLists.txt
M  +27   -17   settings/kmsettings.cpp

http://commits.kde.org/kolor-manager/42d899656c730f72cb92929906400e52dcb41c19

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 939de2d..fa1c87a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ SET( ${CMAKE_BUILD_TYPE} Debug)
 
 SUBDIRS( devices
          information
-         #settings
+         settings
        )
 
 
diff --git a/settings/CMakeLists.txt b/settings/CMakeLists.txt
index 79f1b02..3355282 100644
--- a/settings/CMakeLists.txt
+++ b/settings/CMakeLists.txt
@@ -1,13 +1,20 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
  
-set(kmsettings_PART_SRCS 
+SET(kmsettings_PART_SRCS 
       kmsettings.cpp
       )
 
-kde4_add_plugin(kmsettings ${kmsettings_PART_SRCS})
+ADD_LIBRARY( kmsettings MODULE ${kmsettings_PART_SRCS} )
+SET_TARGET_PROPERTIES( kminfo PROPERTIES PREFIX "${CMAKE_SHARED_LIBRARY_PREFIX}" )
+TARGET_LINK_LIBRARIES( kmsettings
+                       KF5::CoreAddons
+                       KF5::ConfigWidgets
+                       KF5::I18n
+                       ${SYNNEFO_LIBRARIES}
+                       Qt5::Core
+                       Qt5::Widgets
+                     )
 
-target_link_libraries(kmsettings ${SYNNEFO_LIBRARIES} ${KDE4_KDEUI_LIBS})
-
-install(TARGETS kmsettings DESTINATION ${PLUGIN_INSTALL_DIR})
-install( FILES kmsettings.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
+INSTALL(TARGETS kmsettings DESTINATION ${PLUGIN_INSTALL_DIR})
+INSTALL( FILES kmsettings.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
 
diff --git a/settings/kmsettings.cpp b/settings/kmsettings.cpp
index ab283f3..d26e9b3 100644
--- a/settings/kmsettings.cpp
+++ b/settings/kmsettings.cpp
@@ -28,32 +28,41 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "kmsettings.h"
 
-#include <KAboutData>
-#include <KGenericFactory>
+#include <kcmodule.h>
+#include <kaboutdata.h>
+#include <KLocalizedString>
+#include <kpluginfactory.h>
+
 
 // Code to provide KDE module functionality for Kolor Management.
 K_PLUGIN_FACTORY( kmsettingsFactory,
          registerPlugin<kmsettings>();
          )
-K_EXPORT_PLUGIN( kmsettingsFactory("kmsettings") )
 
 
 // Register the panel and initialise fro Oyranos.
-kmsettings::kmsettings(QWidget *parent, const QVariantList &) :
-    KCModule( kmsettingsFactory::componentData(), parent)
+kmsettings::kmsettings(QWidget *parent, const QVariantList &args ) :
+    KCModule( parent, args )
 {
-
-   KAboutData* about = new KAboutData(
-        "kmsettings", 0, ki18n("KMSettings"), 0, KLocalizedString(),
-        KAboutData::License_BSD,
-        ki18n("(c) 2008 Joseph Simon III")
-    );
-    about->addAuthor( ki18n("2008-2009 Joseph Simon III"), KLocalizedString(),
-                     "j.simon.iii@astound.net" );
-    about->addAuthor( ki18n("2010-2014 Kai-Uwe Behrmann"), KLocalizedString(),
-                      "ku.b@gmx.de"  );
-
-    setAboutData( about );
+    KAboutData about("kmsettings", i18n("KMSettings"), "1.0.2",
+                   i18n("KDE version of Synnefo"),
+                   KAboutLicense::BSDL,
+                   i18n("(c) 2008 Joseph Simon III"));
+
+    about.addAuthor(i18n("Joseph Simon III"), i18n("developer"), "j.simon.iii@astound.net", 0);
+    about.addAuthor(i18n("Kai-Uwe Behrmann"), i18n("developer"), "ku.b@gmx.de", 0);
+    about.addAuthor(i18n("Jan Gruhlich"), i18n("developer"), "jgrulich@redhat.com", 0);
+
+    about.addAuthor(i18n("Albert Astals Cid"), i18n("developer"), "tsdgeos@terra.es", 0);
+    about.addAuthor(i18n("Christoph Feck"), i18n("developer"), "christoph@maxiom.de", 0);
+    about.addAuthor(i18n("Boudewijn Rempt "), i18n("developer"), "boud@valdyas.org", 0);
+    about.addAuthor(i18n("Pino Toscano"), i18n("developer"), "pino@kde.org", 0);
+    about.addAuthor(i18n("Laurent Montel"), i18n("developer"), "montel@kde.org", 0);
+    about.addAuthor(i18n("Cyrille Berger Skott"), i18n("developer"), "cberger@cberger.net", 0);
+    about.addAuthor(i18n("Hal Van Engel"), i18n("developer"), "hvengel@gmail.com", 0);
+
+    QList<KAboutPerson> people = about.authors();
+    about.addCredit(people[0].name(), people[0].task());
 
     oyMessageFuncSet( oyGuiMessageFunc );
 
@@ -70,3 +79,4 @@ kmsettings::~kmsettings()
     delete module;
 }
 
+#include "kmsettings.moc"

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