projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Require member function pointers for Settings::notify()
[quassel.git]
/
src
/
qtui
/
qtuiapplication.h
diff --git
a/src/qtui/qtuiapplication.h
b/src/qtui/qtuiapplication.h
index
a5e68e1
..
ad978ac
100644
(file)
--- a/
src/qtui/qtuiapplication.h
+++ b/
src/qtui/qtuiapplication.h
@@
-20,14
+20,11
@@
#pragma once
#pragma once
-#include
<memory>
+#include
"qtui-export.h"
-#ifdef HAVE_KDE4
-# include <KApplication>
-#else
-# include <QApplication>
-#endif
+#include <memory>
+#include <QApplication>
#include <QSessionManager>
#include "client.h"
#include <QSessionManager>
#include "client.h"
@@
-37,14
+34,8
@@
class QtUi;
class QtUi;
-#ifdef HAVE_KDE4
-class QtUiApplication : public KApplication
-{
-#else
-class QtUiApplication : public QApplication
+class QTUI_EXPORT QtUiApplication : public QApplication
{
{
-#endif
-
Q_OBJECT
public:
Q_OBJECT
public:
@@
-55,13
+46,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();
@@
-89,9
+75,6
@@
private:
*/
bool applySettingsMigration(QtUiSettings settings, const uint newVersion);
*/
bool applySettingsMigration(QtUiSettings settings, const uint newVersion);
-private slots:
- void initUi();
-
protected:
std::unique_ptr<Client> _client;
protected:
std::unique_ptr<Client> _client;