X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtui.h;h=9ac3b97b4519d8f7b427e68383f60e48149b729f;hp=bbe31f7d68a996e9d4000e893c7def76ddd89d3d;hb=f091c08e33f4cc2ed63afebab0ae90f2dad55139;hpb=cc7f376eb105f7bf931fb7f96c9601a7b3f69511

diff --git a/src/qtui/qtui.h b/src/qtui/qtui.h
index bbe31f7d..9ac3b97b 100644
--- a/src/qtui/qtui.h
+++ b/src/qtui/qtui.h
@@ -18,14 +18,16 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _QTUI_H_
-#define _QTUI_H_
+#ifndef QTUI_H
+#define QTUI_H
 
-#include "qtuistyle.h"
 #include "quasselui.h"
 
+class ActionCollection;
 class MainWin;
 class MessageModel;
+class QtUiMessageProcessor;
+class QtUiStyle;
 
 //! This class encapsulates Quassel's Qt-based GUI.
 /** This is basically a wrapper around MainWin, which is necessary because we cannot derive MainWin
@@ -34,25 +36,36 @@ class MessageModel;
 class QtUi : public AbstractUi {
   Q_OBJECT
 
-  public:
-    QtUi();
-    ~QtUi();
-    //void init();
-    MessageModel *createMessageModel(QObject *parent = 0);
-    AbstractUiMsg *layoutMsg(const Message &);
+public:
+  QtUi();
+  ~QtUi();
 
-    static QtUiStyle *style();
+  MessageModel *createMessageModel(QObject *parent);
+  AbstractMessageProcessor *createMessageProcessor(QObject *parent);
 
-  public slots:
-    void init();
+  inline static QtUiStyle *style();
 
-  protected slots:
-    void connectedToCore();
-    void disconnectedFromCore();
+  //! Access the global ActionCollection.
+  /** This ActionCollection is associated with the main window, i.e. it contains global
+   *  actions (and thus, shortcuts). Widgets providing application-wide shortcuts should
+   *  create appropriate Action objects using QtUi::actionCollection()->add\<Action\>().
+   */
+  inline static ActionCollection *actionCollection();
 
-  private:
-    MainWin *mainWin;
-    static QtUiStyle *_style;
+public slots:
+  void init();
+
+protected slots:
+  void connectedToCore();
+  void disconnectedFromCore();
+
+private:
+  MainWin *mainWin;
+  static ActionCollection *_actionCollection;
+  static QtUiStyle *_style;
 };
 
+ActionCollection *QtUi::actionCollection() { return _actionCollection; }
+QtUiStyle *QtUi::style() { return _style; }
+
 #endif