From 859865e50a8d1e9f48d8e9b2b214003f223e9b92 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 2 Jun 2014 13:01:08 +0100 Subject: [PATCH] Remove ifndef ENABLE_HEADLESS --- src/tomahawk/TomahawkApp.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/tomahawk/TomahawkApp.cpp b/src/tomahawk/TomahawkApp.cpp index a427116cc..9459d1f9f 100644 --- a/src/tomahawk/TomahawkApp.cpp +++ b/src/tomahawk/TomahawkApp.cpp @@ -233,13 +233,11 @@ TomahawkApp::init() m_scanManager = QPointer( new ScanManager( this ) ); -#ifndef ENABLE_HEADLESS Pipeline::instance()->addExternalResolverFactory( boost::bind( &JSResolver::factory, _1, _2, _3 ) ); Pipeline::instance()->addExternalResolverFactory( boost::bind( &ScriptResolver::factory, _1, _2, _3 ) ); new ActionCollection( this ); connect( ActionCollection::instance()->getAction( "quit" ), SIGNAL( triggered() ), SLOT( quit() ), Qt::UniqueConnection ); -#endif QByteArray magic = QByteArray::fromBase64( enApiSecret ); QByteArray wand = QByteArray::fromBase64( QCoreApplication::applicationName().toLatin1() ); @@ -247,10 +245,8 @@ TomahawkApp::init() for ( int i=0; isetAPIKey( magic ); -#ifndef ENABLE_HEADLESS tDebug() << "Init Echonest Factory."; GeneratorFactory::registerFactory( "echonest", new EchonestFactory ); -#endif tDebug() << "Init Database Factory."; GeneratorFactory::registerFactory( "database", new DatabaseFactory );