1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 22:26:32 +02:00

qt5: port the Logger

This commit is contained in:
Dominik Schmidt
2013-01-05 17:15:54 +01:00
parent 45c6396b0a
commit 7969f4ab51

View File

@@ -97,27 +97,37 @@ log( const char *msg, unsigned int debugLevel, bool toDisk = true )
void void
#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
TomahawkLogHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
#else
TomahawkLogHandler( QtMsgType type, const char* msg ) TomahawkLogHandler( QtMsgType type, const char* msg )
#endif
{ {
static QMutex s_mutex; static QMutex s_mutex;
#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
const char* message = msg.toLatin1().constData();
#else
const char* message = msg;
#endif
QMutexLocker locker( &s_mutex ); QMutexLocker locker( &s_mutex );
switch( type ) switch( type )
{ {
case QtDebugMsg: case QtDebugMsg:
log( msg, LOGTHIRDPARTY ); log( message, LOGTHIRDPARTY );
break; break;
case QtCriticalMsg: case QtCriticalMsg:
log( msg, 0 ); log( message, 0 );
break; break;
case QtWarningMsg: case QtWarningMsg:
log( msg, 0 ); log( message, 0 );
break; break;
case QtFatalMsg: case QtFatalMsg:
log( msg, 0 ); log( message, 0 );
break; break;
} }
} }
@@ -154,7 +164,11 @@ setupLogfile()
} }
logfile.open( logFile().toLocal8Bit(), ios::app ); logfile.open( logFile().toLocal8Bit(), ios::app );
#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
qInstallMessageHandler( TomahawkLogHandler );
#else
qInstallMsgHandler( TomahawkLogHandler ); qInstallMsgHandler( TomahawkLogHandler );
#endif
} }
} }