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/dialogs/about.cpp

@@ -21,12 +21,21 @@
 
 #include "config.h"
 
+#include <QCoreApplication>
+#include <QWidget>
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QString>
+#include <QStringBuilder>
+#include <QFlags>
+#include <QFont>
+#include <QLabel>
+#include <QPushButton>
+#include <QKeySequence>
+
 #include "about.h"
 #include "ui_about.h"
 
-#include <QCoreApplication>
-#include <QPushButton>
-
 About::About(QWidget *parent):QDialog(parent) {
     
   authors_ \

src/dialogs/about.h

@@ -23,7 +23,13 @@
 
 #include "config.h"
 
+#include <stdbool.h>
+
+#include <QObject>
+#include <QWidget>
 #include <QDialog>
+#include <QList>
+#include <QString>
 
 #include "ui_about.h"
 
@@ -36,7 +42,7 @@ class About : public QDialog {
   struct Person {
     Person(const QString &n, const QString &e = QString()) : name(n), email(e) {}
 
-    bool operator<(const Person& other) const { return name < other.name; }
+    bool operator<(const Person &other) const { return name < other.name; }
 
     QString name;
     QString email;

src/dialogs/console.cpp

@@ -20,14 +20,22 @@
 
 #include "config.h"
 
+#include <QWidget>
+#include <QDialog>
+#include <QVariant>
+#include <QString>
+#include <QStringList>
+#include <QStringBuilder>
 #include <QFont>
-#include <QScrollBar>
 #include <QSqlDatabase>
 #include <QSqlQuery>
 #include <QSqlRecord>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QScrollBar>
+#include <QTextBrowser>
 
 #include "console.h"
-
 #include "core/application.h"
 #include "core/database.h"
 

src/dialogs/console.h

@@ -23,7 +23,10 @@
 
 #include "config.h"
 
+#include <QObject>
+#include <QWidget>
 #include <QDialog>
+#include <QString>
 
 #include "ui_console.h"
 

src/dialogs/edittagdialog.cpp

@@ -20,34 +20,69 @@
 
 #include "config.h"
 
+#include <algorithm>
+#include <iterator>
 #include <limits>
 
-#include <QDateTime>
-#include <QDir>
+#include <QtGlobal>
+#include <QtConcurrentRun>
 #include <QFuture>
+#include <QObject>
+#include <QWidget>
+#include <QDialog>
+#include <QItemSelectionModel>
+#include <QAbstractItemModel>
+#include <QDir>
+#include <QAction>
+#include <QDateTime>
+#include <QList>
+#include <QVariant>
+#include <QString>
+#include <QStringBuilder>
+#include <QUrl>
+#include <QPixmap>
+#include <QPalette>
+#include <QColor>
+#include <QFont>
 #include <QLabel>
+#include <QLineEdit>
+#include <QListWidget>
+#include <QLocale>
 #include <QMenu>
 #include <QMessageBox>
-#include <QPushButton>
 #include <QShortcut>
-#include <QtConcurrentRun>
+#include <QSize>
+#include <QSpinBox>
+#include <QSplitter>
+#include <QTabWidget>
+#include <QTextEdit>
+#include <QPlainTextEdit>
+#include <QKeySequence>
+#include <QDialogButtonBox>
+#include <QPushButton>
+#include <QAbstractButton>
+#include <QtEvents>
+#include <QSettings>
 #include <QtDebug>
 
-#include "edittagdialog.h"
-#include "trackselectiondialog.h"
-#include "ui_edittagdialog.h"
 #include "core/application.h"
+#include "core/closure.h"
+#include "core/iconloader.h"
 #include "core/logging.h"
 #include "core/tagreaderclient.h"
 #include "core/utilities.h"
-#include "collection/collection.h"
+#include "widgets/busyindicator.h"
+#include "widgets/lineedit.h"
 #include "collection/collectionbackend.h"
+#include "playlist/playlist.h"
 #include "playlist/playlistdelegates.h"
-#include "covermanager/albumcovermanager.h"
+#include "musicbrainz/tagfetcher.h"
+#include "covermanager/albumcoverchoicecontroller.h"
 #include "covermanager/albumcoverloader.h"
 #include "covermanager/coverproviders.h"
-#include "covermanager/albumcoverchoicecontroller.h"
-#include "covermanager/coverfromurldialog.h"
+#include "edittagdialog.h"
+#include "trackselectiondialog.h"
+#include "ui_edittagdialog.h"
 
 const char *EditTagDialog::kHintText = QT_TR_NOOP("(different across multiple songs)");
 const char *EditTagDialog::kSettingsGroup = "EditTagDialog";
@@ -129,7 +164,7 @@ EditTagDialog::EditTagDialog(Application *app, QWidget *parent)
   // Pretend the summary text is just a label
   ui_->summary->setMaximumHeight(ui_->art->height() - ui_->summary_art_button->height() - 4);
 
-  connect(ui_->song_list->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), SLOT(SelectionChanged()));
+  connect(ui_->song_list->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), SLOT(SelectionChanged()));
   connect(ui_->button_box, SIGNAL(clicked(QAbstractButton*)), SLOT(ButtonClicked(QAbstractButton*)));
   //connect(ui_->rating, SIGNAL(RatingChanged(float)), SLOT(SongRated(float)));
   connect(ui_->playcount_reset, SIGNAL(clicked()), SLOT(ResetPlayCounts()));
@@ -644,8 +679,7 @@ void EditTagDialog::UpdateCoverOf(const Song &selected, const QModelIndexList &s
 
   UpdateSummaryTab(selected);
 
-  // Now check if we have any other songs cached that share that artist and
-  // album (and would therefore be changed as well)
+  // Now check if we have any other songs cached that share that artist and album (and would therefore be changed as well)
   for (int i = 0; i < data_.count(); ++i) {
     if (i == sel.first().row())  // Already changed this one
       continue;

src/dialogs/edittagdialog.h

@@ -23,26 +23,38 @@
 
 #include "config.h"
 
+#include <stdbool.h>
+
+#include <QtGlobal>
+#include <QObject>
 #include <QDialog>
+#include <QWidget>
+#include <QFuture>
 #include <QModelIndexList>
+#include <QList>
+#include <QVariant>
+#include <QString>
+#include <QImage>
+#include <QMenu>
+#include <QAbstractButton>
+#include <QLabel>
+#include <QPushButton>
+#include <QtEvents>
 
 #include "core/song.h"
-#include "covermanager/albumcoverloaderoptions.h"
-#include "musicbrainz/tagfetcher.h"
 #include "playlist/playlistitem.h"
-#include "widgets/lineedit.h"
-#include "trackselectiondialog.h"
+#include "covermanager/albumcoverloaderoptions.h"
+
+class QEvent;
+class QShowEvent;
+class QHideEvent;
 
 class Application;
+class TagFetcher;
 class AlbumCoverChoiceController;
-class CollectionBackend;
+class TrackSelectionDialog;
 class Ui_EditTagDialog;
 
-class QAbstractButton;
-class QItemSelection;
-class QLabel;
-class QPushButton;
-
 class EditTagDialog : public QDialog {
   Q_OBJECT
 

src/dialogs/errordialog.cpp

@@ -20,9 +20,20 @@
 
 #include "config.h"
 
+#include <QWidget>
+#include <QString>
+#include <QIcon>
+#include <QPalette>
+#include <QPixmap>
+#include <QStyle>
+#include <QLabel>
+#include <QTextEdit>
+
 #include "errordialog.h"
 #include "ui_errordialog.h"
 
+class QHideEvent;
+
 ErrorDialog::ErrorDialog(QWidget *parent)
   : QDialog(parent),
     ui_(new Ui_ErrorDialog)
@@ -64,7 +75,7 @@ void ErrorDialog::hideEvent(QHideEvent *) {
 void ErrorDialog::UpdateContent() {
 
   QString html;
-  for (const QString& message : current_messages_) {
+  for (const QString &message : current_messages_) {
     if (!html.isEmpty())
       html += "<hr/>";
     html += message.toHtmlEscaped();

src/dialogs/errordialog.h

@@ -23,8 +23,13 @@
 
 #include "config.h"
 
+#include <QObject>
 #include <QDialog>
+#include <QWidget>
+#include <QString>
+#include <QStringList>
 
+class QHideEvent;
 class Ui_ErrorDialog;
 
 class ErrorDialog : public QDialog {
@@ -35,7 +40,7 @@ class ErrorDialog : public QDialog {
   ~ErrorDialog();
 
 public slots:
-  void ShowMessage(const QString& message);
+  void ShowMessage(const QString &message);
 
 protected:
   void hideEvent(QHideEvent *);

src/dialogs/organisedialog.cpp

@@ -20,28 +20,48 @@
 
 #include "config.h"
 
-#include "organisedialog.h"
-#include "ui_organisedialog.h"
-
 #include <memory>
 
+#include <QtGlobal>
+#include <QtConcurrentRun>
+#include <QtAlgorithms>
+#include <QAbstractItemModel>
+#include <QDialog>
+#include <QHash>
+#include <QMap>
 #include <QDir>
 #include <QFileInfo>
-#include <QHash>
+#include <QVariant>
+#include <QString>
+#include <QStringBuilder>
+#include <QStringList>
+#include <QUrl>
+#include <QAction>
 #include <QMenu>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QDialogButtonBox>
+#include <QGroupBox>
+#include <QListWidget>
 #include <QPushButton>
-#include <QResizeEvent>
-#include <QSettings>
 #include <QSignalMapper>
-#include <QtConcurrentRun>
-#include <QtDebug>
+#include <QStackedWidget>
+#include <QToolButton>
+#include <QFlags>
+#include <QtEvents>
+#include <QSettings>
 
-#include "organiseerrordialog.h"
+#include "core/closure.h"
+#include "core/iconloader.h"
 #include "core/musicstorage.h"
 #include "core/organise.h"
 #include "core/tagreaderclient.h"
 #include "core/utilities.h"
-#include "core/iconloader.h"
+#include "widgets/freespacebar.h"
+#include "widgets/linetextedit.h"
+#include "organisedialog.h"
+#include "organiseerrordialog.h"
+#include "ui_organisedialog.h"
 
 const char *OrganiseDialog::kDefaultFormat = "%artist/%album{ (Disc %disc)}/{%track - }%title.%extension";
 const char *OrganiseDialog::kSettingsGroup = "OrganiseDialog";

src/dialogs/organisedialog.h

@@ -24,23 +24,32 @@
 #include "config.h"
 
 #include <memory>
+#include <stdbool.h>
 
+#include <QtGlobal>
+#include <QObject>
+#include <QWidget>
 #include <QDialog>
+#include <QAbstractItemModel>
 #include <QFuture>
-#include <QMap>
+#include <QList>
+#include <QSize>
+#include <QString>
+#include <QStringList>
 #include <QUrl>
+#include <QtEvents>
 
+#include "core/song.h"
 #include "core/organise.h"
 #include "core/organiseformat.h"
-#include "core/song.h"
 
-class CollectionWatcher;
-class OrganiseErrorDialog;
+class QResizeEvent;
+class QShowEvent;
+
 class TaskManager;
+class OrganiseErrorDialog;
 class Ui_OrganiseDialog;
 
-class QAbstractItemModel;
-
 class OrganiseDialog : public QDialog {
   Q_OBJECT
 
@@ -56,8 +65,7 @@ class OrganiseDialog : public QDialog {
   void SetDestinationModel(QAbstractItemModel *model, bool devices = false);
 
   // These functions return true if any songs were actually added to the dialog.
-  // SetSongs returns immediately, SetUrls and SetFilenames load the songs in
-  // the background.
+  // SetSongs returns immediately, SetUrls and SetFilenames load the songs in the background.
   bool SetSongs(const SongList &songs);
   bool SetUrls(const QList<QUrl> &urls);
   bool SetFilenames(const QStringList &filenames);

src/dialogs/organiseerrordialog.cpp

@@ -20,7 +20,15 @@
 
 #include "config.h"
 
+#include <QWidget>
+#include <QDialog>
+#include <QtAlgorithms>
+#include <QIcon>
+#include <QStyle>
+#include <QStringList>
 #include <QUrl>
+#include <QLabel>
+#include <QListWidget>
 
 #include "organiseerrordialog.h"
 #include "ui_organiseerrordialog.h"

src/dialogs/organiseerrordialog.h

@@ -23,7 +23,11 @@
 
 #include "config.h"
 
+#include <QObject>
 #include <QDialog>
+#include <QWidget>
+#include <QString>
+#include <QStringList>
 
 #include "core/song.h"
 

src/dialogs/trackselectiondialog.cpp

@@ -20,22 +20,39 @@
 
 #include "config.h"
 
+#include <QtConcurrentRun>
+#include <QWidget>
+#include <QDialog>
+#include <QTreeWidgetItem>
+#include <QAbstractItemModel>
+#include <QDialogButtonBox>
 #include <QFileInfo>
+#include <QFuture>
 #include <QFutureWatcher>
+#include <QVariant>
+#include <QUrl>
+#include <QString>
+#include <QStringList>
+#include <QStringBuilder>
+#include <QPalette>
+#include <QFont>
+#include <QKeySequence>
+#include <QListWidget>
+#include <QListWidgetItem>
 #include <QPushButton>
 #include <QShortcut>
+#include <QSplitter>
+#include <QStackedWidget>
 #include <QTreeWidget>
-#include <QUrl>
-#include <QtConcurrentRun>
 #include <QtDebug>
 
+#include "core/iconloader.h"
+#include "core/logging.h"
+#include "core/tagreaderclient.h"
+#include "widgets/busyindicator.h"
 #include "trackselectiondialog.h"
 #include "ui_trackselectiondialog.h"
 
-#include "core/tagreaderclient.h"
-#include "core/iconloader.h"
-
-
 TrackSelectionDialog::TrackSelectionDialog(QWidget *parent)
   : QDialog(parent),
     ui_(new Ui_TrackSelectionDialog),

src/dialogs/trackselectiondialog.h

@@ -21,14 +21,20 @@
 #ifndef TRACKSELECTIONDIALOG_H
 #define TRACKSELECTIONDIALOG_H
 
-#include "config.h"
+#include <stdbool.h>
 
+#include <QObject>
 #include <QDialog>
+#include <QWidget>
+#include <QList>
+#include <QString>
+#include <QTreeWidget>
+#include <QPushButton>
 
+#include "config.h"
 #include "core/song.h"
 
 class Ui_TrackSelectionDialog;
-class QTreeWidget;
 
 class TrackSelectionDialog : public QDialog {
   Q_OBJECT