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

List:       kde-commits
Subject:    [calligra/frameworks] stage/part: Port Stage part to to KoJsonTrader
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2015-03-31 19:03:56
Message-ID: E1Yd1S8-00040h-TN () scm ! kde ! org
[Download RAW message or body]

Git commit fbc73b26ec687669aa54d8fc13cda15582eab9d5 by Friedrich W. H. Kossebau.
Committed on 31/03/2015 at 18:59.
Pushed by kossebau into branch 'frameworks'.

Port Stage part to to KoJsonTrader

M  +1    -4    stage/part/CMakeLists.txt
M  +2    -3    stage/part/KPrFactoryInit.cpp
A  +36   -0    stage/part/KPrFactoryInit.h     [License: LGPL (v2+)]

http://commits.kde.org/calligra/fbc73b26ec687669aa54d8fc13cda15582eab9d5

diff --git a/stage/part/CMakeLists.txt b/stage/part/CMakeLists.txt
index e6800b6..ee3e611 100644
--- a/stage/part/CMakeLists.txt
+++ b/stage/part/CMakeLists.txt
@@ -165,15 +165,12 @@ set(calligrastagepart_PART_SRCS KPrFactoryInit.cpp )
 
 add_library(calligrastagepart MODULE ${calligrastagepart_PART_SRCS})
 
-
+kcoreaddons_desktop_to_json(calligrastagepart stagepart.desktop)
 
 target_link_libraries(calligrastagepart calligrastageprivate )
 
 install(TARGETS calligrastagepart DESTINATION ${PLUGIN_INSTALL_DIR})
 
-### desktop files ###
-install( FILES stagepart.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
-
 ### GUI files ###
 install( FILES stage.rc stage_readonly.rc DESTINATION ${DATA_INSTALL_DIR}/stage)
 
diff --git a/stage/part/KPrFactoryInit.cpp b/stage/part/KPrFactoryInit.cpp
index 78aff61..e9628d9 100644
--- a/stage/part/KPrFactoryInit.cpp
+++ b/stage/part/KPrFactoryInit.cpp
@@ -18,7 +18,6 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "KPrFactory.h"
-
-K_EXPORT_PLUGIN(KPrFactory )
+#include "KPrFactoryInit.h"
+#include "moc_KPrFactoryInit.cpp"
 
diff --git a/stage/part/KPrFactoryInit.h b/stage/part/KPrFactoryInit.h
new file mode 100644
index 0000000..365b317
--- /dev/null
+++ b/stage/part/KPrFactoryInit.h
@@ -0,0 +1,36 @@
+/* This file is part of the KDE project
+ * Copyright (C) 2013 Boudewijn Rempt <boud@valdyas.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifndef KPRFACTORYINIT_H
+#define KPRFACTORYINIT_H
+
+#include <KPrFactory.h>
+
+class KPrFactoryInit : public KPrFactory
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID KPluginFactory_iid FILE "stagepart.json")
+    Q_INTERFACES(KPluginFactory)
+
+public:
+    explicit KPrFactoryInit(QObject *parent = 0) : KPrFactory(parent) {}
+    virtual ~KPrFactoryInit() {}
+
+};
+
+#endif

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