projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logger: Dedup code, fix client Debug Log loglevel
[quassel.git]
/
src
/
qtui
/
qtuiapplication.h
diff --git
a/src/qtui/qtuiapplication.h
b/src/qtui/qtuiapplication.h
index
8c6320d
..
8ffc335
100644
(file)
--- a/
src/qtui/qtuiapplication.h
+++ b/
src/qtui/qtuiapplication.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
8
by the Quassel Project *
+ * Copyright (C) 2005-201
9
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 *
@@
-20,6
+20,8
@@
#pragma once
#pragma once
+#include <memory>
+
#ifdef HAVE_KDE4
# include <KApplication>
#else
#ifdef HAVE_KDE4
# include <KApplication>
#else
@@
-28,6
+30,7
@@
#include <QSessionManager>
#include <QSessionManager>
+#include "client.h"
#include "quassel.h"
#include "uisettings.h"
#include "qtuisettings.h"
#include "quassel.h"
#include "uisettings.h"
#include "qtuisettings.h"
@@
-46,8
+49,8
@@
class QtUiApplication : public QApplication
public:
QtUiApplication(int &, char **);
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; }
@@
-60,6
+63,9
@@
public:
void saveState(QSessionManager &manager);
#endif
void saveState(QSessionManager &manager);
#endif
+protected:
+ virtual Quassel::QuitHandler quitHandler();
+
private:
/**
* Migrate settings if neccessary and possible
private:
/**
* Migrate settings if neccessary and possible
@@
-86,8
+92,9
@@
private:
private slots:
void initUi();
private slots:
void initUi();
+protected:
+ std::unique_ptr<Client> _client;
+
private:
bool _aboutToQuit{false};
private:
bool _aboutToQuit{false};
-
- Quassel _quasselInstance;
};
};