diff --git a/src/libtomahawk/utils/Logger.cpp b/src/libtomahawk/utils/Logger.cpp index d9d85ab5c..def5f8409 100644 --- a/src/libtomahawk/utils/Logger.cpp +++ b/src/libtomahawk/utils/Logger.cpp @@ -30,7 +30,6 @@ #include "utils/TomahawkUtils.h" -#define LOGFILE TomahawkUtils::appLogDir().filePath( "Tomahawk.log" ).toLocal8Bit() #define LOGFILE_SIZE 1024 * 256 #define RELEASE_LEVEL_THRESHOLD 0 @@ -98,7 +97,7 @@ log( const char *msg, unsigned int debugLevel, bool toDisk = true ) void -TomahawkLogHandler( QtMsgType type, const char *msg ) +TomahawkLogHandler( QtMsgType type, const char* msg ) { static QMutex s_mutex; @@ -124,30 +123,37 @@ TomahawkLogHandler( QtMsgType type, const char *msg ) } +QString +logFile() +{ + return TomahawkUtils::appLogDir().filePath( "Tomahawk.log" ); +} + + void setupLogfile() { - if ( QFileInfo( LOGFILE ).size() > LOGFILE_SIZE ) + if ( QFileInfo( logFile().toLocal8Bit() ).size() > LOGFILE_SIZE ) { QByteArray lc; { - QFile f( LOGFILE ); + QFile f( logFile().toLocal8Bit() ); f.open( QIODevice::ReadOnly | QIODevice::Text ); lc = f.readAll(); f.close(); } - QFile::remove( LOGFILE ); + QFile::remove( logFile().toLocal8Bit() ); { - QFile f( LOGFILE ); + QFile f( logFile().toLocal8Bit() ); f.open( QIODevice::WriteOnly | QIODevice::Text ); - f.write( lc.right( LOGFILE_SIZE - (LOGFILE_SIZE / 4) ) ); + f.write( lc.right( LOGFILE_SIZE - ( LOGFILE_SIZE / 4 ) ) ); f.close(); } } - logfile.open( LOGFILE, ios::app ); + logfile.open( logFile().toLocal8Bit(), ios::app ); qInstallMsgHandler( TomahawkLogHandler ); } diff --git a/src/libtomahawk/utils/Logger.h b/src/libtomahawk/utils/Logger.h index 6c1f69fdb..f3e0a1ea6 100644 --- a/src/libtomahawk/utils/Logger.h +++ b/src/libtomahawk/utils/Logger.h @@ -51,7 +51,7 @@ namespace Logger { } }; - + class DLLEXPORT TSqlLog : public TLog { public: @@ -60,8 +60,9 @@ namespace Logger } }; - DLLEXPORT void TomahawkLogHandler( QtMsgType type, const char *msg ); + DLLEXPORT void TomahawkLogHandler( QtMsgType type, const char* msg ); DLLEXPORT void setupLogfile(); + DLLEXPORT QString logFile(); } #define tLog Logger::TLog