Moved upower.*pp out of the upower directories

include/factory.hpp

@@ -43,7 +43,7 @@
 #include "modules/keyboard_state.hpp"
 #endif
 #ifdef HAVE_UPOWER
-#include "modules/upower/upower.hpp"
+#include "modules/upower.hpp"
 #endif
 #ifdef HAVE_LIBPULSE
 #include "modules/pulseaudio.hpp"

meson.build

@@ -206,7 +206,7 @@ endif
 
 if (upower_glib.found() and giounix.found() and not get_option('logind').disabled())
     add_project_arguments('-DHAVE_UPOWER', language: 'cpp')
-    src_files += 'src/modules/upower/upower.cpp'
+    src_files += 'src/modules/upower.cpp'
 endif
 
 if libpulse.found()

src/modules/upower.cpp

@@ -1,4 +1,4 @@
-#include "modules/upower/upower.hpp"
+#include "modules/upower.hpp"
 
 #include <gio/gio.h>