X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fgraphicalui.h;h=42b5785287bd82db7c359bcf4bc20cf2ac234886;hp=3797d0847f96d69d3f126efcdde8f9d27f0745f0;hb=e8a39b4c3c92e193ab861a3fea84a261bb6fbd24;hpb=72473527f99cbe68dcfcb4ca17f828bd3775bba7 diff --git a/src/uisupport/graphicalui.h b/src/uisupport/graphicalui.h index 3797d084..42b57852 100644 --- a/src/uisupport/graphicalui.h +++ b/src/uisupport/graphicalui.h @@ -18,8 +18,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef GRAPHICALUI_H_ -#define GRAPHICALUI_H_ +#pragma once + +#include "uisupport-export.h" #include "abstractui.h" #include "singleton.h" @@ -36,7 +37,7 @@ class UiStyle; #include #endif -class GraphicalUi : public AbstractUi, protected Singleton +class UISUPPORT_EXPORT GraphicalUi : public AbstractUi, protected Singleton { Q_OBJECT @@ -76,8 +77,8 @@ public: static bool isMainWidgetVisible(); protected: - GraphicalUi(QObject *parent = 0); - virtual void init(); + GraphicalUi(QObject *parent = nullptr); + void init() override; //! This is the widget we associate global actions with, typically the main window void setMainWidget(QWidget *); @@ -104,10 +105,10 @@ protected: void setToolBarActionProvider(ToolBarActionProvider *); void setUiStyle(UiStyle *); - virtual bool eventFilter(QObject *obj, QEvent *event); + bool eventFilter(QObject *obj, QEvent *event) override; protected slots: - virtual void disconnectedFromCore(); + void disconnectedFromCore() override; private: static QWidget *_mainWidget; @@ -115,7 +116,6 @@ private: static ContextMenuActionProvider *_contextMenuActionProvider; static ToolBarActionProvider *_toolBarActionProvider; static UiStyle *_uiStyle; - static bool _onAllDesktops; #ifdef Q_OS_WIN DWORD _dwTickCount; @@ -133,5 +133,3 @@ ToolBarActionProvider *GraphicalUi::toolBarActionProvider() { return _toolBarAct UiStyle *GraphicalUi::uiStyle() { return _uiStyle; } QWidget *GraphicalUi::mainWidget() { return _mainWidget; } bool GraphicalUi::isHidingMainWidgetAllowed() const { return false; } - -#endif