Moving all OS utils to gui/osutils

The classes used for screen lock detection use QWidget and are only ever used by the GUI,
so moving them there so we can eventually build core/ without Qt5::Widgets.

src/CMakeLists.txt

@@ -58,8 +58,6 @@ set(keepassx_SOURCES
         core/PassphraseGenerator.cpp
         core/Resources.cpp
         core/SignalMultiplexer.cpp
-        core/ScreenLockListener.cpp
-        core/ScreenLockListenerPrivate.cpp
         core/TimeDelta.cpp
         core/TimeInfo.cpp
         core/Tools.cpp
@@ -172,6 +170,8 @@ set(keepassx_SOURCES
         gui/reports/ReportsWidgetStatistics.cpp
         gui/reports/ReportsPageStatistics.cpp
         gui/osutils/OSUtilsBase.cpp
+        gui/osutils/ScreenLockListener.cpp
+        gui/osutils/ScreenLockListenerPrivate.cpp
         gui/settings/SettingsWidget.cpp
         gui/widgets/ElidedLabel.cpp
         gui/widgets/PopupHelpWidget.cpp
@@ -195,29 +195,29 @@ set(keepassx_SOURCES
 if(APPLE)
     set(keepassx_SOURCES
             ${keepassx_SOURCES}
-            core/ScreenLockListenerMac.cpp
             core/MacPasteboard.cpp
             gui/osutils/macutils/MacUtils.cpp
+            gui/osutils/macutils/ScreenLockListenerMac.cpp
             gui/osutils/macutils/AppKitImpl.mm
             gui/osutils/macutils/AppKit.h)
 endif()
 if(UNIX AND NOT APPLE)
     set(keepassx_SOURCES
             ${keepassx_SOURCES}
-            core/ScreenLockListenerDBus.cpp
             gui/MainWindowAdaptor.cpp
+            gui/osutils/nixutils/ScreenLockListenerDBus.cpp
             gui/osutils/nixutils/NixUtils.cpp)
 endif()
 if(MINGW)
     set(keepassx_SOURCES
             ${keepassx_SOURCES}
-            core/ScreenLockListenerWin.cpp
+            gui/osutils/winutils/ScreenLockListenerWin.cpp
             gui/osutils/winutils/WinUtils.cpp)
 endif()
 if(MINGW OR (UNIX AND NOT APPLE))
     set(keepassx_SOURCES
             ${keepassx_SOURCES}
-            core/OSEventFilter.cpp)
+            gui/osutils/OSEventFilter.cpp)
 endif()
 
 set(keepassx_SOURCES ${keepassx_SOURCES}

src/gui/Application.cpp

@@ -35,7 +35,7 @@
 #include <QtNetwork/QLocalSocket>
 
 #if defined(Q_OS_WIN) || (defined(Q_OS_UNIX) && !defined(Q_OS_MACOS))
-#include "core/OSEventFilter.h"
+#include "gui/osutils/OSEventFilter.h"
 #endif
 
 #if defined(Q_OS_UNIX)

src/gui/MainWindow.h

@@ -23,10 +23,10 @@
 #include <QMainWindow>
 #include <QSystemTrayIcon>
 
-#include "core/ScreenLockListener.h"
 #include "core/SignalMultiplexer.h"
 #include "gui/Application.h"
 #include "gui/DatabaseWidget.h"
+#include "gui/osutils/ScreenLockListener.h"
 
 namespace Ui
 {

src/gui/osutils/ScreenLockListenerPrivate.cpp

@@ -17,11 +17,11 @@
 
 #include "ScreenLockListenerPrivate.h"
 #if defined(Q_OS_MACOS)
-#include "ScreenLockListenerMac.h"
+#include "macutils/ScreenLockListenerMac.h"
 #elif defined(Q_OS_UNIX)
-#include "ScreenLockListenerDBus.h"
+#include "nixutils/ScreenLockListenerDBus.h"
 #elif defined(Q_OS_WIN)
-#include "ScreenLockListenerWin.h"
+#include "winutils/ScreenLockListenerWin.h"
 #endif
 
 ScreenLockListenerPrivate::ScreenLockListenerPrivate(QWidget* parent)

src/gui/osutils/macutils/ScreenLockListenerMac.h

@@ -22,7 +22,7 @@
 
 #include <CoreFoundation/CoreFoundation.h>
 
-#include "ScreenLockListenerPrivate.h"
+#include "gui/osutils/ScreenLockListenerPrivate.h"
 
 class ScreenLockListenerMac : public ScreenLockListenerPrivate
 {

src/gui/osutils/nixutils/ScreenLockListenerDBus.h

@@ -17,7 +17,7 @@
 
 #ifndef SCREENLOCKLISTENERDBUS_H
 #define SCREENLOCKLISTENERDBUS_H
-#include "ScreenLockListenerPrivate.h"
+#include "gui/osutils/ScreenLockListenerPrivate.h"
 #include <QDBusMessage>
 #include <QObject>
 #include <QWidget>

src/gui/osutils/winutils/ScreenLockListenerWin.h

@@ -21,7 +21,7 @@
 #include <QObject>
 #include <QWidget>
 
-#include "ScreenLockListenerPrivate.h"
+#include "gui/osutils/ScreenLockListenerPrivate.h"
 
 class ScreenLockListenerWin : public ScreenLockListenerPrivate, public QAbstractNativeEventFilter
 {