summaryrefslogtreecommitdiffstats
path: root/katapult/plugins
diff options
context:
space:
mode:
authorgregory guy <g-gregory@gmx.fr>2019-02-14 15:44:24 +0100
committergregory guy <g-gregory@gmx.fr>2019-02-14 15:44:24 +0100
commit7a10077e8260148faa37d5a91e76135e1341e4c1 (patch)
tree6bfabbcd9017c63c91a5ee7e2434e917906b3f55 /katapult/plugins
parentd165ef2d365fc582b966fbcb0bbac5223c7b02cc (diff)
downloadkatapult-7a10077e8260148faa37d5a91e76135e1341e4c1.zip
katapult-7a10077e8260148faa37d5a91e76135e1341e4c1.tar.gz
conversion to the cmake building system
Signed-off-by: gregory guy <g-gregory@gmx.fr>
Diffstat (limited to 'katapult/plugins')
-rw-r--r--katapult/plugins/CMakeLists.txt2
-rw-r--r--katapult/plugins/catalogs/CMakeLists.txt8
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/CMakeLists.txt41
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/actionplaysong.h2
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp2
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/song.cpp2
-rw-r--r--katapult/plugins/catalogs/bookmarkcatalog/CMakeLists.txt41
-rw-r--r--katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h2
-rw-r--r--katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.h2
-rw-r--r--katapult/plugins/catalogs/calculatorcatalog/CMakeLists.txt46
-rw-r--r--katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.h2
-rw-r--r--katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h2
-rw-r--r--katapult/plugins/catalogs/documentcatalog/CMakeLists.txt41
-rw-r--r--katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp4
-rw-r--r--katapult/plugins/catalogs/documentcatalog/documentcatalog.h2
-rw-r--r--katapult/plugins/catalogs/execcatalog/CMakeLists.txt45
-rw-r--r--katapult/plugins/catalogs/execcatalog/actionrun.cpp2
-rw-r--r--katapult/plugins/catalogs/execcatalog/actionrun.h2
-rw-r--r--katapult/plugins/catalogs/execcatalog/execcatalog.cpp4
-rw-r--r--katapult/plugins/catalogs/execcatalog/execcatalog.h2
-rw-r--r--katapult/plugins/catalogs/googlecatalog/CMakeLists.txt45
-rw-r--r--katapult/plugins/catalogs/googlecatalog/actionsearch.cpp2
-rw-r--r--katapult/plugins/catalogs/googlecatalog/actionsearch.h2
-rw-r--r--katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp4
-rw-r--r--katapult/plugins/catalogs/googlecatalog/googlecatalog.h2
-rw-r--r--katapult/plugins/catalogs/programcatalog/CMakeLists.txt40
-rw-r--r--katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp2
-rw-r--r--katapult/plugins/catalogs/programcatalog/actionrunprogram.h2
-rw-r--r--katapult/plugins/catalogs/programcatalog/programcatalog.cpp2
-rw-r--r--katapult/plugins/catalogs/programcatalog/programcatalog.h2
-rw-r--r--katapult/plugins/catalogs/spellcatalog/CMakeLists.txt45
-rw-r--r--katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp2
-rw-r--r--katapult/plugins/catalogs/spellcatalog/actioncopyspelling.h2
-rw-r--r--katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp4
-rw-r--r--katapult/plugins/catalogs/spellcatalog/spellcatalog.h2
-rw-r--r--katapult/plugins/display/CMakeLists.txt3
-rw-r--r--katapult/plugins/display/glassdisplay/CMakeLists.txt36
-rw-r--r--katapult/plugins/display/o2display/CMakeLists.txt36
-rw-r--r--katapult/plugins/display/puredisplay/CMakeLists.txt36
39 files changed, 495 insertions, 28 deletions
diff --git a/katapult/plugins/CMakeLists.txt b/katapult/plugins/CMakeLists.txt
new file mode 100644
index 0000000..e6890dd
--- /dev/null
+++ b/katapult/plugins/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory( catalogs )
+add_subdirectory( display )
diff --git a/katapult/plugins/catalogs/CMakeLists.txt b/katapult/plugins/catalogs/CMakeLists.txt
new file mode 100644
index 0000000..0081c28
--- /dev/null
+++ b/katapult/plugins/catalogs/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_subdirectory( programcatalog )
+add_subdirectory( bookmarkcatalog )
+add_subdirectory( documentcatalog )
+add_subdirectory( calculatorcatalog )
+add_subdirectory( amarokcatalog )
+add_subdirectory( spellcatalog )
+add_subdirectory( googlecatalog )
+add_subdirectory( execcatalog )
diff --git a/katapult/plugins/catalogs/amarokcatalog/CMakeLists.txt b/katapult/plugins/catalogs/amarokcatalog/CMakeLists.txt
new file mode 100644
index 0000000..88333aa
--- /dev/null
+++ b/katapult/plugins/catalogs/amarokcatalog/CMakeLists.txt
@@ -0,0 +1,41 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/common
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### katapult_amarokcatalog (kpart)
+
+tde_add_kpart( katapult_amarokcatalog AUTOMOC
+
+ SOURCES
+ settings.ui
+ amarokcatalog.cpp
+ coverimage.cpp
+ song.cpp
+ actionplaysong.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+ ${PROJECT_NAME}-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+ FILES katapult_amarokcatalog.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/katapult/plugins/catalogs/amarokcatalog/actionplaysong.h b/katapult/plugins/catalogs/amarokcatalog/actionplaysong.h
index 255d1b1..e7efffd 100644
--- a/katapult/plugins/catalogs/amarokcatalog/actionplaysong.h
+++ b/katapult/plugins/catalogs/amarokcatalog/actionplaysong.h
@@ -21,7 +21,7 @@
#ifndef ACTIONPLAYSONG_H
#define ACTIONPLAYSONG_H
-#include "katapultaction.h"
+#include <katapultaction.h>
class KatapultItem;
class TQPixmap;
diff --git a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp
index ed4d4dd..071a265 100644
--- a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp
+++ b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp
@@ -340,3 +340,5 @@ void AmarokCatalog::writeSettings(TDEConfigBase *config)
{
config->writeEntry("MinQueryLen", _minQueryLen);
}
+
+#include "amarokcatalog.moc"
diff --git a/katapult/plugins/catalogs/amarokcatalog/song.cpp b/katapult/plugins/catalogs/amarokcatalog/song.cpp
index cd461ab..f53fdbb 100644
--- a/katapult/plugins/catalogs/amarokcatalog/song.cpp
+++ b/katapult/plugins/catalogs/amarokcatalog/song.cpp
@@ -24,7 +24,7 @@
#include <tqpixmap.h>
#include <tqimage.h>
#include <tqstring.h>
-#include <amarokcatalog.h>
+#include "amarokcatalog.h"
#include "song.h"
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/CMakeLists.txt b/katapult/plugins/catalogs/bookmarkcatalog/CMakeLists.txt
new file mode 100644
index 0000000..125473d
--- /dev/null
+++ b/katapult/plugins/catalogs/bookmarkcatalog/CMakeLists.txt
@@ -0,0 +1,41 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/common
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### katapult_bookmarkcatalog (kpart) ##########
+
+tde_add_kpart( katapult_bookmarkcatalog AUTOMOC
+
+ SOURCES
+ settings.ui
+ bookmarkcatalog.cpp
+ bookmark.cpp
+ actionopenbookmark.cpp
+ mozillabookmark.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+ ${PROJECT_NAME}-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+ FILES katapult_bookmarkcatalog.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h
index 7381e86..05739f4 100644
--- a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h
+++ b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h
@@ -24,7 +24,7 @@
#include <tqptrlist.h>
-#include "cachedcatalog.h"
+#include <cachedcatalog.h>
class TQWidget;
class TQString;
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.h b/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.h
index 1b4a735..23876d4 100644
--- a/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.h
+++ b/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.h
@@ -22,7 +22,7 @@
#include <tqpixmap.h>
-#include "katapultitem.h"
+#include <katapultitem.h>
/**
@author Joe Ferris
diff --git a/katapult/plugins/catalogs/calculatorcatalog/CMakeLists.txt b/katapult/plugins/catalogs/calculatorcatalog/CMakeLists.txt
new file mode 100644
index 0000000..d0111ca
--- /dev/null
+++ b/katapult/plugins/catalogs/calculatorcatalog/CMakeLists.txt
@@ -0,0 +1,46 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/common
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### katapult_calculatorcatalog (kpart)
+
+tde_add_kpart( katapult_calculatorcatalog AUTOMOC
+
+ SOURCES
+ settings.ui
+ calculatorcatalog.cpp
+ expression.cpp
+ actionevalexpr.cpp
+ parser.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+ ${PROJECT_NAME}-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### icons
+
+tde_install_icons( xcalc checkmark no )
+
+
+##### other data
+
+install(
+ FILES katapult_calculatorcatalog.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.h b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.h
index f04e65b..3e1ac3d 100644
--- a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.h
+++ b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.h
@@ -23,7 +23,7 @@
#ifndef ACTIONEVALEXPR_H
#define ACTIONEVALEXPR_H
-#include "katapultaction.h"
+#include <katapultaction.h>
class KatapultItem;
class Expression;
diff --git a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h
index 39e7b57..6e951a2 100644
--- a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h
+++ b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.h
@@ -31,7 +31,7 @@
#include <tqvaluevector.h>
#include "expression.h"
-#include "katapultcatalog.h"
+#include <katapultcatalog.h>
class TQWidget;
diff --git a/katapult/plugins/catalogs/documentcatalog/CMakeLists.txt b/katapult/plugins/catalogs/documentcatalog/CMakeLists.txt
new file mode 100644
index 0000000..7687e03
--- /dev/null
+++ b/katapult/plugins/catalogs/documentcatalog/CMakeLists.txt
@@ -0,0 +1,41 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/common
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### katapult_documentcatalog (kpart)
+
+tde_add_kpart( katapult_documentcatalog AUTOMOC
+
+ SOURCES
+ settings.ui
+ documentcatalog.cpp
+ directory.cpp
+ document.cpp
+ actionopendocument.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+ ${PROJECT_NAME}-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+ FILES katapult_documentcatalog.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp b/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp
index a0a2833..b8a45aa 100644
--- a/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp
+++ b/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp
@@ -33,8 +33,8 @@
#include "documentcatalog.h"
#include "document.h"
#include "directory.h"
-#include "status.h"
-#include "match.h"
+#include <status.h>
+#include <match.h>
#include "actionopendocument.h"
K_EXPORT_COMPONENT_FACTORY( katapult_documentcatalog,
diff --git a/katapult/plugins/catalogs/documentcatalog/documentcatalog.h b/katapult/plugins/catalogs/documentcatalog/documentcatalog.h
index d406370..20133a6 100644
--- a/katapult/plugins/catalogs/documentcatalog/documentcatalog.h
+++ b/katapult/plugins/catalogs/documentcatalog/documentcatalog.h
@@ -27,7 +27,7 @@
#include <tqptrlist.h>
#include <tqdir.h>
-#include "katapultcatalog.h"
+#include <katapultcatalog.h>
class TQWidget;
class Document;
diff --git a/katapult/plugins/catalogs/execcatalog/CMakeLists.txt b/katapult/plugins/catalogs/execcatalog/CMakeLists.txt
new file mode 100644
index 0000000..b35b345
--- /dev/null
+++ b/katapult/plugins/catalogs/execcatalog/CMakeLists.txt
@@ -0,0 +1,45 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/common
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### katapult_execcatalog (kpart)
+
+tde_add_kpart( katapult_execcatalog AUTOMOC
+
+ SOURCES
+ settings.ui
+ execcatalog.cpp
+ command.cpp
+ actionrun.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+ ${PROJECT_NAME}-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### icons
+
+tde_install_icons( )
+
+
+##### other data
+
+install(
+ FILES katapult_execcatalog.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/katapult/plugins/catalogs/execcatalog/actionrun.cpp b/katapult/plugins/catalogs/execcatalog/actionrun.cpp
index 0254d6f..ef99b85 100644
--- a/katapult/plugins/catalogs/execcatalog/actionrun.cpp
+++ b/katapult/plugins/catalogs/execcatalog/actionrun.cpp
@@ -32,7 +32,7 @@
#include "execcatalog.h"
#include "command.h"
-#include "katapultitem.h"
+#include <katapultitem.h>
#include "actionrun.h"
ActionRun::ActionRun()
diff --git a/katapult/plugins/catalogs/execcatalog/actionrun.h b/katapult/plugins/catalogs/execcatalog/actionrun.h
index 2e13996..c1e4b8e 100644
--- a/katapult/plugins/catalogs/execcatalog/actionrun.h
+++ b/katapult/plugins/catalogs/execcatalog/actionrun.h
@@ -26,7 +26,7 @@
#ifndef ACTIONRUN_H
#define ACTIONRUN_H
-#include "katapultaction.h"
+#include <katapultaction.h>
class KatapultItem;
class Command;
diff --git a/katapult/plugins/catalogs/execcatalog/execcatalog.cpp b/katapult/plugins/catalogs/execcatalog/execcatalog.cpp
index b08527d..05cab17 100644
--- a/katapult/plugins/catalogs/execcatalog/execcatalog.cpp
+++ b/katapult/plugins/catalogs/execcatalog/execcatalog.cpp
@@ -34,9 +34,9 @@
#include "settings.h"
#include "execcatalog.h"
-#include "actionregistry.h"
+#include <actionregistry.h>
#include "actionrun.h"
-#include "status.h"
+#include <status.h>
K_EXPORT_COMPONENT_FACTORY( katapult_execcatalog,
KGenericFactory<ExecCatalog>( "katapult_execcatalog" ) )
diff --git a/katapult/plugins/catalogs/execcatalog/execcatalog.h b/katapult/plugins/catalogs/execcatalog/execcatalog.h
index 5c5c5f3..4049a83 100644
--- a/katapult/plugins/catalogs/execcatalog/execcatalog.h
+++ b/katapult/plugins/catalogs/execcatalog/execcatalog.h
@@ -34,7 +34,7 @@
#include <tqstring.h>
#include "command.h"
-#include "katapultcatalog.h"
+#include <katapultcatalog.h>
class TQWidget;
diff --git a/katapult/plugins/catalogs/googlecatalog/CMakeLists.txt b/katapult/plugins/catalogs/googlecatalog/CMakeLists.txt
new file mode 100644
index 0000000..32c5bb5
--- /dev/null
+++ b/katapult/plugins/catalogs/googlecatalog/CMakeLists.txt
@@ -0,0 +1,45 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/common
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### katapult_googlecatalog (kpart)
+
+tde_add_kpart( katapult_googlecatalog AUTOMOC
+
+ SOURCES
+ settings.ui
+ googlecatalog.cpp
+ query.cpp
+ actionsearch.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+ ${PROJECT_NAME}-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### icons
+
+tde_install_icons( )
+
+
+##### other data
+
+install(
+ FILES katapult_googlecatalog.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/katapult/plugins/catalogs/googlecatalog/actionsearch.cpp b/katapult/plugins/catalogs/googlecatalog/actionsearch.cpp
index 31c4a64..b69bc3f 100644
--- a/katapult/plugins/catalogs/googlecatalog/actionsearch.cpp
+++ b/katapult/plugins/catalogs/googlecatalog/actionsearch.cpp
@@ -33,7 +33,7 @@
#include "googlecatalog.h"
#include "query.h"
-#include "katapultitem.h"
+#include <katapultitem.h>
#include "actionsearch.h"
ActionSearch::ActionSearch()
diff --git a/katapult/plugins/catalogs/googlecatalog/actionsearch.h b/katapult/plugins/catalogs/googlecatalog/actionsearch.h
index f3a4382..0f25b6b 100644
--- a/katapult/plugins/catalogs/googlecatalog/actionsearch.h
+++ b/katapult/plugins/catalogs/googlecatalog/actionsearch.h
@@ -26,7 +26,7 @@
#ifndef ACTIONSEARCH_H
#define ACTIONSEARCH_H
-#include "katapultaction.h"
+#include <katapultaction.h>
class KatapultItem;
class SearchQuery;
diff --git a/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp b/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp
index d696a42..8346b1a 100644
--- a/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp
+++ b/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp
@@ -34,9 +34,9 @@
#include "settings.h"
#include "googlecatalog.h"
-#include "actionregistry.h"
+#include <actionregistry.h>
#include "actionsearch.h"
-#include "status.h"
+#include <status.h>
K_EXPORT_COMPONENT_FACTORY( katapult_googlecatalog,
KGenericFactory<GoogleCatalog>( "katapult_googlecatalog" ) )
diff --git a/katapult/plugins/catalogs/googlecatalog/googlecatalog.h b/katapult/plugins/catalogs/googlecatalog/googlecatalog.h
index 29f3bd6..bd5562c 100644
--- a/katapult/plugins/catalogs/googlecatalog/googlecatalog.h
+++ b/katapult/plugins/catalogs/googlecatalog/googlecatalog.h
@@ -34,7 +34,7 @@
#include <tqstring.h>
#include "query.h"
-#include "katapultcatalog.h"
+#include <katapultcatalog.h>
class TQWidget;
diff --git a/katapult/plugins/catalogs/programcatalog/CMakeLists.txt b/katapult/plugins/catalogs/programcatalog/CMakeLists.txt
new file mode 100644
index 0000000..3addcd3
--- /dev/null
+++ b/katapult/plugins/catalogs/programcatalog/CMakeLists.txt
@@ -0,0 +1,40 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/common
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### katapult_programcatalog (kpart)
+
+tde_add_kpart( katapult_programcatalog AUTOMOC
+
+ SOURCES
+ settings.ui
+ programcatalog.cpp
+ program.cpp
+ actionrunprogram.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+ ${PROJECT_NAME}-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+ FILES katapult_programcatalog.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp b/katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp
index 98b7a9b..b5c080d 100644
--- a/katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp
+++ b/katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp
@@ -25,7 +25,7 @@
#include <tdelocale.h>
#include "program.h"
-#include "katapultitem.h"
+#include <katapultitem.h>
#include "actionrunprogram.h"
ActionRunProgram::ActionRunProgram()
diff --git a/katapult/plugins/catalogs/programcatalog/actionrunprogram.h b/katapult/plugins/catalogs/programcatalog/actionrunprogram.h
index f182afa..217821d 100644
--- a/katapult/plugins/catalogs/programcatalog/actionrunprogram.h
+++ b/katapult/plugins/catalogs/programcatalog/actionrunprogram.h
@@ -20,7 +20,7 @@
#ifndef ACTIONRUNPROGRAM_H
#define ACTIONRUNPROGRAM_H
-#include "katapultaction.h"
+#include <katapultaction.h>
class KatapultItem;
diff --git a/katapult/plugins/catalogs/programcatalog/programcatalog.cpp b/katapult/plugins/catalogs/programcatalog/programcatalog.cpp
index e9096e6..bd7f581 100644
--- a/katapult/plugins/catalogs/programcatalog/programcatalog.cpp
+++ b/katapult/plugins/catalogs/programcatalog/programcatalog.cpp
@@ -30,7 +30,7 @@
#include "settings.h"
#include "programcatalog.h"
#include "program.h"
-#include "actionregistry.h"
+#include <actionregistry.h>
#include "actionrunprogram.h"
K_EXPORT_COMPONENT_FACTORY( katapult_programcatalog,
diff --git a/katapult/plugins/catalogs/programcatalog/programcatalog.h b/katapult/plugins/catalogs/programcatalog/programcatalog.h
index af20c70..842cba6 100644
--- a/katapult/plugins/catalogs/programcatalog/programcatalog.h
+++ b/katapult/plugins/catalogs/programcatalog/programcatalog.h
@@ -25,7 +25,7 @@
#include <tqptrlist.h>
#include <tqstring.h>
-#include "cachedcatalog.h"
+#include <cachedcatalog.h>
class TQWidget;
diff --git a/katapult/plugins/catalogs/spellcatalog/CMakeLists.txt b/katapult/plugins/catalogs/spellcatalog/CMakeLists.txt
new file mode 100644
index 0000000..692fea9
--- /dev/null
+++ b/katapult/plugins/catalogs/spellcatalog/CMakeLists.txt
@@ -0,0 +1,45 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/common
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### katapult_spellcatalog (kpart)
+
+tde_add_kpart( katapult_spellcatalog AUTOMOC
+
+ SOURCES
+ settings.ui
+ spellcatalog.cpp
+ spelling.cpp
+ actioncopyspelling.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+ ${PROJECT_NAME}-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### icons
+
+tde_install_icons( )
+
+
+##### other data
+
+install(
+ FILES katapult_spellcatalog.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp b/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp
index 5b7c815..5dc5b0c 100644
--- a/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp
+++ b/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp
@@ -30,7 +30,7 @@
#include "spellcatalog.h"
#include "spelling.h"
-#include "katapultitem.h"
+#include <katapultitem.h>
#include "actioncopyspelling.h"
ActionCopySpelling::ActionCopySpelling()
diff --git a/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.h b/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.h
index 669ba49..ad35f06 100644
--- a/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.h
+++ b/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.h
@@ -23,7 +23,7 @@
#ifndef ACTIONCOPYSPELLING_H
#define ACTIONCOPYSPELLING_H
-#include "katapultaction.h"
+#include <katapultaction.h>
class KatapultItem;
class Spelling;
diff --git a/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp b/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp
index 76dde5d..941781b 100644
--- a/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp
+++ b/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp
@@ -34,9 +34,9 @@
#include "settings.h"
#include "spellcatalog.h"
-#include "actionregistry.h"
+#include <actionregistry.h>
#include "actioncopyspelling.h"
-#include "status.h"
+#include <status.h>
K_EXPORT_COMPONENT_FACTORY( katapult_spellcatalog,
KGenericFactory<SpellCatalog>( "katapult_spellcatalog" ) )
diff --git a/katapult/plugins/catalogs/spellcatalog/spellcatalog.h b/katapult/plugins/catalogs/spellcatalog/spellcatalog.h
index 8dd9215..b4ed036 100644
--- a/katapult/plugins/catalogs/spellcatalog/spellcatalog.h
+++ b/katapult/plugins/catalogs/spellcatalog/spellcatalog.h
@@ -31,7 +31,7 @@
#include <tqstring.h>
#include "spelling.h"
-#include "katapultcatalog.h"
+#include <katapultcatalog.h>
class TQWidget;
diff --git a/katapult/plugins/display/CMakeLists.txt b/katapult/plugins/display/CMakeLists.txt
new file mode 100644
index 0000000..4820a7f
--- /dev/null
+++ b/katapult/plugins/display/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_subdirectory( glassdisplay )
+add_subdirectory( puredisplay )
+add_subdirectory( o2display )
diff --git a/katapult/plugins/display/glassdisplay/CMakeLists.txt b/katapult/plugins/display/glassdisplay/CMakeLists.txt
new file mode 100644
index 0000000..d5fe0e0
--- /dev/null
+++ b/katapult/plugins/display/glassdisplay/CMakeLists.txt
@@ -0,0 +1,36 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/common
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### katapult_glassdisplay (kpart)
+
+tde_add_kpart( katapult_glassdisplay AUTOMOC
+
+ SOURCES
+ glassdisplay.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ ${PROJECT_NAME}-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+ FILES katapult_glassdisplay.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/katapult/plugins/display/o2display/CMakeLists.txt b/katapult/plugins/display/o2display/CMakeLists.txt
new file mode 100644
index 0000000..4729d48
--- /dev/null
+++ b/katapult/plugins/display/o2display/CMakeLists.txt
@@ -0,0 +1,36 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/common
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### katapult_o2display (kpart)
+
+tde_add_kpart( katapult_o2display AUTOMOC
+
+ SOURCES
+ o2display.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ ${PROJECT_NAME}-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+ FILES katapult_o2display.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/katapult/plugins/display/puredisplay/CMakeLists.txt b/katapult/plugins/display/puredisplay/CMakeLists.txt
new file mode 100644
index 0000000..114fa46
--- /dev/null
+++ b/katapult/plugins/display/puredisplay/CMakeLists.txt
@@ -0,0 +1,36 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/common
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### katapult_puredisplay (kpart)
+
+tde_add_kpart( katapult_puredisplay AUTOMOC
+
+ SOURCES
+ puredisplay.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ ${PROJECT_NAME}-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+ FILES katapult_puredisplay.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)