projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Prefer default member init over ctor init
[quassel.git]
/
src
/
qtui
/
qtuiapplication.h
diff --git
a/src/qtui/qtuiapplication.h
b/src/qtui/qtuiapplication.h
index
e5e5d07
..
39eea07
100644
(file)
--- a/
src/qtui/qtuiapplication.h
+++ b/
src/qtui/qtuiapplication.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
6
by the Quassel Project *
+ * Copyright (C) 2005-201
8
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-18,51
+18,39
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#ifndef QTUIAPPLICATION_H_
-#define QTUIAPPLICATION_H_
+#pragma once
-#ifdef HAVE_KDE4
-# include <KApplication>
-#else
-# include <QApplication>
-#endif
+#include "qtui-export.h"
+#include <memory>
+
+#include <QApplication>
#include <QSessionManager>
#include <QSessionManager>
+#include "client.h"
#include "quassel.h"
#include "uisettings.h"
#include "qtuisettings.h"
class QtUi;
#include "quassel.h"
#include "uisettings.h"
#include "qtuisettings.h"
class QtUi;
-#ifdef HAVE_KDE4
-class QtUiApplication : public KApplication, public Quassel
-{
-#else
-class QtUiApplication : public QApplication, public Quassel
+class QTUI_EXPORT QtUiApplication : public QApplication
{
{
-#endif
-
Q_OBJECT
public:
QtUiApplication(int &, char **);
Q_OBJECT
public:
QtUiApplication(int &, char **);
- ~QtUiApplication();
- virtual
bool
init();
+
+ virtual
void
init();
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:
protected:
- virtual
void quit
();
+ virtual
Quassel::QuitHandler quitHandler
();
private:
/**
private:
/**
@@
-87,8
+75,12
@@
private:
*/
bool applySettingsMigration(QtUiSettings settings, const uint newVersion);
*/
bool applySettingsMigration(QtUiSettings settings, const uint newVersion);
- bool _aboutToQuit;
-
}
;
+private slots:
+
void initUi()
;
+protected:
+ std::unique_ptr<Client> _client;
-#endif
+private:
+ bool _aboutToQuit{false};
+};