projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes #522 - applied patch with minor changes
[quassel.git]
/
src
/
qtui
/
qtuiapplication.h
diff --git
a/src/qtui/qtuiapplication.h
b/src/qtui/qtuiapplication.h
index
f46f3a7
..
69a9086
100644
(file)
--- a/
src/qtui/qtuiapplication.h
+++ b/
src/qtui/qtuiapplication.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
8 by the Quassel IRC Team
*
+ * Copyright (C) 2005-0
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 *
@@
-21,7
+21,12
@@
#ifndef QTUIAPPLICATION_H_
#define QTUIAPPLICATION_H_
#ifndef QTUIAPPLICATION_H_
#define QTUIAPPLICATION_H_
-#include <QApplication>
+#ifdef HAVE_KDE
+# include <KApplication>
+#else
+# include <QApplication>
+#endif
+
#include <QSessionManager>
#include "quassel.h"
#include <QSessionManager>
#include "quassel.h"
@@
-29,23
+34,33
@@
class QtUi;
class QtUi;
+#ifdef HAVE_KDE
+class QtUiApplication : public KApplication, public Quassel {
+#else
class QtUiApplication : public QApplication, public Quassel {
class QtUiApplication : public QApplication, public Quassel {
+#endif
+
Q_OBJECT
Q_OBJECT
- public:
- QtUiApplication(int &, char **);
- ~QtUiApplication();
- virtual bool init();
+public:
+ QtUiApplication(int &, char **);
+ ~QtUiApplication();
+ virtual bool init();
+
+ void resumeSessionIfPossible();
+ virtual void commitData(QSessionManager &manager);
+ virtual void saveState(QSessionManager &manager);
- void resumeSessionIfPossible();
- virtual void saveState(QSessionManager & manager);
+ inline bool aboutToQuit() const { return _aboutToQuit; }
-
signals:
-
void saveStateToSession(const QString &sessionId);
-
void saveStateToSessionSettings(SessionSettings &s); // FIXME refs in signals won't probably work
-
void resumeFromSession(const QString sessionId);
-
void resumeFromSessionSettings(SessionSettings &s);
+signals:
+ void saveStateToSession(const QString &sessionId);
+ void saveStateToSessionSettings(SessionSettings &s); // FIXME refs in signals won't probably work
+ void resumeFromSession(const QString sessionId);
+ void resumeFromSessionSettings(SessionSettings &s);
+private:
+ bool _aboutToQuit;
};
#endif
};
#endif