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/settings/appearancesettingspage.cpp

@@ -18,26 +18,29 @@
  * 
  */
 
-#include "config.h"
-
 #include <QApplication>
+#include <QWidget>
+#include <QVariant>
+#include <QString>
+#include <QStringBuilder>
+#include <QPalette>
 #include <QColorDialog>
 #include <QFileDialog>
-#include <QPainter>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QSlider>
 #include <QSettings>
 
 #include "appearancesettingspage.h"
-#include "ui_appearancesettingspage.h"
-
-#include "settingsdialog.h"
-
-#include "core/application.h"
-#include "core/mainwindow.h"
 #include "core/appearance.h"
-#include "core/logging.h"
 #include "core/iconloader.h"
 #include "playlist/playlistview.h"
 #include "covermanager/albumcoverchoicecontroller.h"
+#include "settingspage.h"
+#include "settingsdialog.h"
+#include "ui_appearancesettingspage.h"
 
 const char *AppearanceSettingsPage::kSettingsGroup = "Appearance";
 
@@ -223,8 +226,6 @@ void AppearanceSettingsPage::UpdateColorSelectorColor(QWidget *color_selector, c
 
 void AppearanceSettingsPage::SelectBackgroundImage() {
 
-  //qLog(Debug) << __PRETTY_FUNCTION__;
-
   QString selected_filename = QFileDialog::getOpenFileName(this, tr("Select background image"), playlist_view_background_image_filename_, tr(AlbumCoverChoiceController::kLoadImageFileFilter) + ";;" + tr(AlbumCoverChoiceController::kAllFilesFilter));
   if (selected_filename.isEmpty()) return;
   playlist_view_background_image_filename_ = selected_filename;

src/settings/appearancesettingspage.h

@@ -23,12 +23,17 @@
 
 #include "config.h"
 
-#include "settingspage.h"
+#include <stdbool.h>
+
+#include <QObject>
+#include <QWidget>
+#include <QString>
+#include <QColor>
 
 #include "playlist/playlistview.h"
+#include "settingspage.h"
 
-class QWidget;
-
+class SettingsDialog;
 class Ui_AppearanceSettingsPage;
 
 class AppearanceSettingsPage : public SettingsPage {

src/settings/backendsettingspage.cpp

@@ -19,30 +19,41 @@
 
 #include "config.h"
 
-#include "backendsettingspage.h"
-#include "ui_backendsettingspage.h"
-
+#include <QtGlobal>
+#include <QSettings>
 #include <QVariant>
 #include <QString>
-#include <QSettings>
+#include <QStringBuilder>
+#include <QFontMetrics>
+#include <QGroupBox>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QSlider>
+#include <QSpinBox>
+#include <QLabel>
+
+#include "backendsettingspage.h"
 
-#include "settingsdialog.h"
 #include "core/application.h"
-#include "core/player.h"
-#include "core/logging.h"
-#include "core/utilities.h"
 #include "core/iconloader.h"
-#include "engine/enginetype.h"
+#include "core/player.h"
+#include "engine/engine_fwd.h"
 #include "engine/enginebase.h"
+#include "engine/enginedevice.h"
+#include "engine/enginetype.h"
+#include "engine/devicefinder.h"
 #ifdef HAVE_GSTREAMER
-#include "engine/gstengine.h"
+#  include "engine/gstengine.h"
 #endif
 #ifdef HAVE_XINE
-#include "engine/xineengine.h"
+#  include "engine/xineengine.h"
 #endif
-#include "engine/devicefinder.h"
-
+#include "widgets/lineedit.h"
+#include "widgets/stickyslider.h"
 #include "dialogs/errordialog.h"
+#include "settings/settingspage.h"
+#include "settingsdialog.h"
+#include "ui_backendsettingspage.h"
 
 const char *BackendSettingsPage::kSettingsGroup = "Backend";
 const char *BackendSettingsPage::EngineText_Xine = "Xine";
@@ -491,12 +502,14 @@ void BackendSettingsPage::DeviceSelectionChanged(int index) {
     return;
   }
 
+#if !defined(Q_OS_WIN32)
   QVariant device = ui_->combobox_device->itemData(index).value<QVariant>();
   if (device.type() == QVariant::String) {
     ui_->lineedit_device->setEnabled(true);
     ui_->lineedit_device->setText(device.toString());
     return;
   }
+#endif
 
   ui_->lineedit_device->setEnabled(false);
   ui_->lineedit_device->setText("");
@@ -513,7 +526,7 @@ void BackendSettingsPage::DeviceStringChanged() {
       return;
     }
   }
-  
+
   // Assume this is a custom alsa device string
 
   if (ui_->combobox_device->currentText() != "Custom") {

src/settings/backendsettingspage.h

@@ -22,18 +22,18 @@
 
 #include "config.h"
 
+#include <stdbool.h>
+
+#include <QObject>
+#include <QVariant>
 #include <QString>
 #include <QSettings>
 
-#include "backendsettingspage.h"
-
+#include "engine/enginetype.h"
+#include "dialogs/errordialog.h"
 #include "settingspage.h"
 
-#include "engine/engine_fwd.h"
-#include "engine/enginetype.h"
-
-#include "dialogs/errordialog.h"
-
+class SettingsDialog;
 class Ui_BackendSettingsPage;
 
 class BackendSettingsPage : public SettingsPage {

src/settings/behavioursettingspage.cpp

@@ -20,14 +20,20 @@
 
 #include "config.h"
 
-#include <QDir>
-
-#include "behavioursettingspage.h"
+#include <QVariant>
+#include <QSettings>
+#include <QCheckBox>
+#include <QRadioButton>
+#include <QSpinBox>
 
 #include "core/iconloader.h"
 #include "core/mainwindow.h"
+#include "settings/settingspage.h"
+#include "behavioursettingspage.h"
 #include "ui_behavioursettingspage.h"
 
+class SettingsDialog;
+
 const char *BehaviourSettingsPage::kSettingsGroup = "Behaviour";
 
 BehaviourSettingsPage::BehaviourSettingsPage(SettingsDialog *dialog) : SettingsPage(dialog), ui_(new Ui_BehaviourSettingsPage) {

src/settings/behavioursettingspage.h

@@ -23,10 +23,14 @@
 
 #include "config.h"
 
+#include <stdbool.h>
+
+#include <QObject>
+#include <QString>
+
 #include "settingspage.h"
 
-#include <QMap>
-
+class SettingsDialog;
 class Ui_BehaviourSettingsPage;
 
 class BehaviourSettingsPage : public SettingsPage {

src/settings/collectionsettingspage.cpp

@@ -20,25 +20,26 @@
 
 #include "config.h"
 
-#include <QDir>
-#include <QFileDialog>
-#include <QSettings>
-#include <QtConcurrentRun>
 #include <QStandardPaths>
+#include <QAbstractItemModel>
+#include <QItemSelectionModel>
+#include <QVariant>
+#include <QString>
+#include <QStringList>
+#include <QFileDialog>
+#include <QCheckBox>
+#include <QLineEdit>
+#include <QListView>
+#include <QPushButton>
+#include <QSettings>
 
-#include "collectionsettingspage.h"
-#include "ui_collectionsettingspage.h"
-
-#include "settings/settingsdialog.h"
-#include "core/application.h"
 #include "core/iconloader.h"
-#include "playlist/playlistdelegates.h"
-
-#include "collection/collectionbackend.h"
 #include "collection/collectiondirectorymodel.h"
-#include "collection/collectionmodel.h"
-#include "collection/collectionview.h"
-#include "collection/collectionwatcher.h"
+#include "collectionsettingspage.h"
+#include "playlist/playlistdelegates.h"
+#include "settings/settingsdialog.h"
+#include "settings/settingspage.h"
+#include "ui_collectionsettingspage.h"
 
 const char *CollectionSettingsPage::kSettingsGroup = "Collection";
 

src/settings/collectionsettingspage.h

@@ -23,13 +23,17 @@
 
 #include "config.h"
 
+#include <stdbool.h>
+#include <QObject>
+#include <QString>
+
 #include "settingspage.h"
 
-class Ui_CollectionSettingsPage;
-class CollectionDirectoryModel;
-
 class QModelIndex;
 
+class SettingsDialog;
+class Ui_CollectionSettingsPage;
+
 class CollectionSettingsPage : public SettingsPage {
   Q_OBJECT
 

src/settings/networkproxysettingspage.cpp

@@ -20,13 +20,24 @@
 
 #include "config.h"
 
-#include "networkproxysettingspage.h"
-#include "ui_networkproxysettingspage.h"
+#include <stdbool.h>
+
+#include <QVariant>
+#include <QSettings>
+#include <QNetworkProxy>
+#include <QComboBox>
+#include <QGroupBox>
+#include <QLineEdit>
+#include <QRadioButton>
+#include <QSpinBox>
 
 #include "core/iconloader.h"
 #include "core/networkproxyfactory.h"
+#include "networkproxysettingspage.h"
+#include "settings/settingspage.h"
+#include "ui_networkproxysettingspage.h"
 
-#include <QSettings>
+class SettingsDialog;
 
 const char *NetworkProxySettingsPage::kSettingsGroup = "NetworkProxy";
 

src/settings/networkproxysettingspage.h

@@ -23,8 +23,12 @@
 
 #include "config.h"
 
+#include <QObject>
+#include <QString>
+
 #include "settingspage.h"
 
+class SettingsDialog;
 class Ui_NetworkProxySettingsPage;
 
 class NetworkProxySettingsPage : public SettingsPage {

src/settings/notificationssettingspage.cpp

@@ -20,17 +20,40 @@
 
 #include "config.h"
 
+#include <QtGlobal>
+#include <QAction>
+#include <QVariant>
+#include <QImage>
+#include <QColor>
+#include <QMenu>
+#include <QFont>
+#include <QFontDialog>
+#include <QCursor>
+#include <QGroupBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QColorDialog>
+#include <QComboBox>
+#include <QCheckBox>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QSlider>
+#include <QSpinBox>
+#include <QToolButton>
+#include <QToolTip>
+#include <QtEvents>
+#include <QSettings>
+
+#include "core/iconloader.h"
+#include "widgets/osd.h"
+#include "widgets/osdpretty.h"
+#include "settingspage.h"
+#include "settingsdialog.h"
 #include "notificationssettingspage.h"
 #include "ui_notificationssettingspage.h"
 
-#include "settingsdialog.h"
-#include "core/iconloader.h"
-#include "widgets/osdpretty.h"
-
-#include <QColorDialog>
-#include <QFontDialog>
-#include <QMenu>
-#include <QToolTip>
+class QHideEvent;
+class QShowEvent;
 
 const char *NotificationsSettingsPage::kSettingsGroup = "Notifications";
 
@@ -45,7 +68,7 @@ NotificationsSettingsPage::NotificationsSettingsPage(SettingsDialog* dialog)
   ui_->notifications_bg_preset->setItemData(1, QColor(OSDPretty::kPresetOrange), Qt::DecorationRole);
 
   // Create and populate the helper menus
-  QMenu* menu = new QMenu(this);
+  QMenu *menu = new QMenu(this);
   menu->addAction(ui_->action_artist);
   menu->addAction(ui_->action_album);
   menu->addAction(ui_->action_title);

src/settings/notificationssettingspage.h

@@ -23,8 +23,19 @@
 
 #include "config.h"
 
+#include <stdbool.h>
+#include <QObject>
+#include <QString>
+#include <QAction>
+#include <QtEvents>
+
 #include "settingspage.h"
 
+class QHideEvent;
+class QShowEvent;
+
+class OSDPretty;
+class SettingsDialog;
 class Ui_NotificationsSettingsPage;
 
 class NotificationsSettingsPage : public SettingsPage {

src/settings/playbacksettingspage.cpp

@@ -20,12 +20,21 @@
 
 #include "config.h"
 
+#include <stdbool.h>
+
+#include <QWidget>
+#include <QVariant>
+#include <QString>
+#include <QSettings>
+#include <QCheckBox>
+#include <QSpinBox>
+
+#include "core/iconloader.h"
+#include "settingspage.h"
 #include "playbacksettingspage.h"
 #include "ui_playbacksettingspage.h"
 
-#include "core/iconloader.h"
-#include "settingsdialog.h"
-#include "playlist/playlist.h"
+class SettingsDialog;
 
 const char *PlaybackSettingsPage::kSettingsGroup = "Playback";
 

src/settings/playbacksettingspage.h

@@ -23,8 +23,12 @@
 
 #include "config.h"
 
+#include <QObject>
+#include <QString>
+
 #include "settingspage.h"
 
+class SettingsDialog;
 class Ui_PlaybackSettingsPage;
 
 class PlaybackSettingsPage : public SettingsPage {

src/settings/playlistsettingspage.cpp

@@ -20,16 +20,22 @@
 
 #include "config.h"
 
-#include <QDir>
+#include <stdbool.h>
 
-#include "playlistsettingspage.h"
+#include <QVariant>
+#include <QSettings>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QRadioButton>
 
-#include "core/mainwindow.h"
 #include "core/iconloader.h"
-#include "ui_playlistsettingspage.h"
+#include "core/mainwindow.h"
 #include "playlist/playlist.h"
-#include "playlist/playlisttabbar.h"
-#include "settings/playlistsettingspage.h"
+#include "settingspage.h"
+#include "playlistsettingspage.h"
+#include "ui_playlistsettingspage.h"
+
+class SettingsDialog;
 
 const char *PlaylistSettingsPage::kSettingsGroup = "Playlist";
 

src/settings/playlistsettingspage.h

@@ -23,10 +23,12 @@
 
 #include "config.h"
 
+#include <QObject>
+#include <QString>
+
 #include "settingspage.h"
 
-#include <QMap>
-
+class SettingsDialog;
 class Ui_PlaylistSettingsPage;
 
 class PlaylistSettingsPage : public SettingsPage {

src/settings/settingsdialog.cpp

@@ -20,40 +20,48 @@
 
 #include "config.h"
 
-#include <QAbstractButton>
+#include <QObject>
+#include <QWidget>
+#include <QApplication>
+#include <QAbstractItemModel>
+#include <QAbstractItemView>
 #include <QDesktopWidget>
+#include <QVariant>
+#include <QString>
+#include <QStringBuilder>
+#include <QIcon>
 #include <QPainter>
+#include <QFlags>
+#include <QFrame>
+#include <QKeySequence>
+#include <QLabel>
+#include <QLayout>
+#include <QRect>
+#include <QDialogButtonBox>
 #include <QPushButton>
 #include <QScrollArea>
+#include <QStackedWidget>
+#include <QTreeWidget>
+
+#include "core/application.h"
+#include "widgets/groupediconview.h"
+#include "collection/collectionmodel.h"
 
 #include "settingsdialog.h"
-
+#include "settingspage.h"
+#include "appearancesettingspage.h"
+#include "backendsettingspage.h"
 #include "behavioursettingspage.h"
 #include "collectionsettingspage.h"
-#include "backendsettingspage.h"
+#include "networkproxysettingspage.h"
+#include "notificationssettingspage.h"
 #include "playbacksettingspage.h"
 #include "playlistsettingspage.h"
 #include "shortcutssettingspage.h"
 #include "transcodersettingspage.h"
-#include "appearancesettingspage.h"
-#include "networkproxysettingspage.h"
-#include "notificationssettingspage.h"
-
-#include "core/application.h"
-#include "core/mainwindow.h"
-#include "core/player.h"
-#include "core/logging.h"
-#include "core/networkproxyfactory.h"
-#include "core/player.h"
-#include "core/iconloader.h"
-#include "engine/enginebase.h"
-#include "engine/gstengine.h"
-#include "playlist/playlistview.h"
-#include "widgets/groupediconview.h"
-#include "widgets/osdpretty.h"
-
 #include "ui_settingsdialog.h"
 
+class QShowEvent;
 
 SettingsItemDelegate::SettingsItemDelegate(QObject *parent)
   : QStyledItemDelegate(parent)
@@ -154,7 +162,7 @@ void SettingsDialog::AddPage(Page id, SettingsPage *page, QTreeWidgetItem *paren
   if (!parent) parent = ui_->list->invisibleRootItem();
 
   // Connect page's signals to the settings dialog's signals
-  connect(page, SIGNAL(NotificationPreview(OSD::Behaviour,QString,QString)), SIGNAL(NotificationPreview(OSD::Behaviour,QString,QString)));
+  connect(page, SIGNAL(NotificationPreview(OSD::Behaviour, QString, QString)), SIGNAL(NotificationPreview(OSD::Behaviour, QString, QString)));
 
   // Create the list item
   QTreeWidgetItem *item = new QTreeWidgetItem;

src/settings/settingsdialog.h

@@ -23,25 +23,32 @@
 
 #include "config.h"
 
+#include <stdbool.h>
+#include <QObject>
+#include <QWidget>
 #include <QDialog>
+#include <QMap>
+#include <QSize>
+#include <QString>
+#include <QPainter>
+#include <QStyleOption>
 #include <QStyledItemDelegate>
+#include <QAbstractButton>
+#include <QScrollArea>
+#include <QTreeWidgetItem>
 
 #include "widgets/osd.h"
 
-class QAbstractButton;
-class QScrollArea;
-class QTreeWidgetItem;
+class QModelIndex;
+class QShowEvent;
 
-class Application;
-class Player;
 class Appearance;
-class GlobalShortcuts;
+class Application;
 class CollectionDirectoryModel;
+class GlobalShortcuts;
 class SettingsPage;
-class Ui_MainWindow;
-class Ui_SettingsDialog;
 
-class GstEngine;
+class Ui_SettingsDialog;
 
 
 class SettingsItemDelegate : public QStyledItemDelegate {
@@ -81,11 +88,8 @@ public:
   bool is_loading_settings() const { return loading_settings_; }
 
   Application *app() const { return app_; }
-  //Player *player() const { return player_; }
   CollectionDirectoryModel *collection_directory_model() const { return model_; }
   GlobalShortcuts *global_shortcuts_manager() const { return manager_; }
-  //const EngineBase *engine() const { return engine_; }
-  //const GstEngine *gst_engine() const { return gst_engine_; }
   Appearance *appearance() const { return appearance_; }
 
   void OpenAtPage(Page page);
@@ -118,15 +122,11 @@ private:
 
 private:
   Application *app_;
-  //Player *player_;
   CollectionDirectoryModel *model_;
   GlobalShortcuts *manager_;
-  //const EngineBase *engine_;
   Appearance *appearance_;
-  //const GstEngine *gst_engine_;
 
   Ui_SettingsDialog *ui_;
-  //Ui_MainWindow *mui_;
   bool loading_settings_;
 
   QMap<Page, PageData> pages_;

src/settings/settingspage.cpp

@@ -18,7 +18,7 @@
  * 
  */
 
-#include "config.h"
+#include <QWidget>
 
 #include "settingsdialog.h"
 #include "settingspage.h"

src/settings/settingspage.h

@@ -23,7 +23,11 @@
 
 #include "config.h"
 
+#include <stdbool.h>
+
+#include <QObject>
 #include <QWidget>
+#include <QString>
 
 #include "widgets/osd.h"
 
@@ -33,7 +37,7 @@ class SettingsPage : public QWidget {
   Q_OBJECT
 
 public:
-  SettingsPage(SettingsDialog* dialog);
+  SettingsPage(SettingsDialog *dialog);
 
   // Return false to grey out the page's item in the list.
   virtual bool IsEnabled() const { return true; }

src/settings/shortcutssettingspage.cpp

@@ -20,24 +20,31 @@
 
 #include "config.h"
 
-#include <QKeyEvent>
+#include <QtGlobal>
+#include <QWidget>
+#include <QVariant>
+#include <QStringList>
+#include <QAction>
+#include <QHeaderView>
 #include <QMessageBox>
 #include <QProcess>
-#include <QPushButton>
-#include <QSettings>
+#include <QTreeWidget>
+#include <QKeySequence>
 #include <QShortcut>
-#include <QtDebug>
+#include <QSettings>
+#include <QCheckBox>
+#include <QGroupBox>
+#include <QPushButton>
+#include <QRadioButton>
 
+#include "core/iconloader.h"
+#include "globalshortcuts/globalshortcutgrabber.h"
+#include "globalshortcuts/globalshortcuts.h"
+#include "settingspage.h"
+#include "settingsdialog.h"
 #include "shortcutssettingspage.h"
 #include "ui_shortcutssettingspage.h"
 
-#include "globalshortcuts/globalshortcuts.h"
-#include "globalshortcuts/globalshortcutgrabber.h"
-#include "core/logging.h"
-#include "core/utilities.h"
-#include "core/iconloader.h"
-#include "settings/settingsdialog.h"
-
 const char *GlobalShortcutsSettingsPage::kSettingsGroup = "GlobalShortcuts";
 
 GlobalShortcutsSettingsPage::GlobalShortcutsSettingsPage(SettingsDialog *dialog)

src/settings/shortcutssettingspage.h

@@ -24,17 +24,21 @@
 #include "config.h"
 
 #include <memory>
+#include <stdbool.h>
 
-#include <QMap>
+#include <QObject>
 #include <QSettings>
+#include <QMap>
+#include <QString>
+#include <QKeySequence>
+#include <QTreeWidgetItem>
 
 #include "globalshortcuts/globalshortcuts.h"
-#include "settings/settingspage.h"
+#include "settingspage.h"
 
-class QTreeWidgetItem;
-
-class Ui_GlobalShortcutsSettingsPage;
 class GlobalShortcutGrabber;
+class SettingsDialog;
+class Ui_GlobalShortcutsSettingsPage;
 
 class GlobalShortcutsSettingsPage : public SettingsPage {
   Q_OBJECT

src/settings/transcodersettingspage.cpp

@@ -20,10 +20,19 @@
 
 #include "config.h"
 
+#include "core/iconloader.h"
+#include "settingspage.h"
+#include "transcoder/transcoderoptionsaac.h"
+#include "transcoder/transcoderoptionsflac.h"
+#include "transcoder/transcoderoptionsmp3.h"
+#include "transcoder/transcoderoptionsopus.h"
+#include "transcoder/transcoderoptionsspeex.h"
+#include "transcoder/transcoderoptionsvorbis.h"
+#include "transcoder/transcoderoptionswma.h"
 #include "transcodersettingspage.h"
 #include "ui_transcodersettingspage.h"
 
-#include "core/iconloader.h"
+class SettingsDialog;
 
 TranscoderSettingsPage::TranscoderSettingsPage(SettingsDialog* dialog)
     : SettingsPage(dialog), ui_(new Ui_TranscoderSettingsPage) {

src/settings/transcodersettingspage.h

@@ -23,8 +23,12 @@
 
 #include "config.h"
 
+#include <QObject>
+#include <QString>
+
 #include "settingspage.h"
 
+class SettingsDialog;
 class Ui_TranscoderSettingsPage;
 
 class TranscoderSettingsPage : public SettingsPage {