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

List:       kde-commits
Subject:    [konsole] src: Use K_PLUGIN_FACTORY_WITH_JSON and remove K_EXPORT_PLUGIN
From:       Kurt Hindenburg <null () kde ! org>
Date:       2017-07-16 1:14:46
Message-ID: E1dWY90-0000ck-0o () code ! kde ! org
[Download RAW message or body]

Git commit caefa412c9da2797c2c6c375de1eb5c4f5f5ef83 by Kurt Hindenburg.
Committed on 16/07/2017 at 01:12.
Pushed by hindenburg into branch 'master'.

Use K_PLUGIN_FACTORY_WITH_JSON and remove K_EXPORT_PLUGIN

K_EXPORT_PLUGIN has been depreciated; K_PLUGIN_FACTORY() worked but
let's try to use _WITH_JSON()

M  +1    -0    src/CMakeLists.txt
M  +3    -2    src/Part.cpp

https://commits.kde.org/konsole/caefa412c9da2797c2c6c375de1eb5c4f5f5ef83

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4ab4fb4e..51a26ec8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -207,6 +207,7 @@ set(konsolepart_PART_SRCS Part.cpp
 kconfig_add_kcfg_files(konsolepart_PART_SRCS settings/KonsoleSettings.kcfg=
c)
 add_library(konsolepart MODULE ${konsolepart_PART_SRCS})
 generate_export_header(konsolepart BASE_NAME konsole)
+kcoreaddons_desktop_to_json(konsolepart ../desktop/konsolepart.desktop)
 set_target_properties(konsolepart PROPERTIES DEFINE_SYMBOL KONSOLE_PART)
 target_link_libraries(konsolepart KF5::Parts KF5::XmlGui konsoleprivate)
 install(TARGETS konsolepart  DESTINATION ${KDE_INSTALL_PLUGINDIR})
diff --git a/src/Part.cpp b/src/Part.cpp
index 0df81cb9..0a20cf7f 100644
--- a/src/Part.cpp
+++ b/src/Part.cpp
@@ -48,8 +48,9 @@
 =

 using namespace Konsole;
 =

-K_PLUGIN_FACTORY(KonsolePartFactory, registerPlugin<Konsole::Part>();)
-K_EXPORT_PLUGIN(KonsolePartFactory("konsole"))
+K_PLUGIN_FACTORY_WITH_JSON(KonsolePartFactory,
+                           "konsolepart.json",
+                           registerPlugin<Konsole::Part>();)
 =

 Part::Part(QWidget *parentWidget, QObject *parent, const QVariantList &) :
     KParts::ReadOnlyPart(parent),
[prev in list] [next in list] [prev in thread] [next in thread]