X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fgraphicalui.cpp;h=73affbf7a0371f87b5c8bc6b6fc7d0cabe6df959;hp=2042fef54c6e1a9c349f51bf7714eb285b4383dc;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=30b159cb876a9495de42e9a3e70ca050516f0805

diff --git a/src/uisupport/graphicalui.cpp b/src/uisupport/graphicalui.cpp
index 2042fef5..73affbf7 100644
--- a/src/uisupport/graphicalui.cpp
+++ b/src/uisupport/graphicalui.cpp
@@ -24,22 +24,23 @@
 #include "graphicalui.h"
 
 #include "actioncollection.h"
-#include "uisettings.h"
 #include "contextmenuactionprovider.h"
 #include "toolbaractionprovider.h"
+#include "uisettings.h"
 
 #ifdef Q_WS_X11
-#  include <QX11Info>
+#    include <QX11Info>
 #endif
 
-QWidget *GraphicalUi::_mainWidget = nullptr;
-QHash<QString, ActionCollection *> GraphicalUi::_actionCollections;
-ContextMenuActionProvider *GraphicalUi::_contextMenuActionProvider = nullptr;
-ToolBarActionProvider *GraphicalUi::_toolBarActionProvider = nullptr;
-UiStyle *GraphicalUi::_uiStyle = nullptr;
-
+QWidget* GraphicalUi::_mainWidget = nullptr;
+QHash<QString, ActionCollection*> GraphicalUi::_actionCollections;
+ContextMenuActionProvider* GraphicalUi::_contextMenuActionProvider = nullptr;
+ToolBarActionProvider* GraphicalUi::_toolBarActionProvider = nullptr;
+UiStyle* GraphicalUi::_uiStyle = nullptr;
 
-GraphicalUi::GraphicalUi(QObject *parent) : AbstractUi(parent), Singleton<GraphicalUi>(this)
+GraphicalUi::GraphicalUi(QObject* parent)
+    : AbstractUi(parent)
+    , Singleton<GraphicalUi>(this)
 {
     Q_INIT_RESOURCE(pics);
     Q_INIT_RESOURCE(hicolor_icons);
@@ -56,7 +57,6 @@ GraphicalUi::GraphicalUi(QObject *parent) : AbstractUi(parent), Singleton<Graphi
 #endif
 }
 
-
 void GraphicalUi::init()
 {
 #ifdef Q_OS_WIN
@@ -64,12 +64,11 @@ void GraphicalUi::init()
 #endif
 }
 
-
-ActionCollection *GraphicalUi::actionCollection(const QString &category, const QString &translatedCategory)
+ActionCollection* GraphicalUi::actionCollection(const QString& category, const QString& translatedCategory)
 {
     if (_actionCollections.contains(category))
         return _actionCollections.value(category);
-    auto *coll = new ActionCollection(_mainWidget);
+    auto* coll = new ActionCollection(_mainWidget);
 
     if (!translatedCategory.isEmpty())
         coll->setProperty("Category", translatedCategory);
@@ -82,53 +81,45 @@ ActionCollection *GraphicalUi::actionCollection(const QString &category, const Q
     return coll;
 }
 
-
-QHash<QString, ActionCollection *> GraphicalUi::actionCollections()
+QHash<QString, ActionCollection*> GraphicalUi::actionCollections()
 {
     return _actionCollections;
 }
 
-
 void GraphicalUi::loadShortcuts()
 {
-    foreach(ActionCollection *coll, actionCollections())
-    coll->readSettings();
+    foreach (ActionCollection* coll, actionCollections())
+        coll->readSettings();
 }
 
-
 void GraphicalUi::saveShortcuts()
 {
     ShortcutSettings s;
     s.clear();
-    foreach(ActionCollection *coll, actionCollections())
-    coll->writeSettings();
+    foreach (ActionCollection* coll, actionCollections())
+        coll->writeSettings();
 }
 
-
-void GraphicalUi::setMainWidget(QWidget *widget)
+void GraphicalUi::setMainWidget(QWidget* widget)
 {
     _mainWidget = widget;
 }
 
-
-void GraphicalUi::setContextMenuActionProvider(ContextMenuActionProvider *provider)
+void GraphicalUi::setContextMenuActionProvider(ContextMenuActionProvider* provider)
 {
     _contextMenuActionProvider = provider;
 }
 
-
-void GraphicalUi::setToolBarActionProvider(ToolBarActionProvider *provider)
+void GraphicalUi::setToolBarActionProvider(ToolBarActionProvider* provider)
 {
     _toolBarActionProvider = provider;
 }
 
-
-void GraphicalUi::setUiStyle(UiStyle *style)
+void GraphicalUi::setUiStyle(UiStyle* style)
 {
     _uiStyle = style;
 }
 
-
 void GraphicalUi::disconnectedFromCore()
 {
     _contextMenuActionProvider->disconnectedFromCore();
@@ -136,8 +127,7 @@ void GraphicalUi::disconnectedFromCore()
     AbstractUi::disconnectedFromCore();
 }
 
-
-bool GraphicalUi::eventFilter(QObject *obj, QEvent *event)
+bool GraphicalUi::eventFilter(QObject* obj, QEvent* event)
 {
 #ifdef Q_OS_WIN
     if (obj == mainWidget() && event->type() == QEvent::ActivationChange) {
@@ -147,7 +137,6 @@ bool GraphicalUi::eventFilter(QObject *obj, QEvent *event)
     return AbstractUi::eventFilter(obj, event);
 }
 
-
 // NOTE: Window activation stuff seems to work just fine in Plasma 5 without requiring X11 hacks.
 // TODO: Evaluate cleaning all this up once we can get rid of Qt4/KDE4
 
@@ -189,13 +178,11 @@ bool GraphicalUi::checkMainWidgetVisibility(bool perform)
     return true;
 }
 
-
 bool GraphicalUi::isMainWidgetVisible()
 {
     return !instance()->checkMainWidgetVisibility(false);
 }
 
-
 void GraphicalUi::minimizeRestore(bool show)
 {
     if (show)
@@ -204,7 +191,6 @@ void GraphicalUi::minimizeRestore(bool show)
         hideMainWidget();
 }
 
-
 void GraphicalUi::activateMainWidget()
 {
 #ifdef Q_WS_X11
@@ -228,7 +214,6 @@ void GraphicalUi::activateMainWidget()
 #endif
 }
 
-
 void GraphicalUi::hideMainWidget()
 {
     if (instance()->isHidingMainWidgetAllowed())
@@ -239,7 +224,6 @@ void GraphicalUi::hideMainWidget()
 #endif
 }
 
-
 void GraphicalUi::toggleMainWidget()
 {
     instance()->checkMainWidgetVisibility(true);