mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-10 16:14:40 +02:00
Code Issues Releases Wiki Activity

* Bit of spring cleanup.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-11-30 11:48:36 +01:00
parent 29239e08d3
commit 6c8550bf64
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libtomahawk/resolvers/scriptresolver.cpp
View File

@@ -79,8 +79,9 @@ ScriptResolver::~ScriptResolver()
delete m_configWidget.data(); delete m_configWidget.data();
} }
Tomahawk::ExternalResolver* Tomahawk::ExternalResolver*
ScriptResolver::factory(const QString& exe) ScriptResolver::factory( const QString& exe )
{ {
ExternalResolver* res = 0; ExternalResolver* res = 0;
@@ -151,18 +152,21 @@ ScriptResolver::reload()
} }
} }
bool bool
ScriptResolver::running() const ScriptResolver::running() const
{ {
return !m_stopped; return !m_stopped;
} }
void void
ScriptResolver::readStderr() ScriptResolver::readStderr()
{ {
tLog() << "SCRIPT_STDERR" << filePath() << m_proc.readAllStandardError(); tLog() << "SCRIPT_STDERR" << filePath() << m_proc.readAllStandardError();
} }
ScriptResolver::ErrorState ScriptResolver::ErrorState
ScriptResolver::error() const ScriptResolver::error() const
{ {

10
src/resolversmodel.cpp
View File

@@ -40,6 +40,7 @@ ResolversModel::~ResolversModel()
} }
QVariant QVariant
ResolversModel::data( const QModelIndex& index, int role ) const ResolversModel::data( const QModelIndex& index, int role ) const
{ {
@@ -67,6 +68,7 @@ ResolversModel::data( const QModelIndex& index, int role ) const
} }
} }
bool bool
ResolversModel::setData( const QModelIndex& index, const QVariant& value, int role ) ResolversModel::setData( const QModelIndex& index, const QVariant& value, int role )
{ {
@@ -112,6 +114,7 @@ ResolversModel::rowCount( const QModelIndex& parent ) const
return Tomahawk::Pipeline::instance()->scriptResolvers().count(); return Tomahawk::Pipeline::instance()->scriptResolvers().count();
} }
int int
ResolversModel::columnCount(const QModelIndex& parent) const ResolversModel::columnCount(const QModelIndex& parent) const
{ {
@@ -119,6 +122,7 @@ ResolversModel::columnCount(const QModelIndex& parent) const
return 1; return 1;
} }
Qt::ItemFlags Qt::ItemFlags
ResolversModel::flags( const QModelIndex& index ) const ResolversModel::flags( const QModelIndex& index ) const
{ {
@@ -141,6 +145,7 @@ ResolversModel::addResolver( const QString& resolver, bool enable )
m_waitingForLoad << resolver; m_waitingForLoad << resolver;
} }
void void
ResolversModel::atticaResolverInstalled( const QString& resolverId ) ResolversModel::atticaResolverInstalled( const QString& resolverId )
{ {
@@ -170,6 +175,7 @@ ResolversModel::removeResolver( const QString& resolver )
endRemoveRows(); endRemoveRows();
} }
void void
ResolversModel::resolverChanged() ResolversModel::resolverChanged()
{ {
@@ -190,6 +196,7 @@ ResolversModel::resolverChanged()
} }
} }
void void
ResolversModel::addInstalledResolvers() ResolversModel::addInstalledResolvers()
{ {
@@ -203,7 +210,7 @@ ResolversModel::addInstalledResolvers()
lib64Dir.cdUp(); lib64Dir.cdUp();
lib64Dir.cd( "lib64" ); lib64Dir.cd( "lib64" );
pluginDirs << appDir << libDir << lib64Dir << libexecDir << QDir( qApp->applicationDirPath() ); pluginDirs << appDir << libDir << lib64Dir << libexecDir;
foreach ( const QDir& pluginDir, pluginDirs ) foreach ( const QDir& pluginDir, pluginDirs )
{ {
qDebug() << "Checking directory for resolvers:" << pluginDir; qDebug() << "Checking directory for resolvers:" << pluginDir;
@@ -224,6 +231,7 @@ ResolversModel::addInstalledResolvers()
} }
} }
void void
ResolversModel::saveScriptResolvers() ResolversModel::saveScriptResolvers()
{ {

13
src/tomahawkapp.cpp
View File

@@ -170,14 +170,13 @@ TomahawkApp::init()
// init pipeline and resolver factories // init pipeline and resolver factories
new Pipeline( this ); new Pipeline( this );
#ifndef ENABLE_HEADLESS #ifndef ENABLE_HEADLESS
Pipeline::instance()->addExternalResolverFactory( boost::bind( &QtScriptResolver::factory, _1 ) ); Pipeline::instance()->addExternalResolverFactory( boost::bind( &QtScriptResolver::factory, _1 ) );
Pipeline::instance()->addExternalResolverFactory( boost::bind( &ScriptResolver::factory, _1 ) ); Pipeline::instance()->addExternalResolverFactory( boost::bind( &ScriptResolver::factory, _1 ) );
new ActionCollection( this );
new ActionCollection( this ); connect( ActionCollection::instance()->getAction( "quit" ), SIGNAL( triggered() ), SLOT( quit() ), Qt::UniqueConnection );
connect( ActionCollection::instance()->getAction( "quit" ), SIGNAL( triggered() ), SLOT( quit() ), Qt::UniqueConnection ); #endif
#endif
m_servent = QWeakPointer<Servent>( new Servent( this ) ); m_servent = QWeakPointer<Servent>( new Servent( this ) );
connect( m_servent.data(), SIGNAL( ready() ), SLOT( initSIP() ) ); connect( m_servent.data(), SIGNAL( ready() ), SLOT( initSIP() ) );