From 6138ea160586329a30117d4b31a89425baeac6f8 Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Fri, 18 Jan 2013 18:28:34 +0100
Subject: [PATCH] Remove cruft and fix includes.
---
src/libtomahawk/Collection.h | 7 -------
src/libtomahawk/accounts/spotify/SpotifyAccount.cpp | 5 +++--
src/libtomahawk/audio/AudioEngine.cpp | 1 +
src/libtomahawk/resolvers/ScriptResolver.cpp | 9 +++++----
4 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/libtomahawk/Collection.h b/src/libtomahawk/Collection.h
index a5d202c7f..ed7b329bc 100644
--- a/src/libtomahawk/Collection.h
+++ b/src/libtomahawk/Collection.h
@@ -27,7 +27,6 @@
#define TOMAHAWK_COLLECTION_H
#include <QHash>
-#include <QDir>
#include <QList>
#include <QSharedPointer>
@@ -90,12 +89,6 @@ signals:
void changed();
public slots:
- //TODO: should be made private and the dbcmd friended
- // and can probably be moved into database collection
- // it's a slot so the dynamic hookup will work
- virtual void addTracks( const QList<QVariant>& newitems ) = 0;
- virtual void removeTracks( const QDir& dir ) = 0;
-
void setPlaylists( const QList<Tomahawk::playlist_ptr>& plists );
void setAutoPlaylists( const QList< Tomahawk::dynplaylist_ptr >& autoplists );
void setStations( const QList< Tomahawk::dynplaylist_ptr >& stations );
diff --git a/src/libtomahawk/accounts/spotify/SpotifyAccount.cpp b/src/libtomahawk/accounts/spotify/SpotifyAccount.cpp
index 37fb15804..8507eda0f 100644
--- a/src/libtomahawk/accounts/spotify/SpotifyAccount.cpp
+++ b/src/libtomahawk/accounts/spotify/SpotifyAccount.cpp
@@ -39,12 +39,13 @@
#include "jobview/ErrorStatusMessage.h"
#endif
-#include <QPixmap>
#include <QAction>
+#include <QCoreApplication>
+#include <QDir>
#include <QHBoxLayout>
#include <QLabel>
#include <QMessageBox>
-#include <QCoreApplication>
+#include <QPixmap>
using namespace Tomahawk;
using namespace Accounts;
diff --git a/src/libtomahawk/audio/AudioEngine.cpp b/src/libtomahawk/audio/AudioEngine.cpp
index 38e9f746b..4981f84c3 100644
--- a/src/libtomahawk/audio/AudioEngine.cpp
+++ b/src/libtomahawk/audio/AudioEngine.cpp
@@ -40,6 +40,7 @@
#include "playlist/SingleTrackPlaylistInterface.h"
#include <QtCore/QUrl>
+#include <QDir>
#include <QtNetwork/QNetworkReply>
#include <QTemporaryFile>
diff --git a/src/libtomahawk/resolvers/ScriptResolver.cpp b/src/libtomahawk/resolvers/ScriptResolver.cpp
index 1ac8ab6cb..52efdd1ca 100644
--- a/src/libtomahawk/resolvers/ScriptResolver.cpp
+++ b/src/libtomahawk/resolvers/ScriptResolver.cpp
@@ -19,10 +19,6 @@
#include "ScriptResolver.h"
-#include <QtEndian>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkProxy>
-
#include "Artist.h"
#include "Album.h"
#include "Pipeline.h"
@@ -32,6 +28,11 @@
#include "utils/TomahawkUtilsGui.h"
#include "utils/Logger.h"
+#include <QtEndian>
+#include <QFileInfo>
+#include <QNetworkAccessManager>
+#include <QNetworkProxy>
+
#ifdef Q_OS_WIN
#include <shlwapi.h>
#endif