Includes, comments and bugfixes

- Fix includes
- Use common regex (Song::kCoverRemoveDisc) for removing Disc/CD from album
- Remove Disc/CD from album when creating hash
- Make imobiledevice support compile
- Fix setting device on windows

3rdparty/qtsingleapplication/qtlocalpeer.cpp

@@ -39,14 +39,27 @@
 
 
 #include "qtlocalpeer.h"
-#include <QCoreApplication>
-#include <QTime>
-#include <QDataStream>
+
 #include <unistd.h>
 
+#include <QtGlobal>
+#include <QCoreApplication>
+#include <QObject>
+#include <QAbstractSocket>
+#include <QByteArray>
+#include <QChar>
+#include <QDataStream>
+#include <QDir>
+#include <QFile>
+#include <QIODevice>
+#include <QLocalServer>
+#include <QLocalSocket>
+#include <QRegExp>
+
 #if defined(Q_OS_WIN)
-#include <QLibrary>
 #include <qt_windows.h>
+#include <QLibrary>
+
 typedef BOOL(WINAPI*PProcessIdToSessionId)(DWORD,DWORD*);
 static PProcessIdToSessionId pProcessIdToSessionId = 0;
 #endif

3rdparty/qtsingleapplication/qtlocalpeer.h

@@ -40,9 +40,9 @@
 #ifndef QTLOCALPEER_H
 #define QTLOCALPEER_H
 
+#include <QObject>
+#include <QString>
 #include <QLocalServer>
-#include <QLocalSocket>
-#include <QDir>
 
 #include "qtlockedfile.h"
 

3rdparty/qtsingleapplication/qtlockedfile.cpp

@@ -37,6 +37,9 @@
 **
 ****************************************************************************/
 
+#include <QFile>
+#include <QString>
+
 #include "qtlockedfile.h"
 
 /*!

3rdparty/qtsingleapplication/qtlockedfile.h

@@ -42,7 +42,7 @@
 
 #include <QFile>
 #ifdef Q_OS_WIN
-#include <QtCore/QVector>
+#include <QVector>
 #endif
 
 #if defined(Q_WS_WIN) || defined(Q_OS_WIN)

3rdparty/qtsingleapplication/qtlockedfile_win.cpp

@@ -37,9 +37,10 @@
 **
 ****************************************************************************/
 
+#include <QFileInfo>
+
 #include "qtlockedfile.h"
 #include <qt_windows.h>
-#include <QFileInfo>
 
 #define MUTEX_PREFIX "QtLockedFile mutex "
 // Maximum number of concurrent read locks. Must not be greater than MAXIMUM_WAIT_OBJECTS

3rdparty/qtsingleapplication/qtsingleapplication.cpp

@@ -39,8 +39,12 @@
 
 
 #include "qtsingleapplication.h"
-#include "qtlocalpeer.h"
+
+#include <QApplication>
 #include <QWidget>
+#include <QString>
+
+#include "qtlocalpeer.h"
 
 /*!
     \class QtSingleApplication qtsingleapplication.h

3rdparty/qtsingleapplication/qtsingleapplication.h

@@ -40,8 +40,11 @@
 #ifndef QTSINGLEAPPLICATION_H
 #define QTSINGLEAPPLICATION_H
 
+#include <QtGlobal>
+#include <QObject>
+#include <QWidget>
 #include <QApplication>
-
+#include <QString>
 class QtLocalPeer;
 
 #if defined(Q_WS_WIN) || defined(Q_OS_WIN32)

3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp

@@ -37,6 +37,9 @@
 **
 ****************************************************************************/
 
+#include <QCoreApplication>
+#include <QString>
+#include <QFlags>
 
 #include "qtsinglecoreapplication.h"
 #include "qtlocalpeer.h"
@@ -70,8 +73,7 @@
 */
 
 QtSingleCoreApplication::QtSingleCoreApplication(int &argc, char **argv)
-    : QCoreApplication(argc, argv)
-{
+    : QCoreApplication(argc, argv) {
     peer = new QtLocalPeer(this);
     connect(peer, SIGNAL(messageReceived(const QString&)), SIGNAL(messageReceived(const QString&)));
 }
@@ -83,8 +85,7 @@ QtSingleCoreApplication::QtSingleCoreApplication(int &argc, char **argv)
     QCoreAppliation constructor.
 */
 QtSingleCoreApplication::QtSingleCoreApplication(const QString &appId, int &argc, char **argv)
-    : QCoreApplication(argc, argv)
-{
+    : QCoreApplication(argc, argv) {
     peer = new QtLocalPeer(this, appId);
     connect(peer, SIGNAL(messageReceived(const QString&)), SIGNAL(messageReceived(const QString&)));
 }
@@ -101,8 +102,7 @@ QtSingleCoreApplication::QtSingleCoreApplication(const QString &appId, int &argc
     \sa sendMessage()
 */
 
-bool QtSingleCoreApplication::isRunning()
-{
+bool QtSingleCoreApplication::isRunning() {
     return peer->isClient();
 }
 
@@ -121,8 +121,7 @@ bool QtSingleCoreApplication::isRunning()
     \sa isRunning(), messageReceived()
 */
 
-bool QtSingleCoreApplication::sendMessage(const QString &message, int timeout)
-{
+bool QtSingleCoreApplication::sendMessage(const QString &message, int timeout) {
     return peer->sendMessage(message, timeout);
 }
 
@@ -132,8 +131,7 @@ bool QtSingleCoreApplication::sendMessage(const QString &message, int timeout)
     identifier will be regarded as instances of the same application.
 */
 
-QString QtSingleCoreApplication::id() const
-{
+QString QtSingleCoreApplication::id() const {
     return peer->applicationId();
 }
 

3rdparty/qtsingleapplication/qtsinglecoreapplication.h

@@ -41,6 +41,8 @@
 #define QTSINGLECOREAPPLICATION_H
 
 #include <QCoreApplication>
+#include <QObject>
+#include <QString>
 
 class QtLocalPeer;