From d487351d5ca35a4670a34ab8da66b09c3b69520a Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Wed, 26 Dec 2018 15:05:32 +0100
Subject: [PATCH] Fix includes

---
 src/scrobbler/audioscrobbler.cpp        | 15 +++------------
 src/scrobbler/audioscrobbler.h          |  2 +-
 src/scrobbler/lastfmscrobbler.cpp       | 21 +--------------------
 src/scrobbler/lastfmscrobbler.h         |  8 +-------
 src/scrobbler/librefmscrobbler.cpp      | 21 +--------------------
 src/scrobbler/librefmscrobbler.h        |  8 +-------
 src/scrobbler/listenbrainzscrobbler.cpp |  4 +---
 src/scrobbler/listenbrainzscrobbler.h   |  5 ++---
 src/scrobbler/scrobblercache.cpp        |  9 +++++----
 src/scrobbler/scrobblercache.h          |  1 -
 src/scrobbler/scrobblercacheitem.cpp    |  1 -
 src/scrobbler/scrobblercacheitem.h      |  2 ++
 src/scrobbler/scrobblerservice.cpp      |  1 +
 src/scrobbler/scrobblerservice.h        |  5 +++--
 src/scrobbler/scrobblingapi20.cpp       |  2 +-
 src/scrobbler/scrobblingapi20.h         |  4 +---
 src/settings/scrobblersettingspage.cpp  |  2 +-
 src/settings/scrobblersettingspage.h    |  3 +++
 18 files changed, 28 insertions(+), 86 deletions(-)

diff --git a/src/scrobbler/audioscrobbler.cpp b/src/scrobbler/audioscrobbler.cpp
index 7edec606b..5a54571a9 100644
--- a/src/scrobbler/audioscrobbler.cpp
+++ b/src/scrobbler/audioscrobbler.cpp
@@ -19,22 +19,13 @@
 
 #include "config.h"
 
+#include <stdbool.h>
+
 #include <algorithm>
 
 #include <QtGlobal>
-#include <QDesktopServices>
-#include <QUrlQuery>
-#include <QCryptographicHash>
-#include <QMenu>
-#include <QMessageBox>
+#include <QString>
 #include <QSettings>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QJsonParseError>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonValue>
 
 #include "core/application.h"
 #include "core/closure.h"
diff --git a/src/scrobbler/audioscrobbler.h b/src/scrobbler/audioscrobbler.h
index 3b243972d..4ed41f600 100644
--- a/src/scrobbler/audioscrobbler.h
+++ b/src/scrobbler/audioscrobbler.h
@@ -22,7 +22,7 @@
 
 #include "config.h"
 
-#include <memory>
+#include <stdbool.h>
 
 #include <QtGlobal>
 #include <QObject>
diff --git a/src/scrobbler/lastfmscrobbler.cpp b/src/scrobbler/lastfmscrobbler.cpp
index 7b3405b87..c93abe166 100644
--- a/src/scrobbler/lastfmscrobbler.cpp
+++ b/src/scrobbler/lastfmscrobbler.cpp
@@ -19,27 +19,8 @@
 
 #include "config.h"
 
-#include <algorithm>
-
 #include <QtGlobal>
-#include <QDesktopServices>
-#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 <QObject>
 
 #include "core/application.h"
 #include "core/closure.h"
diff --git a/src/scrobbler/lastfmscrobbler.h b/src/scrobbler/lastfmscrobbler.h
index c54fb47ee..a21fabc79 100644
--- a/src/scrobbler/lastfmscrobbler.h
+++ b/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"
diff --git a/src/scrobbler/librefmscrobbler.cpp b/src/scrobbler/librefmscrobbler.cpp
index 744c7ed31..fe41615df 100644
--- a/src/scrobbler/librefmscrobbler.cpp
+++ b/src/scrobbler/librefmscrobbler.cpp
@@ -19,27 +19,8 @@
 
 #include "config.h"
 
-#include <algorithm>
-
 #include <QtGlobal>
-#include <QDesktopServices>
-#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 <QObject>
 
 #include "core/application.h"
 #include "core/closure.h"
diff --git a/src/scrobbler/librefmscrobbler.h b/src/scrobbler/librefmscrobbler.h
index a1dab1e43..a34eab006 100644
--- a/src/scrobbler/librefmscrobbler.h
+++ b/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"
diff --git a/src/scrobbler/listenbrainzscrobbler.cpp b/src/scrobbler/listenbrainzscrobbler.cpp
index 2bf0ba28a..f81e5e59b 100644
--- a/src/scrobbler/listenbrainzscrobbler.cpp
+++ b/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>
diff --git a/src/scrobbler/listenbrainzscrobbler.h b/src/scrobbler/listenbrainzscrobbler.h
index d5b5837eb..6b58f284b 100644
--- a/src/scrobbler/listenbrainzscrobbler.h
+++ b/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"
diff --git a/src/scrobbler/scrobblercache.cpp b/src/scrobbler/scrobblercache.cpp
index e33ca1d7e..c53084523 100644
--- a/src/scrobbler/scrobblercache.cpp
+++ b/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 <QMultiHash>
-#include <QJsonValue>
+#include <QHash>
 #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;
diff --git a/src/scrobbler/scrobblercache.h b/src/scrobbler/scrobblercache.h
index c9365476e..233f8e797 100644
--- a/src/scrobbler/scrobblercache.h
+++ b/src/scrobbler/scrobblercache.h
@@ -28,7 +28,6 @@
 #include <QList>
 #include <QHash>
 #include <QString>
-#include <QDateTime>
 
 class Application;
 class Song;
diff --git a/src/scrobbler/scrobblercacheitem.cpp b/src/scrobbler/scrobblercacheitem.cpp
index 09d10b9e2..5c32459b3 100644
--- a/src/scrobbler/scrobblercacheitem.cpp
+++ b/src/scrobbler/scrobblercacheitem.cpp
@@ -22,7 +22,6 @@
 #include <QObject>
 #include <QtGlobal>
 #include <QString>
-#include <QHash>
 
 #include "scrobblercacheitem.h"
 
diff --git a/src/scrobbler/scrobblercacheitem.h b/src/scrobbler/scrobblercacheitem.h
index b8a339410..48a98d146 100644
--- a/src/scrobbler/scrobblercacheitem.h
+++ b/src/scrobbler/scrobblercacheitem.h
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include <stdbool.h>
+
 #include <QtGlobal>
 #include <QObject>
 #include <QString>
diff --git a/src/scrobbler/scrobblerservice.cpp b/src/scrobbler/scrobblerservice.cpp
index cce36e5b7..482214dd5 100644
--- a/src/scrobbler/scrobblerservice.cpp
+++ b/src/scrobbler/scrobblerservice.cpp
@@ -24,6 +24,7 @@
 #include <QByteArray>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QJsonParseError>
 
 #include "scrobblerservice.h"
 
diff --git a/src/scrobbler/scrobblerservice.h b/src/scrobbler/scrobblerservice.h
index 62cfe65ca..2b59c31b4 100644
--- a/src/scrobbler/scrobblerservice.h
+++ b/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;
diff --git a/src/scrobbler/scrobblingapi20.cpp b/src/scrobbler/scrobblingapi20.cpp
index 9d6f52f1c..6c07870c7 100644
--- a/src/scrobbler/scrobblingapi20.cpp
+++ b/src/scrobbler/scrobblingapi20.cpp
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include <algorithm>
+#include <stdbool.h>
 
 #include <QtGlobal>
 #include <QApplication>
diff --git a/src/scrobbler/scrobblingapi20.h b/src/scrobbler/scrobblingapi20.h
index 1eb9a7993..588e95bd6 100644
--- a/src/scrobbler/scrobblingapi20.h
+++ b/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"
diff --git a/src/settings/scrobblersettingspage.cpp b/src/settings/scrobblersettingspage.cpp
index d5c8a89d5..f88cdeb1b 100644
--- a/src/settings/scrobblersettingspage.cpp
+++ b/src/settings/scrobblersettingspage.cpp
@@ -20,7 +20,7 @@
 #include "scrobblersettingspage.h"
 #include "ui_scrobblersettingspage.h"
 
-#include <QDesktopServices>
+#include <QObject>
 #include <QMessageBox>
 #include <QSettings>
 
diff --git a/src/settings/scrobblersettingspage.h b/src/settings/scrobblersettingspage.h
index 13f916f15..2f48b81e1 100644
--- a/src/settings/scrobblersettingspage.h
+++ b/src/settings/scrobblersettingspage.h
@@ -22,6 +22,9 @@
 
 #include "settingspage.h"
 
+#include <QObject>
+#include <QString>
+
 class Ui_ScrobblerSettingsPage;
 class AudioScrobbler;
 class LastFMScrobbler;