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/qocoa/main.cpp

@@ -1,4 +1,4 @@
-#include <QtGui/QApplication>
+#include <QApplication>
 #include "gallery.h"
 
 int main(int argc, char *argv[])

3rdparty/qocoa/qbutton.h

@@ -3,6 +3,7 @@
 
 #include <QWidget>
 #include <QPointer>
+#include <QString>
 
 class QButtonPrivate;
 class QButton : public QWidget

3rdparty/qocoa/qbutton_nonmac.cpp

@@ -20,12 +20,19 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "qbutton.h"
-
+#include <QtGlobal>
+#include <QObject>
+#include <QWidget>
+#include <QPointer>
+#include <QString>
+#include <QPixmap>
+#include <QAbstractButton>
+#include <QBoxLayout>
+#include <QPushButton>
 #include <QToolBar>
 #include <QToolButton>
-#include <QPushButton>
-#include <QVBoxLayout>
+
+#include "qbutton.h"
 
 class QButtonPrivate : public QObject
 {

3rdparty/qocoa/qocoa_mac.h

@@ -21,8 +21,9 @@ THE SOFTWARE.
 */
 
 #include <Foundation/NSString.h>
+#include <QByteArray>
 #include <QString>
-#include <QVBoxLayout>
+#include <QBoxLayout>
 #include <QMacCocoaViewContainer>
 
 static inline NSString* fromQString(const QString &string)

3rdparty/qocoa/qprogressindicatorspinning.h

@@ -17,8 +17,7 @@ public:
        Aqua    = 12
     };
 
-    explicit QProgressIndicatorSpinning(QWidget *parent,
-                                        Thickness thickness = Default);
+    explicit QProgressIndicatorSpinning(QWidget *parent, Thickness thickness = Default);
 public slots:
     void animate(bool animate = true);
 private:

3rdparty/qocoa/qprogressindicatorspinning_nonmac.cpp

@@ -20,11 +20,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "qprogressindicatorspinning.h"
-
-#include <QVBoxLayout>
-#include <QMovie>
+#include <QtGlobal>
+#include <QObject>
+#include <QWidget>
+#include <QBoxLayout>
 #include <QLabel>
+#include <QMovie>
+#include <QPointer>
+#include <QSize>
+
+#include "qprogressindicatorspinning.h"
 
 class QProgressIndicatorSpinningPrivate : public QObject
 {

3rdparty/qocoa/qsearchfield.h

@@ -2,7 +2,11 @@
 #define QSEARCHFIELD_H
 
 #include <QWidget>
+#include <QObject>
 #include <QPointer>
+#include <QString>
+#include <QEvent>
+#include <QResizeEvent>
 
 class QSearchFieldPrivate;
 class QSearchField : public QWidget

3rdparty/qocoa/qsearchfield_nonmac.cpp

@@ -20,18 +20,22 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "qsearchfield.h"
-#include "../../src/core/iconloader.h"
-
+#include <QtGlobal>
+#include <QObject>
+#include <QWidget>
 #include <QApplication>
-#include <QEvent>
-#include <QLineEdit>
-#include <QVBoxLayout>
-#include <QToolButton>
+#include <QPointer>
+#include <QString>
+#include <QIcon>
+#include <QSize>
 #include <QStyle>
+#include <QLineEdit>
+#include <QBoxLayout>
+#include <QToolButton>
+#include <QtEvents>
 
-#include <QDir>
-#include <QDebug>
+#include "../../src/core/iconloader.h"
+#include "qsearchfield.h"
 
 class QSearchFieldPrivate : public QObject
 {