projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qt4-b-gone: Remove all code supporting Qt < 5.5 and KDE4
[quassel.git]
/
src
/
qtui
/
qtuiapplication.h
diff --git
a/src/qtui/qtuiapplication.h
b/src/qtui/qtuiapplication.h
index
a5e68e1
..
8d8608e
100644
(file)
--- a/
src/qtui/qtuiapplication.h
+++ b/
src/qtui/qtuiapplication.h
@@
-22,12
+22,7
@@
#include <memory>
#include <memory>
-#ifdef HAVE_KDE4
-# include <KApplication>
-#else
-# include <QApplication>
-#endif
-
+#include <QApplication>
#include <QSessionManager>
#include "client.h"
#include <QSessionManager>
#include "client.h"
@@
-37,14
+32,8
@@
class QtUi;
class QtUi;
-#ifdef HAVE_KDE4
-class QtUiApplication : public KApplication
-{
-#else
class QtUiApplication : public QApplication
{
class QtUiApplication : public QApplication
{
-#endif
-
Q_OBJECT
public:
Q_OBJECT
public:
@@
-55,13
+44,8
@@
public:
void resumeSessionIfPossible();
inline bool isAboutToQuit() const { return _aboutToQuit; }
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);
void commitData(QSessionManager &manager);
void saveState(QSessionManager &manager);
-#endif
protected:
virtual Quassel::QuitHandler quitHandler();
protected:
virtual Quassel::QuitHandler quitHandler();