From e0cd07c442d2ca5cf353f91471ef1edc0f9867ec Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Fri, 24 Jun 2011 08:22:39 +0200 Subject: [PATCH] * Giving domme a style-lesson ;-) --- src/resolvers/qtscriptresolver.cpp | 8 +++++--- src/resolvers/qtscriptresolver.h | 13 +++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/resolvers/qtscriptresolver.cpp b/src/resolvers/qtscriptresolver.cpp index a32466245..aad4fe721 100644 --- a/src/resolvers/qtscriptresolver.cpp +++ b/src/resolvers/qtscriptresolver.cpp @@ -24,22 +24,24 @@ #include "sourcelist.h" #include "utils/tomahawkutils.h" -QtScriptResolverHelper::QtScriptResolverHelper( const QString& scriptPath, QObject* parent ): QObject(parent) + +QtScriptResolverHelper::QtScriptResolverHelper( const QString& scriptPath, QObject* parent ) + : QObject( parent ) { m_scriptPath = scriptPath; } + QString QtScriptResolverHelper::readFile( const QString& fileName ) { QString path = QFileInfo( m_scriptPath ).absolutePath(); // remove directories QString cleanedFileName = QFileInfo( fileName ).fileName(); - QString absoluteFilePath = path.append( "/" ).append( cleanedFileName ); QFile file( absoluteFilePath ); - if( !file.exists() ) + if ( !file.exists() ) { return QString(); } diff --git a/src/resolvers/qtscriptresolver.h b/src/resolvers/qtscriptresolver.h index 02c7f096f..773679875 100644 --- a/src/resolvers/qtscriptresolver.h +++ b/src/resolvers/qtscriptresolver.h @@ -35,13 +35,13 @@ class QtScriptResolver; class QtScriptResolverHelper : public QObject { - Q_OBJECT +Q_OBJECT public: - QtScriptResolverHelper(const QString& scriptPath, QObject* parent ); + QtScriptResolverHelper( const QString& scriptPath, QObject* parent ); public slots: - QString readFile(const QString& fileName); + QString readFile( const QString& fileName ); private: QString m_scriptPath; @@ -86,12 +86,13 @@ public: explicit QtScriptResolver( const QString& scriptPath ); virtual ~QtScriptResolver(); - virtual QString name() const { return m_name; } - virtual unsigned int weight() const { return m_weight; } - virtual unsigned int timeout() const { return m_timeout; } + virtual QString name() const { return m_name; } + virtual unsigned int weight() const { return m_weight; } + virtual unsigned int timeout() const { return m_timeout; } virtual QWidget* configUI() const { return 0; } // TODO support properly for qtscript resolvers too! virtual void saveConfig() {} + public slots: virtual void resolve( const Tomahawk::query_ptr& query ); virtual void stop();