X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=d93c62b499eb527eed16182378a07858f8e7d8ff;hb=bc715c756677bee7cdb7109cc656e3e5f526c988;hp=f56e62d1a940d3e647a4cce46b83c2a77c352edf;hpb=100a2678adf2016b7b4753d09d868929de83294e;p=quassel.git diff --git a/src/client/client.h b/src/client/client.h index f56e62d1..d93c62b4 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2013 by the Quassel Project * + * Copyright (C) 2005-2014 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -142,7 +142,11 @@ public: static void mergeBuffersPermanently(BufferId bufferId1, BufferId bufferId2); static void purgeKnownBufferIds(); +#if QT_VERSION < 0x050000 static void logMessage(QtMsgType type, const char *msg); +#else + static void logMessage(QtMsgType, const QMessageLogContext&, const QString&); +#endif static inline const QString &debugLog() { return instance()->_debugLogBuffer; } signals: