X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fgraphicalui.h;h=b7e96bf3c2af6e2db0a60c3f9656cad43c254362;hp=eb7562d085c41d73c433633915ed91ea445b9caa;hb=f18d6c40cd704e26734a77b371ae2c4a284bee38;hpb=76db8cdfbeffaaba359c8e80cf2146da9e9e7f8a

diff --git a/src/uisupport/graphicalui.h b/src/uisupport/graphicalui.h
index eb7562d0..b7e96bf3 100644
--- a/src/uisupport/graphicalui.h
+++ b/src/uisupport/graphicalui.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -28,18 +28,18 @@ class ContextMenuActionProvider;
 class ToolBarActionProvider;
 class UiStyle;
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
 #  include <windows.h>
 #endif
+#ifdef Q_OS_MAC
+#include <Carbon/Carbon.h>
+#endif
 
 class GraphicalUi : public AbstractUi
 {
     Q_OBJECT
 
 public:
-    GraphicalUi(QObject *parent = 0);
-    virtual void init();
-
     //! Access global ActionCollections.
     /** These ActionCollections are associated with the main window, i.e. they contain global
     *  actions (and thus, shortcuts). Widgets providing application-wide shortcuts should
@@ -75,6 +75,9 @@ public:
     static bool isMainWidgetVisible();
 
 protected:
+    GraphicalUi(QObject *parent = 0);
+    virtual void init();
+
     //! This is the widget we associate global actions with, typically the main window
     void setMainWidget(QWidget *);
 
@@ -106,9 +109,8 @@ protected slots:
     virtual void disconnectedFromCore();
 
 private:
-    static inline GraphicalUi *instance();
+    static GraphicalUi *instance();
 
-    static GraphicalUi *_instance;
     static QWidget *_mainWidget;
     static QHash<QString, ActionCollection *> _actionCollections;
     static ContextMenuActionProvider *_contextMenuActionProvider;
@@ -116,15 +118,17 @@ private:
     static UiStyle *_uiStyle;
     static bool _onAllDesktops;
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
     DWORD _dwTickCount;
 #endif
+#ifdef Q_OS_MAC
+    ProcessSerialNumber _procNum;
+#endif
 };
 
 
 // inlines
 
-GraphicalUi *GraphicalUi::instance() { return _instance; }
 ContextMenuActionProvider *GraphicalUi::contextMenuActionProvider() { return _contextMenuActionProvider; }
 ToolBarActionProvider *GraphicalUi::toolBarActionProvider() { return _toolBarActionProvider; }
 UiStyle *GraphicalUi::uiStyle() { return _uiStyle; }