aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Cullmann <cullmann@kde.org>2014-01-19 23:25:07 (GMT)
committerChristoph Cullmann <cullmann@kde.org>2014-01-19 23:25:07 (GMT)
commite1f1f80e9c7d4a9fecd98f794156fa5991c78ed5 (patch)
tree9bdcd224bbb4a822fe9dd15a3f742cd8df675b24
parentac591aefe0c24341faa02a4686fc42d65e993aef (diff)
factor part parts out ;)
-rw-r--r--src/CMakeLists.txt10
-rw-r--r--src/data/CMakeLists.txt3
-rw-r--r--src/part/CMakeLists.txt12
-rw-r--r--src/part/katepart.cpp (renamed from src/utils/katefactory.cpp)5
-rw-r--r--src/part/katepart.desktop (renamed from src/data/katepart.desktop)0
5 files changed, 16 insertions, 14 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 764b847..860bfc6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -254,11 +254,5 @@ add_subdirectory( syntax/data )
# jscripts for the part
add_subdirectory( script/data )
-# kate part itself just is core + the factory
-add_library (katepart MODULE utils/katefactory.cpp)
-
-# link the part, use kate part core + kde stuff
-target_link_libraries (katepart KF5TextEditor Qt5::Script)
-
-# install the part
-install (TARGETS katepart DESTINATION ${PLUGIN_INSTALL_DIR})
+# add part
+add_subdirectory (part) \ No newline at end of file
diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt
index aaa5fcd..cc6207b 100644
--- a/src/data/CMakeLists.txt
+++ b/src/data/CMakeLists.txt
@@ -8,6 +8,3 @@ install( FILES ktexteditor.desktop ktexteditorplugin.desktop DESTINATION ${SERV
install( FILES katepartui.rc DESTINATION ${DATA_INSTALL_DIR}/katepart )
install( FILES katemoderc kateschemarc katesyntaxhighlightingrc DESTINATION ${CONFIG_INSTALL_DIR} )
-
-kservice_desktop_to_json (katepart.desktop)
-install( FILES katepart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
diff --git a/src/part/CMakeLists.txt b/src/part/CMakeLists.txt
new file mode 100644
index 0000000..7cbded6
--- /dev/null
+++ b/src/part/CMakeLists.txt
@@ -0,0 +1,12 @@
+# service => json and install
+kservice_desktop_to_json (katepart.desktop)
+install( FILES katepart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+
+# kate part itself just is core + the factory
+add_library (katepart MODULE katepart.cpp)
+
+# link the part, use kate part core + kde stuff
+target_link_libraries (katepart KF5TextEditor)
+
+# install the part
+install (TARGETS katepart DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/utils/katefactory.cpp b/src/part/katepart.cpp
index ddc936e..f4089d3 100644
--- a/src/utils/katefactory.cpp
+++ b/src/part/katepart.cpp
@@ -18,7 +18,6 @@
* Boston, MA 02110-1301, USA.
*/
-#include "kateglobal.h"
#include "katedocument.h"
#include <KPluginFactory>
@@ -34,7 +33,7 @@ class KateFactory : public KPluginFactory
{
Q_OBJECT
- Q_PLUGIN_METADATA(IID KPluginFactory_iid FILE "data/katepart.json")
+ Q_PLUGIN_METADATA(IID KPluginFactory_iid FILE "katepart.json")
Q_INTERFACES(KPluginFactory)
@@ -81,4 +80,4 @@ public:
}
};
-#include "katefactory.moc"
+#include "katepart.moc"
diff --git a/src/data/katepart.desktop b/src/part/katepart.desktop
index 4c6578c..4c6578c 100644
--- a/src/data/katepart.desktop
+++ b/src/part/katepart.desktop