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

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

Git commit 1497b8ef2d68b8fcb679482292d0c42fd1391b63 by Kai-Uwe Behrmann.
Committed on 08/05/2015 at 20:25.
Pushed by behrmann into branch 'frameworks'.

port kminfo to KF5

not much different than kmdevice

M  +1    -1    CMakeLists.txt
M  +12   -6    information/CMakeLists.txt
M  +26   -16   information/kminfo.cpp

http://commits.kde.org/kolor-manager/1497b8ef2d68b8fcb679482292d0c42fd1391b63

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d93b96a..939de2d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@ LINK_DIRECTORIES(
 SET( ${CMAKE_BUILD_TYPE} Debug)
 
 SUBDIRS( devices
-         #information
+         information
          #settings
        )
 
diff --git a/information/CMakeLists.txt b/information/CMakeLists.txt
index f9f25ae..054e713 100644
--- a/information/CMakeLists.txt
+++ b/information/CMakeLists.txt
@@ -5,12 +5,18 @@ set(kmdevices_RCCS
       icons.qrc
       )
 
-QT4_ADD_RESOURCES(kminfo_RCC_SRCS ${kmdevices_RCCS})
+ADD_LIBRARY( kminfo MODULE ${kminfo_PART_SRCS} ${kminfo_RCC_SRCS} )
+SET_TARGET_PROPERTIES( kminfo PROPERTIES PREFIX "${CMAKE_SHARED_LIBRARY_PREFIX}" )
+TARGET_LINK_LIBRARIES( kminfo
+                       KF5::CoreAddons
+                       KF5::ConfigWidgets
+                       KF5::I18n
+                       ${SYNNEFO_LIBRARIES}
+                       Qt5::Core
+                       Qt5::Widgets
+                     )
 
-kde4_add_plugin(kminfo ${kminfo_PART_SRCS} ${kminfo_RCC_SRCS})
 
-target_link_libraries(kminfo ${SYNNEFO_LIBRARIES} ${KDE4_KDEUI_LIBS})
-
-install(TARGETS kminfo DESTINATION ${PLUGIN_INSTALL_DIR})
-install( FILES kminfo.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
+INSTALL( TARGETS kminfo DESTINATION ${PLUGIN_INSTALL_DIR} )
+INSTALL( FILES kminfo.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
 
diff --git a/information/kminfo.cpp b/information/kminfo.cpp
index b16a97c..3f89fcf 100644
--- a/information/kminfo.cpp
+++ b/information/kminfo.cpp
@@ -28,8 +28,10 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "kminfo.h"
 
-#include <KAboutData>
-#include <KGenericFactory>
+#include <kcmodule.h>
+#include <kaboutdata.h>
+#include <KLocalizedString>
+#include <kpluginfactory.h>
 
 #include <oyranos.h>
 #include <sy_info.h>
@@ -39,23 +41,30 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 K_PLUGIN_FACTORY( kminfoFactory,
          registerPlugin<kminfo>();
          )
-K_EXPORT_PLUGIN( kminfoFactory("kminfo") )
 
 
-kminfo::kminfo(QWidget *parent, const QVariantList &) :
-    KCModule( kminfoFactory::componentData(), parent)
+kminfo::kminfo(QWidget *parent, const QVariantList &args ) :
+    KCModule( parent, args )
 {
-       KAboutData* about = new KAboutData(
-        "kminfo", 0, ki18n("KMInfo"), 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("kminfo", i18n("KMInfo"), "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 );
 
@@ -73,3 +82,4 @@ kminfo::~kminfo()
     delete module;
 }
 
+#include "kminfo.moc"

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