projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
typos
[quassel.git]
/
src
/
qtui
/
qtui.h
diff --git
a/src/qtui/qtui.h
b/src/qtui/qtui.h
index
9a00ef4
..
77916ce
100644
(file)
--- a/
src/qtui/qtui.h
+++ b/
src/qtui/qtui.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
8
by the Quassel Project *
+ * 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,7
@@
#ifndef QTUI_H
#define QTUI_H
#ifndef QTUI_H
#define QTUI_H
-#include "
quasse
lui.h"
+#include "
graphica
lui.h"
#include "abstractnotificationbackend.h"
#include "mainwin.h"
#include "abstractnotificationbackend.h"
#include "mainwin.h"
@@
-36,7
+36,7
@@
class QtUiStyle;
/** This is basically a wrapper around MainWin, which is necessary because we cannot derive MainWin
* from both QMainWindow and AbstractUi (because of multiple inheritance of QObject).
*/
/** This is basically a wrapper around MainWin, which is necessary because we cannot derive MainWin
* from both QMainWindow and AbstractUi (because of multiple inheritance of QObject).
*/
-class QtUi : public
Abstract
Ui {
+class QtUi : public
Graphical
Ui {
Q_OBJECT
public:
Q_OBJECT
public:
@@
-46,6
+46,7
@@
public:
MessageModel *createMessageModel(QObject *parent);
AbstractMessageProcessor *createMessageProcessor(QObject *parent);
MessageModel *createMessageModel(QObject *parent);
AbstractMessageProcessor *createMessageProcessor(QObject *parent);
+ inline static QtUi *instance();
inline static QtUiStyle *style();
inline static MainWin *mainWindow();
inline static QtUiStyle *style();
inline static MainWin *mainWindow();
@@
-56,7
+57,6
@@
public:
* @param category The category (default: "General")
*/
static ActionCollection *actionCollection(const QString &category = "General");
* @param category The category (default: "General")
*/
static ActionCollection *actionCollection(const QString &category = "General");
- inline AbstractActionProvider *actionProvider() const;
/* Notifications */
/* Notifications */
@@
-70,15
+70,15
@@
public:
static const QList<AbstractNotificationBackend::Notification> &activeNotifications();
public slots:
static const QList<AbstractNotificationBackend::Notification> &activeNotifications();
public slots:
- void init();
+ v
irtual v
oid init();
protected slots:
void connectedToCore();
void disconnectedFromCore();
protected slots:
void connectedToCore();
void disconnectedFromCore();
+ void notificationActivated();
private:
private:
- AbstractActionProvider *_actionProvider;
-
+ static QPointer<QtUi> _instance;
static QPointer<MainWin> _mainWin;
static QHash<QString, ActionCollection *> _actionCollections;
static QtUiStyle *_style;
static QPointer<MainWin> _mainWin;
static QHash<QString, ActionCollection *> _actionCollections;
static QtUiStyle *_style;
@@
-86,8
+86,8
@@
private:
static QList<AbstractNotificationBackend::Notification> _notifications;
};
static QList<AbstractNotificationBackend::Notification> _notifications;
};
+QtUi *QtUi::instance() { return _instance ? _instance.data() : new QtUi(); }
QtUiStyle *QtUi::style() { return _style; }
MainWin *QtUi::mainWindow() { return _mainWin; }
QtUiStyle *QtUi::style() { return _style; }
MainWin *QtUi::mainWindow() { return _mainWin; }
-AbstractActionProvider *QtUi::actionProvider() const { return _actionProvider; }
#endif
#endif