From e6dc9d8ebea364a5b5f927648c5325aaa407cf88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20F=C3=BCrmetz?= <fuermetz@mailbox.org>
Date: Thu, 22 Jun 2017 12:46:37 +0200
Subject: [PATCH] Leave directory structure flat

---
 CMakeLists.txt                                              | 6 +++---
 config/pass_config.cpp => config.cpp                        | 4 ++--
 config/pass_config.h => config.h                            | 6 +++---
 config/pass_config.ui => config.ui                          | 0
 pass.cpp                                                    | 2 +-
 ...pass_config.desktop => plasma-runner-pass_config.desktop | 0
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename config/pass_config.cpp => config.cpp (99%)
 rename config/pass_config.h => config.h (97%)
 rename config/pass_config.ui => config.ui (100%)
 rename config/plasma-runner-pass_config.desktop => plasma-runner-pass_config.desktop (100%)

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 <krunner/abstractrunner.h>
 #include <QToolButton>
 
-#include "pass_config.h"
+#include "config.h"
 
 K_PLUGIN_FACTORY(PassConfigFactory, registerPlugin<PassConfig>("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 <http://www.gnu.org/licenses/>.                               *
  *****************************************************************************/
 
-#ifndef PASS_CONFIG_H
-#define PASS_CONFIG_H
+#ifndef CONFIG_H
+#define CONFIG_H
 
-#include "ui_pass_config.h"
+#include "ui_config.h"
 #include <KCModule>
 #include <KConfigGroup>
 
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 <stdlib.h>
 
 #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