Remove redundant includes

src/playlist/playlist.cpp

@@ -54,7 +54,6 @@
 #include <QLinkedList>
 #include <QUndoStack>
 #include <QUndoCommand>
-#include <QModelIndex>
 #include <QAbstractListModel>
 #include <QPersistentModelIndex>
 #include <QMutableListIterator>

src/playlist/playlist.h

@@ -27,6 +27,10 @@
 
 #include <QtGlobal>
 #include <QObject>
+#include <QAbstractItemModel>
+#include <QAbstractListModel>
+#include <QSortFilterProxyModel>
+#include <QPersistentModelIndex>
 #include <QFuture>
 #include <QList>
 #include <QMap>
@@ -37,11 +41,6 @@
 #include <QStringList>
 #include <QUrl>
 #include <QColor>
-#include <QModelIndex>
-#include <QAbstractItemModel>
-#include <QAbstractListModel>
-#include <QSortFilterProxyModel>
-#include <QPersistentModelIndex>
 #include <QUndoStack>
 
 #include "core/song.h"

src/playlist/playlistcontainer.cpp

@@ -21,6 +21,8 @@
 #include <QApplication>
 #include <QObject>
 #include <QWidget>
+#include <QItemSelectionModel>
+#include <QSortFilterProxyModel>
 #include <QAction>
 #include <QList>
 #include <QVariant>
@@ -33,9 +35,6 @@
 #include <QColor>
 #include <QFrame>
 #include <QPalette>
-#include <QModelIndex>
-#include <QItemSelectionModel>
-#include <QSortFilterProxyModel>
 #include <QTimer>
 #include <QTimeLine>
 #include <QFileDialog>

src/playlist/playlistdelegates.h

@@ -28,6 +28,10 @@
 
 #include <QObject>
 #include <QWidget>
+#include <QAbstractItemView>
+#include <QStyledItemDelegate>
+#include <QStyleOptionViewItem>
+#include <QTreeView>
 #include <QFuture>
 #include <QCompleter>
 #include <QLocale>
@@ -42,14 +46,9 @@
 #include <QFont>
 #include <QString>
 #include <QStringListModel>
-#include <QModelIndex>
 #include <QStyleOption>
-#include <QStyledItemDelegate>
-#include <QAbstractItemView>
-#include <QStyleOptionViewItem>
 #include <QHelpEvent>
 #include <QLineEdit>
-#include <QTreeView>
 
 #include "playlist.h"
 

src/playlist/playlistmanager.h

@@ -26,13 +26,12 @@
 #include <stdbool.h>
 
 #include <QObject>
+#include <QItemSelectionModel>
+#include <QFuture>
 #include <QList>
 #include <QMap>
-#include <QFuture>
 #include <QString>
 #include <QUrl>
-#include <QModelIndex>
-#include <QItemSelectionModel>
 
 #include "core/song.h"
 #include "playlist.h"
@@ -103,7 +102,7 @@ public slots:
   virtual void SetActivePaused() = 0;
   virtual void SetActiveStopped() = 0;
 
-signals:
+ signals:
   void PlaylistManagerInitialized();
 
   void PlaylistAdded(int id, const QString &name, bool favorite);
@@ -167,7 +166,7 @@ class PlaylistManager : public PlaylistManagerInterface {
   PlaylistParser *parser() const { return parser_; }
   PlaylistContainer *playlist_container() const { return playlist_container_; }
 
-public slots:
+ public slots:
   void New(const QString &name, const SongList &songs = SongList(), const QString &special_type = QString());
   void Load(const QString &filename);
   void Save(int id, const QString &filename, Playlist::Path path_type);
@@ -218,7 +217,7 @@ public slots:
  private:
   Playlist *AddPlaylist(int id, const QString& name, const QString &special_type, const QString& ui_path, bool favorite);
 
-private:
+ private:
   struct Data {
     Data(Playlist *_p = nullptr, const QString& _name = QString()) : p(_p), name(_name) {}
     Playlist *p;