Fix includes

src/scrobbler/audioscrobbler.cpp

@@ -19,22 +19,13 @@
 
 #include "config.h"
 
+#include <stdbool.h>
+
 #include <algorithm>
 
 #include <QtGlobal>
-#include <QDesktopServices>
+#include <QString>
-#include <QUrlQuery>
-#include <QCryptographicHash>
-#include <QMenu>
-#include <QMessageBox>
 #include <QSettings>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QJsonParseError>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonValue>
 
 #include "core/application.h"
 #include "core/closure.h"

src/scrobbler/audioscrobbler.h

@@ -22,7 +22,7 @@
 
 #include "config.h"
 
-#include <memory>
+#include <stdbool.h>
 
 #include <QtGlobal>
 #include <QObject>

src/scrobbler/lastfmscrobbler.cpp

@@ -19,27 +19,8 @@
 
 #include "config.h"
 
-#include <algorithm>
-
 #include <QtGlobal>
-#include <QDesktopServices>
+#include <QObject>
-#include <QVariant>
-#include <QByteArray>
-#include <QString>
-#include <QUrl>
-#include <QUrlQuery>
-#include <QDateTime>
-#include <QCryptographicHash>
-#include <QMenu>
-#include <QMessageBox>
-#include <QSettings>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QJsonParseError>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonValue>
 
 #include "core/application.h"
 #include "core/closure.h"

src/scrobbler/lastfmscrobbler.h

@@ -22,17 +22,11 @@
 
 #include "config.h"
 
-#include <memory>
+#include <stdbool.h>
 
 #include <QtGlobal>
 #include <QObject>
-#include <QNetworkReply>
-#include <QPair>
-#include <QList>
-#include <QVariant>
-#include <QByteArray>
 #include <QString>
-#include <QJsonObject>
 
 #include "core/song.h"
 #include "scrobblerservice.h"

src/scrobbler/librefmscrobbler.cpp

@@ -19,27 +19,8 @@
 
 #include "config.h"
 
-#include <algorithm>
-
 #include <QtGlobal>
-#include <QDesktopServices>
+#include <QObject>
-#include <QVariant>
-#include <QByteArray>
-#include <QString>
-#include <QUrl>
-#include <QUrlQuery>
-#include <QDateTime>
-#include <QCryptographicHash>
-#include <QMenu>
-#include <QMessageBox>
-#include <QSettings>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QJsonParseError>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonValue>
 
 #include "core/application.h"
 #include "core/closure.h"

src/scrobbler/librefmscrobbler.h

@@ -22,17 +22,11 @@
 
 #include "config.h"
 
-#include <memory>
+#include <stdbool.h>
 
 #include <QtGlobal>
 #include <QObject>
-#include <QNetworkReply>
-#include <QPair>
-#include <QList>
-#include <QVariant>
-#include <QByteArray>
 #include <QString>
-#include <QJsonObject>
 
 #include "core/song.h"
 #include "scrobblerservice.h"

src/scrobbler/listenbrainzscrobbler.cpp

@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include <algorithm>
+#include <stdbool.h>
 
 #include <QtGlobal>
 #include <QDesktopServices>
@@ -29,8 +29,6 @@
 #include <QUrl>
 #include <QUrlQuery>
 #include <QDateTime>
-#include <QCryptographicHash>
-#include <QMenu>
 #include <QMessageBox>
 #include <QSettings>
 #include <QNetworkRequest>

src/scrobbler/listenbrainzscrobbler.h

@@ -22,17 +22,16 @@
 
 #include "config.h"
 
-#include <memory>
+#include <stdbool.h>
 
 #include <QtGlobal>
 #include <QObject>
 #include <QNetworkReply>
-#include <QPair>
 #include <QList>
 #include <QVariant>
 #include <QByteArray>
 #include <QString>
-#include <QJsonObject>
+#include <QJsonDocument>
 
 #include "core/song.h"
 #include "scrobblerservice.h"

src/scrobbler/scrobblercache.cpp

@@ -19,16 +19,17 @@
 
 #include "config.h"
 
+#include <stdbool.h>
+
 #include <QObject>
 #include <QStandardPaths>
 #include <QString>
 #include <QFile>
 #include <QIODevice>
 #include <QTextStream>
-#include <QDateTime>
+#include <QHash>
-#include <QMultiHash>
-#include <QJsonValue>
 #include <QJsonDocument>
+#include <QJsonValue>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonParseError>
@@ -145,7 +146,7 @@ void ScrobblerCache::WriteCache() {
 
   QJsonArray array;
 
-  QMultiHash <quint64, ScrobblerCacheItem*> ::iterator i;
+  QHash <quint64, ScrobblerCacheItem*> ::iterator i;
   for (i = scrobbler_cache_.begin() ; i != scrobbler_cache_.end() ; ++i) {
     ScrobblerCacheItem *item = i.value();
     QJsonObject object;

src/scrobbler/scrobblercache.h

@@ -28,7 +28,6 @@
 #include <QList>
 #include <QHash>
 #include <QString>
-#include <QDateTime>
 
 class Application;
 class Song;

src/scrobbler/scrobblercacheitem.cpp

@@ -22,7 +22,6 @@
 #include <QObject>
 #include <QtGlobal>
 #include <QString>
-#include <QHash>
 
 #include "scrobblercacheitem.h"
 

src/scrobbler/scrobblercacheitem.h

@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include <stdbool.h>
+
 #include <QtGlobal>
 #include <QObject>
 #include <QString>

src/scrobbler/scrobblerservice.cpp

@@ -24,6 +24,7 @@
 #include <QByteArray>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QJsonParseError>
 
 #include "scrobblerservice.h"
 

src/scrobbler/scrobblerservice.h

@@ -25,10 +25,11 @@
 #include <stdbool.h>
 
 #include <QObject>
-#include <QString>
+#include <QPair>
+#include <QList>
 #include <QVariant>
 #include <QByteArray>
-#include <QJsonDocument>
+#include <QString>
 #include <QJsonObject>
 
 class Application;

src/scrobbler/scrobblingapi20.cpp

@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include <algorithm>
+#include <stdbool.h>
 
 #include <QtGlobal>
 #include <QApplication>

src/scrobbler/scrobblingapi20.h

@@ -22,17 +22,15 @@
 
 #include "config.h"
 
-#include <memory>
+#include <stdbool.h>
 
 #include <QtGlobal>
 #include <QObject>
 #include <QNetworkReply>
-#include <QPair>
 #include <QList>
 #include <QVariant>
 #include <QByteArray>
 #include <QString>
-#include <QJsonObject>
 
 #include "core/song.h"
 #include "scrobblerservice.h"

src/settings/scrobblersettingspage.cpp

@@ -20,7 +20,7 @@
 #include "scrobblersettingspage.h"
 #include "ui_scrobblersettingspage.h"
 
-#include <QDesktopServices>
+#include <QObject>
 #include <QMessageBox>
 #include <QSettings>
 

src/settings/scrobblersettingspage.h

@@ -22,6 +22,9 @@
 
 #include "settingspage.h"
 
+#include <QObject>
+#include <QString>
+
 class Ui_ScrobblerSettingsPage;
 class AudioScrobbler;
 class LastFMScrobbler;