X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fqtuiapplication.h;h=ad978ac83e596a1080e855b9757e26db3002993e;hb=2c8434f74c68194d56f2084f637419123e61d18b;hp=a5e68e1bc01d7ad1255fd20a563c6c6f82b75085;hpb=72473527f99cbe68dcfcb4ca17f828bd3775bba7;p=quassel.git diff --git a/src/qtui/qtuiapplication.h b/src/qtui/qtuiapplication.h index a5e68e1b..ad978ac8 100644 --- a/src/qtui/qtuiapplication.h +++ b/src/qtui/qtuiapplication.h @@ -20,14 +20,11 @@ #pragma once -#include +#include "qtui-export.h" -#ifdef HAVE_KDE4 -# include -#else -# include -#endif +#include +#include #include #include "client.h" @@ -37,14 +34,8 @@ class QtUi; -#ifdef HAVE_KDE4 -class QtUiApplication : public KApplication -{ -#else -class QtUiApplication : public QApplication +class QTUI_EXPORT QtUiApplication : public QApplication { -#endif - Q_OBJECT public: @@ -55,13 +46,8 @@ public: void resumeSessionIfPossible(); 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 Quassel::QuitHandler quitHandler(); @@ -89,9 +75,6 @@ private: */ bool applySettingsMigration(QtUiSettings settings, const uint newVersion); -private slots: - void initUi(); - protected: std::unique_ptr _client;