mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-13 17:43:59 +02:00
Code Issues Releases Wiki Activity

Only prefix JREEN logging with Qt4

Browse Source
This commit is contained in:
Uwe L. Korn
2013-08-13 10:59:15 +00:00
parent c3a0eaddc5
commit afa04e9e66
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/accounts/xmpp/sip/XmppSip.cpp
View File

@@ -72,6 +72,7 @@ using namespace Accounts;
#define TOMAHAWK_CAP_NODE_NAME QLatin1String( "http://tomahawk-player.org/" ) #define TOMAHAWK_CAP_NODE_NAME QLatin1String( "http://tomahawk-player.org/" )
#if QT_VERSION <= QT_VERSION_CHECK( 5, 0, 0 )
void void
JreenMessageHandler( QtMsgType type, const char *msg ) JreenMessageHandler( QtMsgType type, const char *msg )
{ {
@@ -91,6 +92,7 @@ JreenMessageHandler( QtMsgType type, const char *msg )
abort(); abort();
} }
} }
#endif
XmppSipPlugin::XmppSipPlugin( Account* account ) XmppSipPlugin::XmppSipPlugin( Account* account )
@@ -102,7 +104,9 @@ XmppSipPlugin::XmppSipPlugin( Account* account )
, m_pubSubManager( 0 ) , m_pubSubManager( 0 )
#endif #endif
{ {
#if QT_VERSION <= QT_VERSION_CHECK( 5, 0, 0 )
Jreen::Logger::addHandler( JreenMessageHandler ); Jreen::Logger::addHandler( JreenMessageHandler );
#endif
m_currentUsername = readUsername(); m_currentUsername = readUsername();
m_currentServer = readServer(); m_currentServer = readServer();

3
src/libtomahawk/infosystem/InfoSystem.cpp
View File

@@ -150,12 +150,13 @@ InfoSystem::~InfoSystem()
void void
InfoSystem::init() InfoSystem::init()
{ {
tDebug() << Q_FUNC_INFO; // tDebug() << Q_FUNC_INFO;
if ( m_inited ) if ( m_inited )
return; return;
if ( !m_infoSystemCacheThreadController->cache() || !m_infoSystemWorkerThreadController->worker() ) if ( !m_infoSystemCacheThreadController->cache() || !m_infoSystemWorkerThreadController->worker() )
{ {
// tLog() << "Worker not found";
QTimer::singleShot( 0, this, SLOT( init() ) ); QTimer::singleShot( 0, this, SLOT( init() ) );
return; return;
} }