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/iconloader.cpp

@@ -22,20 +22,19 @@
 #include "config.h"
 
 #include <QFile>
-#include <QDir>
+#include <QList>
+#include <QString>
+#include <QIcon>
+#include <QSize>
 #include <QtDebug>
-#include <QSettings>
 
-#include "iconloader.h"
 #include "core/logging.h"
-#include "core/appearance.h"
+#include "iconloader.h"
 
 QList<int> IconLoader::sizes_;
 QString IconDefault(":/icons/64x64/strawberry.png");
 
 void IconLoader::Init() {
-    
-  //qLog(Debug) << __PRETTY_FUNCTION__;
 
   sizes_.clear();
   sizes_ << 22 << 32 << 48 << 64;
@@ -50,8 +49,6 @@ QIcon IconLoader::Load(const QString &name) {
 
   QIcon ret;
 
-  //qLog(Debug) << __PRETTY_FUNCTION__ << name;
-
   if (name.isEmpty()) {
     qLog(Warning) << "Icon name is empty!";
     ret.addFile(IconDefault, QSize(64, 64));