Permalink
Browse files

* Fixed a ton of compiler warnings.

  • Loading branch information...
muesli committed Apr 5, 2013
1 parent 07af484 commit 4a76b561c46e384e0cc833d5ec1edf739bc3f99f
@@ -122,11 +122,13 @@ Tomahawk::InfoSystem::XmppInfoPlugin::audioStarted( const Tomahawk::InfoSystem::
emit publishTune( url, info );
}
+
void
Tomahawk::InfoSystem::XmppInfoPlugin::audioPaused()
{
}
+
void
Tomahawk::InfoSystem::XmppInfoPlugin::audioStopped()
{
@@ -20,6 +20,8 @@
#ifndef MPRISPLUGIN_H
#define MPRISPLUGIN_H
+#include "Query.h"
+#include "Source.h"
#include "audio/AudioEngine.h"
#include "infosystem/InfoSystem.h"
#include "infoplugins/InfoPluginDllMacro.h"
@@ -144,7 +146,7 @@ public slots:
protected slots:
virtual void init();
-
+
virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
{
Q_UNUSED( requestData );
@@ -24,6 +24,7 @@
#include "PlaylistInterface.h"
#include "Artist.h"
#include "Album.h"
+#include "Source.h"
#include "utils/TomahawkUtils.h"
#include "playlist/PlaylistUpdaterInterface.h"
@@ -55,7 +55,7 @@ DLLEXPORT QString accountTypeToString( AccountType type );
Q_DECLARE_FLAGS(AccountTypes, AccountType);
-inline QString generateId( const QString &factoryId )
+inline QString generateId( const QString& factoryId )
{
QString uniq = QUuid::createUuid().toString().mid( 1, 8 );
return factoryId + "_" + uniq;
@@ -199,4 +199,5 @@ Q_DECLARE_INTERFACE( Tomahawk::Accounts::AccountFactory, "tomahawk.AccountFactor
Q_DECLARE_METATYPE( Tomahawk::Accounts::Account* )
Q_DECLARE_METATYPE( QList< Tomahawk::Accounts::Account* > )
Q_DECLARE_METATYPE( Tomahawk::Accounts::AccountTypes )
+
#endif
@@ -25,6 +25,8 @@
#include "resolvers/ExternalResolverGui.h"
#include "Pipeline.h"
#include "TomahawkSettings.h"
+#include "Artist.h"
+#include "Album.h"
#include "Source.h"
#include "utils/Logger.h"
#include "qjson/parser.h"
@@ -416,7 +418,8 @@ ResolverAccount::removeFromConfig()
}
-void ResolverAccount::saveConfig()
+void
+ResolverAccount::saveConfig()
{
Account::saveConfig();
if ( !m_resolver.isNull() )
@@ -441,6 +444,7 @@ ResolverAccount::resolverChanged()
emit connectionStateChanged( connectionState() );
}
+
QPixmap
ResolverAccount::icon() const
{
@@ -137,6 +137,7 @@ private slots:
void resolverIconUpdated( const QString& );
void loadIcon();
+
private:
// Created by factory, when user installs a new resolver
AtticaResolverAccount( const QString& accountId, const QString& path, const QString& atticaId, const QVariantHash& initialConfiguration = QVariantHash() );
@@ -106,13 +106,13 @@ class DLLEXPORT SpotifyAccount : public CustomAtticaAccount
bool hasPlaylist( const QString& plId );
Tomahawk::playlist_ptr playlistForURI( const QString& plId );
void registerUpdaterForPlaylist( const QString& plId, SpotifyPlaylistUpdater* updater );
- void registerPlaylistInfo( const QString& name, const QString& plid, const QString &revid, const bool sync, const bool subscribed , const bool owner = false);
+ void registerPlaylistInfo( const QString& name, const QString& plid, const QString &revid, const bool sync, const bool subscribed , const bool owner = false );
void registerPlaylistInfo( SpotifyPlaylistInfo* info );
void unregisterUpdater( const QString& plid );
bool deleteOnUnsync() const;
bool loveSync() const;
- void starTrack(const QString& artist, const QString&title, const bool starred);
+ void starTrack( const QString& artist, const QString& title, const bool starred );
void setManualResolverPath( const QString& resolverPath );
bool loggedIn() const;
@@ -123,7 +123,7 @@ public slots:
void aboutToShow( QAction* action, const Tomahawk::playlist_ptr& playlist );
void syncActionTriggered( QAction* action );
void subscribeActionTriggered( QAction* action );
- void atticaLoaded(Attica::Content::List);
+ void atticaLoaded( Attica::Content::List );
void collaborateActionTriggered( QAction* action );
private slots:
@@ -142,6 +142,7 @@ private slots:
void playlistCopyCreated( const QString& msgType, const QVariantMap& msg, const QVariant& extraData );
void delayedInit();
void hookupAfterDeletion( bool autoEnable );
+
private:
void init();
bool checkForResolver();
@@ -186,6 +187,7 @@ private slots:
};
}
+
}
Q_DECLARE_METATYPE( Tomahawk::Accounts::SpotifyPlaylistInfo* )
@@ -24,7 +24,6 @@
#include "DatabaseWorker.h"
#include "IdThreadWorker.h"
#include "utils/Logger.h"
-#include "Source.h"
#define DEFAULT_WORKER_THREADS 4
#define MAX_WORKER_THREADS 16
@@ -25,6 +25,7 @@
#include "Artist.h"
#include "Album.h"
+#include "Source.h"
#include "DatabaseCommand.h"
#include "DllMacro.h"
@@ -75,7 +75,6 @@ void
DatabaseCommand_Resolve::resolve( DatabaseImpl* lib )
{
QList<Tomahawk::result_ptr> res;
- typedef QPair<int, float> scorepair_t;
// STEP 1
QList< QPair<int, float> > tracks = lib->search( m_query );
@@ -34,6 +34,7 @@
#include "MetaPlaylistInterface.h"
#include "utils/Logger.h"
#include "utils/AnimatedSpinner.h"
+#include "utils/PixmapDelegateFader.h"
#include "utils/TomahawkUtilsGui.h"
#include <QHeaderView>
@@ -22,8 +22,9 @@
#include "PlaylistInterface.h"
#include "DllMacro.h"
#include "Query.h"
-#include "Typedefs.h"
#include "Result.h"
+#include "Source.h"
+#include "Typedefs.h"
namespace Tomahawk
{
@@ -19,7 +19,6 @@
#include "ExternalResolver.h"
#include "utils/Logger.h"
-#include "Source.h"
Tomahawk::ExternalResolver::ErrorState
Tomahawk::ExternalResolver::error() const
@@ -21,7 +21,9 @@
#ifndef EXTERNALRESOLVER_H
#define EXTERNALRESOLVER_H
-
+#include "Artist.h"
+#include "Album.h"
+#include "Source.h"
#include "Query.h"
#include "DllMacro.h"
#include "Resolver.h"
@@ -19,6 +19,7 @@
#ifndef SCRIPTCOMMAND_ALLALBUMS_H
#define SCRIPTCOMMAND_ALLALBUMS_H
+#include "Album.h"
#include "collection/AlbumsRequest.h"
#include "collection/Collection.h"
#include "resolvers/ScriptCommand.h"
@@ -35,15 +36,15 @@ class ScriptCommand_AllAlbums : public ScriptCommand, public Tomahawk::AlbumsReq
virtual void enqueue();
virtual void setFilter( const QString& filter );
-
+
signals:
void albums( const QList< Tomahawk::album_ptr >& );
void done();
protected:
virtual void exec();
virtual void reportFailure();
-
+
private slots:
void onResolverDone( const QList< Tomahawk::album_ptr >& );
@@ -19,6 +19,7 @@
#ifndef SCRIPTCOMMAND_ALLARTISTS_H
#define SCRIPTCOMMAND_ALLARTISTS_H
+#include "Artist.h"
#include "collection/ArtistsRequest.h"
#include "collection/Collection.h"
#include "resolvers/ScriptCommand.h"
@@ -34,7 +35,7 @@ class ScriptCommand_AllArtists : public ScriptCommand, public Tomahawk::ArtistsR
virtual void enqueue();
void setFilter( const QString& filter );
-
+
signals:
void artists( const QList< Tomahawk::artist_ptr >& );
void done();
@@ -19,6 +19,7 @@
#ifndef SCRIPTCOMMAND_ALLTRACKS_H
#define SCRIPTCOMMAND_ALLTRACKS_H
+#include "Query.h"
#include "collection/TracksRequest.h"
#include "collection/Collection.h"
#include "resolvers/ScriptCommand.h"
@@ -33,15 +34,15 @@ class ScriptCommand_AllTracks : public ScriptCommand, public Tomahawk::TracksReq
virtual ~ScriptCommand_AllTracks() {}
virtual void enqueue();
-
+
signals:
void tracks( const QList< Tomahawk::query_ptr >& );
void done();
protected:
virtual void exec();
virtual void reportFailure();
-
+
private slots:
void onResolverDone( const QList< Tomahawk::query_ptr >& );
@@ -22,6 +22,9 @@
#define SCRIPTRESOLVER_H
#include "Query.h"
+#include "Artist.h"
+#include "Album.h"
+#include "collection/Collection.h"
#include "ExternalResolverGui.h"
#include "DllMacro.h"
@@ -71,9 +74,9 @@ public slots:
virtual void start();
// TODO: implement. Or not. Not really an issue while Spotify doesn't do browsable personal cloud storage.
- virtual void artists( const Tomahawk::collection_ptr& collection ){}
- virtual void albums( const Tomahawk::collection_ptr& collection, const Tomahawk::artist_ptr& artist ) {}
- virtual void tracks( const Tomahawk::collection_ptr& collection, const Tomahawk::album_ptr& album ) {}
+ virtual void artists( const Tomahawk::collection_ptr& ) {}
+ virtual void albums( const Tomahawk::collection_ptr&, const Tomahawk::artist_ptr& ) {}
+ virtual void tracks( const Tomahawk::collection_ptr&, const Tomahawk::album_ptr& ) {}
private slots:
@@ -41,10 +41,9 @@ SoundcloudParser::SoundcloudParser( const QStringList& Urls, bool createNewPlayl
, m_single( false )
, m_trackMode( true )
, m_createNewPlaylist( createNewPlaylist )
+ , m_getLikes( false )
, m_browseJob( 0 )
, m_type( DropJob::All )
- , m_getLikes( false )
-
{
foreach ( const QString& url, Urls )
lookupUrl( url );
@@ -56,9 +55,9 @@ SoundcloudParser::SoundcloudParser( const QString& Url, bool createNewPlaylist,
, m_single( true )
, m_trackMode( true )
, m_createNewPlaylist( createNewPlaylist )
+ , m_getLikes( false )
, m_browseJob( 0 )
, m_type( DropJob::All )
- , m_getLikes( false )
{
lookupUrl( Url );
}
@@ -37,7 +37,7 @@ HeaderWidget::~HeaderWidget()
void
-HeaderWidget::paintEvent( QPaintEvent* e )
+HeaderWidget::paintEvent( QPaintEvent* /* event */ )
{
QStylePainter p( this );
QRect r = rect();

0 comments on commit 4a76b56

Please sign in to comment.