From 98791015e56cf7fca0ed58dcdbfa1f52a49ccdff Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Tue, 1 Jan 2019 21:48:50 +0100
Subject: [PATCH] Minor fixes to qtsingleapplication

---
 3rdparty/qtsingleapplication/qtlocalpeer.cpp  |  4 ++--
 3rdparty/qtsingleapplication/qtlocalpeer.h    |  2 +-
 .../qtsingleapplication/qtsingleapplication.h |  2 +-
 .../qtsinglecoreapplication.h                 |  2 +-
 src/CMakeLists.txt                            |  4 ++--
 src/{core => }/main.cpp                       | 24 +++++++++----------
 src/{core => }/main.h                         |  0
 7 files changed, 19 insertions(+), 19 deletions(-)
 rename src/{core => }/main.cpp (95%)
 rename src/{core => }/main.h (100%)

diff --git a/3rdparty/qtsingleapplication/qtlocalpeer.cpp b/3rdparty/qtsingleapplication/qtlocalpeer.cpp
index 708bc126d..aa070b619 100644
--- a/3rdparty/qtsingleapplication/qtlocalpeer.cpp
+++ b/3rdparty/qtsingleapplication/qtlocalpeer.cpp
@@ -125,7 +125,7 @@ bool QtLocalPeer::isClient()
         return true;
 
     bool res = server->listen(socketName);
-#if defined(Q_OS_UNIX) && (QT_VERSION >= QT_VERSION_CHECK(4,5,0))
+#ifdef Q_OS_UNIX
     // ### Workaround
     if (!res && server->serverError() == QAbstractSocket::AddressInUseError) {
         QFile::remove(QDir::cleanPath(QDir::tempPath())+QLatin1Char('/')+socketName);
@@ -153,7 +153,7 @@ bool QtLocalPeer::sendMessage(const QString &message, int timeout)
         if (connOk || i)
             break;
         int ms = 250;
-#if defined(Q_OS_WIN)
+#ifdef Q_OS_WIN
         Sleep(DWORD(ms));
 #else
         struct timespec ts = { ms / 1000, (ms % 1000) * 1000 * 1000 };
diff --git a/3rdparty/qtsingleapplication/qtlocalpeer.h b/3rdparty/qtsingleapplication/qtlocalpeer.h
index 7bcfb69a5..b6eea0b67 100644
--- a/3rdparty/qtsingleapplication/qtlocalpeer.h
+++ b/3rdparty/qtsingleapplication/qtlocalpeer.h
@@ -73,4 +73,4 @@ private:
     static const char* ack;
 };
 
-#endif // QTLOCALPEER_H
+#endif  // QTLOCALPEER_H
diff --git a/3rdparty/qtsingleapplication/qtsingleapplication.h b/3rdparty/qtsingleapplication/qtsingleapplication.h
index bd620ed28..82da5d66d 100644
--- a/3rdparty/qtsingleapplication/qtsingleapplication.h
+++ b/3rdparty/qtsingleapplication/qtsingleapplication.h
@@ -99,4 +99,4 @@ private:
     QWidget *actWin;
 };
 
-#endif // QTSINGLEAPPLICATION_H
+#endif  // QTSINGLEAPPLICATION_H
diff --git a/3rdparty/qtsingleapplication/qtsinglecoreapplication.h b/3rdparty/qtsingleapplication/qtsinglecoreapplication.h
index bb32fecf1..b2df19101 100644
--- a/3rdparty/qtsingleapplication/qtsinglecoreapplication.h
+++ b/3rdparty/qtsingleapplication/qtsinglecoreapplication.h
@@ -71,4 +71,4 @@ private:
     QtLocalPeer* peer;
 };
 
-#endif // QTSINGLECOREAPPLICATION_H
+#endif  // QTSINGLECOREAPPLICATION_H
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 660b19298..f9f153e3b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -72,7 +72,7 @@ link_directories(${TAGLIB_LIBRARY_DIRS})
 include_directories(${TAGLIB_INCLUDE_DIRS})
 
 include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIRS})
-include_directories(${QXT_INCLUDE_DIRS})
+include_directories(${QTSINGLECOREAPPLICATION_INCLUDE_DIRS})
 
 include_directories(${CMAKE_SOURCE_DIR}/ext/libstrawberry-common)
 include_directories(${CMAKE_SOURCE_DIR}/ext/libstrawberry-tagreader)
@@ -1055,7 +1055,7 @@ add_executable(strawberry
   MACOSX_BUNDLE
   ${STRAWBERRY-WIN32-FLAG}
   ${STRAWBERRY-WIN32-RESOURCES}
-  core/main.cpp
+  main.cpp
 )
 
 if(FREEBSD)
diff --git a/src/core/main.cpp b/src/main.cpp
similarity index 95%
rename from src/core/main.cpp
rename to src/main.cpp
index d511b1b24..637dc85d7 100644
--- a/src/core/main.cpp
+++ b/src/main.cpp
@@ -68,21 +68,21 @@
 
 #include "core/logging.h"
 
-#include "qtsingleapplication.h"
-#include "qtsinglecoreapplication.h"
+#include <qtsingleapplication.h>
+#include <qtsinglecoreapplication.h>
 
 #ifdef HAVE_DBUS
-#  include "mpris.h"
+#  include "core/mpris.h"
 #endif
-#include "utilities.h"
-#include "metatypes.h"
-#include "iconloader.h"
-#include "mainwindow.h"
-#include "commandlineoptions.h"
-#include "systemtrayicon.h"
-#include "application.h"
-#include "networkproxyfactory.h"
-#include "scangiomodulepath.h"
+#include "core/utilities.h"
+#include "core/metatypes.h"
+#include "core/iconloader.h"
+#include "core/mainwindow.h"
+#include "core/commandlineoptions.h"
+#include "core/systemtrayicon.h"
+#include "core/application.h"
+#include "core/networkproxyfactory.h"
+#include "core/scangiomodulepath.h"
 
 #include "widgets/osd.h"
 
diff --git a/src/core/main.h b/src/main.h
similarity index 100%
rename from src/core/main.h
rename to src/main.h