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

src/core/windows7thumbbar.cpp

@@ -20,13 +20,13 @@
 
 #include "config.h"
 
+#include <QObject>
+#include <QWidget>
+#include <QList>
+#include <QPixmap>
 #include <QAction>
 #include <QtDebug>
 
-#include "windows7thumbbar.h"
-
-#include "core/logging.h"
-
 #ifdef Q_OS_WIN32
   #ifndef _WIN32_WINNT
     #define _WIN32_WINNT 0x0600
@@ -34,13 +34,15 @@
   #include <windows.h>
   #include <commctrl.h>
   #include <shobjidl.h>
-extern HICON qt_pixmapToWinHICON(const QPixmap &p);
+  extern HICON qt_pixmapToWinHICON(const QPixmap &p);
 #endif  // Q_OS_WIN32
 
+#include "core/logging.h"
+#include "windows7thumbbar.h"
+
 const int Windows7ThumbBar::kIconSize = 16;
 const int Windows7ThumbBar::kMaxButtonCount = 7;
 
-
 Windows7ThumbBar::Windows7ThumbBar(QWidget *widget)
     : QObject(widget),
       widget_(widget),