diff --git a/CMakeLists.txt b/CMakeLists.txt index 38ce372..24dc023 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,10 +17,10 @@ set(krunner_pass_SRCS ) set(kcm_krunner_pass_SRCS - config/pass_config.cpp + config.cpp ) -ki18n_wrap_ui(kcm_krunner_pass_SRCS config/pass_config.ui) +ki18n_wrap_ui(kcm_krunner_pass_SRCS config.ui) add_library(kcm_krunner_pass MODULE ${kcm_krunner_pass_SRCS}) target_link_libraries(kcm_krunner_pass Qt5::Core @@ -43,5 +43,5 @@ target_link_libraries(krunner_pass KF5::Runner Qt5::Widgets add_dependencies(krunner_pass kcm_krunner_pass) install(TARGETS krunner_pass kcm_krunner_pass DESTINATION ${PLUGIN_INSTALL_DIR}) -install(FILES plasma-runner-pass.desktop config/plasma-runner-pass_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES plasma-runner-pass.desktop plasma-runner-pass_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES krunner_pass.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR}) diff --git a/config/pass_config.cpp b/config.cpp similarity index 99% rename from config/pass_config.cpp rename to config.cpp index 7b06530..9b46592 100644 --- a/config/pass_config.cpp +++ b/config.cpp @@ -21,7 +21,7 @@ #include #include -#include "pass_config.h" +#include "config.h" K_PLUGIN_FACTORY(PassConfigFactory, registerPlugin("kcm_krunner_pass");) @@ -201,4 +201,4 @@ void PassConfig::defaults() } -#include "pass_config.moc" +#include "config.moc" diff --git a/config/pass_config.h b/config.h similarity index 97% rename from config/pass_config.h rename to config.h index fb5cc99..2c47078 100644 --- a/config/pass_config.h +++ b/config.h @@ -16,10 +16,10 @@ * If not, see . * *****************************************************************************/ -#ifndef PASS_CONFIG_H -#define PASS_CONFIG_H +#ifndef CONFIG_H +#define CONFIG_H -#include "ui_pass_config.h" +#include "ui_config.h" #include #include diff --git a/config/pass_config.ui b/config.ui similarity index 100% rename from config/pass_config.ui rename to config.ui diff --git a/pass.cpp b/pass.cpp index 9790fa7..d049b6e 100644 --- a/pass.cpp +++ b/pass.cpp @@ -31,7 +31,7 @@ #include #include "pass.h" -#include "config/pass_config.h" +#include "config.h" using namespace std; diff --git a/config/plasma-runner-pass_config.desktop b/plasma-runner-pass_config.desktop similarity index 100% rename from config/plasma-runner-pass_config.desktop rename to plasma-runner-pass_config.desktop