Reduce includes

src/playlistparsers/asxiniparser.cpp

@@ -18,6 +18,7 @@
  *
  */
 
+#include <QtGlobal>
 #include <QObject>
 #include <QIODevice>
 #include <QByteArray>

src/playlistparsers/asxiniparser.h

@@ -22,17 +22,17 @@
 #define ASXINIPARSER_H
 
 #include <QObject>
-#include <QIODevice>
 #include <QByteArray>
-#include <QDir>
 #include <QString>
 #include <QStringList>
+#include <QDir>
 
 #include "config.h"
 #include "core/song.h"
 #include "parserbase.h"
 #include "playlist/playlist.h"
 
+class QIODevice;
 class CollectionBackendInterface;
 
 class AsxIniParser : public ParserBase {

src/playlistparsers/asxparser.cpp

@@ -18,6 +18,7 @@
  *
  */
 
+#include <QtGlobal>
 #include <QObject>
 #include <QIODevice>
 #include <QBuffer>

src/playlistparsers/asxparser.h

@@ -23,18 +23,19 @@
 
 
 #include <QObject>
-#include <QIODevice>
 #include <QByteArray>
-#include <QDir>
 #include <QString>
 #include <QStringList>
-#include <QXmlStreamReader>
+#include <QDir>
 
 #include "config.h"
 #include "core/song.h"
 #include "playlist/playlist.h"
 #include "xmlparser.h"
 
+class QIODevice;
+class QXmlStreamReader;
+
 class CollectionBackendInterface;
 
 class ASXParser : public XMLParser {

src/playlistparsers/cueparser.h

@@ -23,19 +23,18 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
-#include <QIODevice>
 #include <QByteArray>
-#include <QDir>
 #include <QString>
 #include <QStringList>
+#include <QDir>
 
 #include "core/song.h"
 #include "parserbase.h"
 #include "playlist/playlist.h"
 
+class QIODevice;
 class CollectionBackendInterface;
 
 // This parser will try to detect the real encoding of a .cue file

src/playlistparsers/m3uparser.h

@@ -23,19 +23,18 @@
 
 #include "config.h"
 
-
 #include <QtGlobal>
 #include <QObject>
-#include <QIODevice>
 #include <QByteArray>
-#include <QDir>
 #include <QString>
 #include <QStringList>
+#include <QDir>
 
 #include "core/song.h"
 #include "parserbase.h"
 #include "playlist/playlist.h"
 
+class QIODevice;
 class CollectionBackendInterface;
 
 class M3UParser : public ParserBase {

src/playlistparsers/parserbase.cpp

@@ -26,10 +26,11 @@
 #include <QRegExp>
 #include <QUrl>
 
-#include "collection/collectionbackend.h"
+#include "core/logging.h"
 #include "core/tagreaderclient.h"
-#include "parserbase.h"
+#include "collection/collectionbackend.h"
 #include "playlist/playlist.h"
+#include "parserbase.h"
 
 ParserBase::ParserBase(CollectionBackendInterface *collection, QObject *parent)
     : QObject(parent), collection_(collection) {}

src/playlistparsers/parserbase.h

@@ -21,10 +21,8 @@
 #ifndef PARSERBASE_H
 #define PARSERBASE_H
 
-
 #include <QtGlobal>
 #include <QObject>
-#include <QIODevice>
 #include <QDir>
 #include <QByteArray>
 #include <QString>
@@ -35,6 +33,7 @@
 #include "core/song.h"
 #include "playlist/playlist.h"
 
+class QIODevice;
 class CollectionBackendInterface;
 
 class ParserBase : public QObject {

src/playlistparsers/playlistparser.cpp

@@ -18,6 +18,8 @@
  *
  */
 
+#include <algorithm>
+
 #include <QObject>
 #include <QIODevice>
 #include <QDir>
@@ -27,7 +29,6 @@
 #include <QString>
 #include <QStringBuilder>
 #include <QStringList>
-#include <QtAlgorithms>
 #include <QtDebug>
 
 #include "asxiniparser.h"

src/playlistparsers/playlistparser.h

@@ -22,7 +22,6 @@
 #define PLAYLISTPARSER_H
 
 #include <QObject>
-#include <QIODevice>
 #include <QDir>
 #include <QByteArray>
 #include <QList>
@@ -33,6 +32,7 @@
 #include "core/song.h"
 #include "playlist/playlist.h"
 
+class QIODevice;
 class CollectionBackendInterface;
 class ParserBase;
 

src/playlistparsers/plsparser.h

@@ -21,9 +21,7 @@
 #ifndef PLSPARSER_H
 #define PLSPARSER_H
 
-
 #include <QObject>
-#include <QIODevice>
 #include <QDir>
 #include <QByteArray>
 #include <QString>
@@ -34,6 +32,7 @@
 #include "parserbase.h"
 #include "playlist/playlist.h"
 
+class QIODevice;
 class CollectionBackendInterface;
 
 class PLSParser : public ParserBase {

src/playlistparsers/wplparser.cpp

@@ -18,6 +18,7 @@
  *
  */
 
+#include <QtGlobal>
 #include <QObject>
 #include <QIODevice>
 #include <QDir>

src/playlistparsers/wplparser.h

@@ -22,21 +22,21 @@
 #define WPLPARSER_H
 
 #include <QObject>
-#include <QIODevice>
 #include <QDir>
 #include <QByteArray>
 #include <QString>
 #include <QStringList>
-#include <QXmlStreamReader>
-#include <QXmlStreamWriter>
 
 #include "config.h"
 #include "core/song.h"
 #include "playlist/playlist.h"
 #include "xmlparser.h"
 
-class CollectionBackendInterface;
+class QIODevice;
+class QXmlStreamReader;
+class QXmlStreamWriter;
 
+class CollectionBackendInterface;
 
 class WplParser : public XMLParser {
  public:

src/playlistparsers/xspfparser.h

@@ -23,19 +23,18 @@
 
 #include "config.h"
 
-
 #include <QObject>
-#include <QIODevice>
 #include <QByteArray>
 #include <QDir>
 #include <QString>
 #include <QStringList>
-#include <QXmlStreamReader>
 
 #include "core/song.h"
 #include "playlist/playlist.h"
 #include "xmlparser.h"
 
+class QIODevice;
+class QXmlStreamReader;
 class CollectionBackendInterface;
 
 class XSPFParser : public XMLParser {