aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reworked a bit message handling from previous commit

Browse source
This commit is contained in:
Fabio Bas 2014-06-24 18:52:04 +02:00
parent 2953c6ba2a
commit bab340f7b7
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
servatrice/src/main.cpp
View file

@ -82,6 +82,7 @@ void testHash()
std::cerr << startTime.secsTo(endTime) << "secs" << std::endl; std::cerr << startTime.secsTo(endTime) << "secs" << std::endl;
} }
#if QT_VERSION < 0x050000
void myMessageOutput(QtMsgType /*type*/, const char *msg) void myMessageOutput(QtMsgType /*type*/, const char *msg)
{ {
logger->logMessage(msg); logger->logMessage(msg);
@ -92,17 +93,18 @@ void myMessageOutput2(QtMsgType /*type*/, const char *msg)
logger->logMessage(msg); logger->logMessage(msg);
std::cerr << msg << std::endl; std::cerr << msg << std::endl;
} }
#else
void myMessageOutputQt5(QtMsgType /*type*/, const QMessageLogContext &, const QString &msg) void myMessageOutput(QtMsgType /*type*/, const QMessageLogContext &, const QString &msg)
{ {
logger->logMessage(msg); logger->logMessage(msg);
} }
void myMessageOutput2Qt5(QtMsgType /*type*/, const QMessageLogContext &, const QString &msg) void myMessageOutput2(QtMsgType /*type*/, const QMessageLogContext &, const QString &msg)
{ {
logger->logMessage(msg); logger->logMessage(msg);
std::cerr << msg.toStdString() << std::endl; std::cerr << msg.toStdString() << std::endl;
} }
#endif
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
void sigSegvHandler(int sig) void sigSegvHandler(int sig)
@ -155,9 +157,9 @@ int main(int argc, char *argv[])
qInstallMsgHandler(myMessageOutput2); qInstallMsgHandler(myMessageOutput2);
#else #else
if (logToConsole) if (logToConsole)
qInstallMessageHandler(myMessageOutputQt5); qInstallMessageHandler(myMessageOutput);
else else
qInstallMessageHandler(myMessageOutput2Qt5); qInstallMessageHandler(myMessageOutput2);
#endif #endif
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
@ -199,7 +201,7 @@ int main(int argc, char *argv[])
#if QT_VERSION < 0x050000 #if QT_VERSION < 0x050000
qInstallMsgHandler(myMessageOutput); qInstallMsgHandler(myMessageOutput);
#else #else
qInstallMessageHandler(myMessageOutputQt5); qInstallMessageHandler(myMessageOutput);
#endif #endif
retval = app.exec(); retval = app.exec();