MrBesen
/
QxtGlobalShortcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merged in s3clud3r/libqxt (pull request #12) 

Qxtdaemon qt5 compatibility
This commit is contained in:
Arvid Picciani 2013-05-14 20:12:21 +02:00
parent ec514381d0 bf852806b1
commit 3a84efc486
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/qxtdaemon.cpp
View File

@ -91,8 +91,18 @@ void QxtDaemon::signalHandler(int sig)
}
#endif
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
#define qxtInstallMessageHandler qInstallMessageHandler
void QxtDaemon::messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
{
const char* msgstr = msg.toLatin1();
#else
#define qxtInstallMessageHandler qInstallMsgHandler
void QxtDaemon::messageHandler(QtMsgType type, const char *msg)
{
const char* msgstr = msg;
#endif
QFile * f = qxt_daemon_singleton->logfile;
f->write("[");
f->write(QDateTime::currentDateTime().toString(Qt::ISODate).toLocal8Bit());
@ -106,14 +116,14 @@ void QxtDaemon::messageHandler(QtMsgType type, const char *msg)
else if (type == QtFatalMsg)
{
f->write("[qFatal] ");
f->write(msg);
f->write(msgstr);
f->write("\n");
f->write("aborting \n");
f->flush();
abort();
}
f->write(msg);
f->write(msgstr);
f->write("\n");
f->flush();
}
@ -217,7 +227,7 @@ bool QxtDaemon::daemonize(bool pidfile)
assert(logfile->open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append));
qInstallMsgHandler(QxtDaemon::messageHandler);
qxtInstallMessageHandler(QxtDaemon::messageHandler);
return true;
#else

5
src/core/qxtdaemon.h
View File

@ -50,7 +50,12 @@ public:
#ifndef QXT_DOXYGEN_RUN
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
static void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg);
#else
static void messageHandler(QtMsgType type, const char *msg);
#endif
#ifdef Q_OS_UNIX
static void signalHandler(int signal);
#endif