X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtuiapplication.h;h=514c37f1c5c7680069565b5f5eabc2504594af37;hp=6f4a7e26353dfc5d3e9a679b9430902a714c70aa;hb=bd0b31b38c8111206ce630dbeac7a6c19bdb8a6e;hpb=9fc57dc2c000e80fb8bd746a090e2e8210e1278e diff --git a/src/qtui/qtuiapplication.h b/src/qtui/qtuiapplication.h index 6f4a7e26..514c37f1 100644 --- a/src/qtui/qtuiapplication.h +++ b/src/qtui/qtuiapplication.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2013 by the Quassel Project * + * Copyright (C) 2005-2015 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -21,7 +21,7 @@ #ifndef QTUIAPPLICATION_H_ #define QTUIAPPLICATION_H_ -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 # include #else # include @@ -34,7 +34,7 @@ class QtUi; -#ifdef HAVE_KDE +#ifdef HAVE_KDE4 class QtUiApplication : public KApplication, public Quassel { #else @@ -50,11 +50,16 @@ public: virtual bool init(); void resumeSessionIfPossible(); - virtual void commitData(QSessionManager &manager); - virtual void saveState(QSessionManager &manager); - inline bool isAboutToQuit() const { return _aboutToQuit; } +#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0)) + void commitData(QSessionManager &manager) override; + void saveState(QSessionManager &manager) override; +#else + void commitData(QSessionManager &manager); + void saveState(QSessionManager &manager); +#endif + protected: virtual void quit();