From 7a10077e8260148faa37d5a91e76135e1341e4c1 Mon Sep 17 00:00:00 2001 From: gregory guy Date: Thu, 14 Feb 2019 15:44:24 +0100 Subject: conversion to the cmake building system Signed-off-by: gregory guy --- katapult/CMakeLists.txt | 3 ++ katapult/common/CMakeLists.txt | 43 +++++++++++++++++++ katapult/katapult/CMakeLists.txt | 49 ++++++++++++++++++++++ katapult/plugins/CMakeLists.txt | 2 + katapult/plugins/catalogs/CMakeLists.txt | 8 ++++ .../plugins/catalogs/amarokcatalog/CMakeLists.txt | 41 ++++++++++++++++++ .../catalogs/amarokcatalog/actionplaysong.h | 2 +- .../catalogs/amarokcatalog/amarokcatalog.cpp | 2 + katapult/plugins/catalogs/amarokcatalog/song.cpp | 2 +- .../catalogs/bookmarkcatalog/CMakeLists.txt | 41 ++++++++++++++++++ .../catalogs/bookmarkcatalog/bookmarkcatalog.h | 2 +- .../catalogs/bookmarkcatalog/mozillabookmark.h | 2 +- .../catalogs/calculatorcatalog/CMakeLists.txt | 46 ++++++++++++++++++++ .../catalogs/calculatorcatalog/actionevalexpr.h | 2 +- .../catalogs/calculatorcatalog/calculatorcatalog.h | 2 +- .../catalogs/documentcatalog/CMakeLists.txt | 41 ++++++++++++++++++ .../catalogs/documentcatalog/documentcatalog.cpp | 4 +- .../catalogs/documentcatalog/documentcatalog.h | 2 +- .../plugins/catalogs/execcatalog/CMakeLists.txt | 45 ++++++++++++++++++++ .../plugins/catalogs/execcatalog/actionrun.cpp | 2 +- katapult/plugins/catalogs/execcatalog/actionrun.h | 2 +- .../plugins/catalogs/execcatalog/execcatalog.cpp | 4 +- .../plugins/catalogs/execcatalog/execcatalog.h | 2 +- .../plugins/catalogs/googlecatalog/CMakeLists.txt | 45 ++++++++++++++++++++ .../catalogs/googlecatalog/actionsearch.cpp | 2 +- .../plugins/catalogs/googlecatalog/actionsearch.h | 2 +- .../catalogs/googlecatalog/googlecatalog.cpp | 4 +- .../plugins/catalogs/googlecatalog/googlecatalog.h | 2 +- .../plugins/catalogs/programcatalog/CMakeLists.txt | 40 ++++++++++++++++++ .../catalogs/programcatalog/actionrunprogram.cpp | 2 +- .../catalogs/programcatalog/actionrunprogram.h | 2 +- .../catalogs/programcatalog/programcatalog.cpp | 2 +- .../catalogs/programcatalog/programcatalog.h | 2 +- .../plugins/catalogs/spellcatalog/CMakeLists.txt | 45 ++++++++++++++++++++ .../catalogs/spellcatalog/actioncopyspelling.cpp | 2 +- .../catalogs/spellcatalog/actioncopyspelling.h | 2 +- .../plugins/catalogs/spellcatalog/spellcatalog.cpp | 4 +- .../plugins/catalogs/spellcatalog/spellcatalog.h | 2 +- katapult/plugins/display/CMakeLists.txt | 3 ++ .../plugins/display/glassdisplay/CMakeLists.txt | 36 ++++++++++++++++ katapult/plugins/display/o2display/CMakeLists.txt | 36 ++++++++++++++++ .../plugins/display/puredisplay/CMakeLists.txt | 36 ++++++++++++++++ 42 files changed, 590 insertions(+), 28 deletions(-) create mode 100644 katapult/CMakeLists.txt create mode 100644 katapult/common/CMakeLists.txt create mode 100644 katapult/katapult/CMakeLists.txt create mode 100644 katapult/plugins/CMakeLists.txt create mode 100644 katapult/plugins/catalogs/CMakeLists.txt create mode 100644 katapult/plugins/catalogs/amarokcatalog/CMakeLists.txt create mode 100644 katapult/plugins/catalogs/bookmarkcatalog/CMakeLists.txt create mode 100644 katapult/plugins/catalogs/calculatorcatalog/CMakeLists.txt create mode 100644 katapult/plugins/catalogs/documentcatalog/CMakeLists.txt create mode 100644 katapult/plugins/catalogs/execcatalog/CMakeLists.txt create mode 100644 katapult/plugins/catalogs/googlecatalog/CMakeLists.txt create mode 100644 katapult/plugins/catalogs/programcatalog/CMakeLists.txt create mode 100644 katapult/plugins/catalogs/spellcatalog/CMakeLists.txt create mode 100644 katapult/plugins/display/CMakeLists.txt create mode 100644 katapult/plugins/display/glassdisplay/CMakeLists.txt create mode 100644 katapult/plugins/display/o2display/CMakeLists.txt create mode 100644 katapult/plugins/display/puredisplay/CMakeLists.txt (limited to 'katapult') diff --git a/katapult/CMakeLists.txt b/katapult/CMakeLists.txt new file mode 100644 index 0000000..519be70 --- /dev/null +++ b/katapult/CMakeLists.txt @@ -0,0 +1,3 @@ +add_subdirectory( common ) +add_subdirectory( plugins ) +add_subdirectory( ${PROJECT_NAME} ) diff --git a/katapult/common/CMakeLists.txt b/katapult/common/CMakeLists.txt new file mode 100644 index 0000000..b57fc60 --- /dev/null +++ b/katapult/common/CMakeLists.txt @@ -0,0 +1,43 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### katapult (shared) + +tde_add_library( ${PROJECT_NAME} SHARED AUTOMOC + + SOURCES + imagedisplaysettings.ui + katapultitem.cpp + katapultaction.cpp + actionregistry.cpp + katapultcatalog.cpp + cachedcatalog.cpp + match.cpp + katapultdisplay.cpp + imagedisplay.cpp + VERSION 2.0.0 + LINK + tdecore-shared + tdeui-shared + + DESTINATION ${LIB_INSTALL_DIR} +) + + +##### other data + +install( + FILES katapultcatalog.desktop katapultdisplay.desktop + DESTINATION ${SERVICETYPES_INSTALL_DIR} +) diff --git a/katapult/katapult/CMakeLists.txt b/katapult/katapult/CMakeLists.txt new file mode 100644 index 0000000..7a98783 --- /dev/null +++ b/katapult/katapult/CMakeLists.txt @@ -0,0 +1,49 @@ +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 (executable) + +tde_add_executable( ${PROJECT_NAME} AUTOMOC + + SOURCES + confgeneral.ui + confcatalogs.ui + confdisplay.ui + main.cpp + katapult.cpp + katapultsettings.cpp + katapultconfigdlg.cpp + katapultiface.skel + LINK + tdecore-shared + tdeui-shared + tdeio-shared + ${PROJECT_NAME}-shared + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### icons + +tde_install_icons( ${PROJECT_NAME} ) + + +##### other data + +install( + FILES ${PROJECT_NAME}.desktop + DESTINATION ${XDG_APPS_INSTALL_DIR} +) 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 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 #include #include -#include +#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 -#include "cachedcatalog.h" +#include 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 -#include "katapultitem.h" +#include /** @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 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 #include "expression.h" -#include "katapultcatalog.h" +#include 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 +#include #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 #include -#include "katapultcatalog.h" +#include 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 #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 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 #include "actionrun.h" -#include "status.h" +#include K_EXPORT_COMPONENT_FACTORY( katapult_execcatalog, KGenericFactory( "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 #include "command.h" -#include "katapultcatalog.h" +#include 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 #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 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 #include "actionsearch.h" -#include "status.h" +#include K_EXPORT_COMPONENT_FACTORY( katapult_googlecatalog, KGenericFactory( "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 #include "query.h" -#include "katapultcatalog.h" +#include 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 #include "program.h" -#include "katapultitem.h" +#include #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 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 #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 #include -#include "cachedcatalog.h" +#include 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 #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 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 #include "actioncopyspelling.h" -#include "status.h" +#include K_EXPORT_COMPONENT_FACTORY( katapult_spellcatalog, KGenericFactory( "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 #include "spelling.h" -#include "katapultcatalog.h" +#include 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} +) -- cgit v1.2.3