Mercurial > octave

diff libgui/graphics/ToolBar.cc @ 31648:29d734430e5f stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Re-indent code after switch to using namespace macros. * BaseControl.cc, BaseControl.h, ButtonControl.cc, ButtonControl.h, ButtonGroup.cc, ButtonGroup.h, Canvas.cc, Canvas.h, CheckBoxControl.cc, CheckBoxControl.h, Container.cc, Container.h, ContextMenu.cc, ContextMenu.h, EditControl.cc, EditControl.h, Figure.cc, Figure.h, FigureWindow.cc, FigureWindow.h, GLCanvas.cc, GLCanvas.h, GenericEventNotify.h, KeyMap.cc, KeyMap.h, ListBoxControl.cc, ListBoxControl.h, Logger.cc, Logger.h, Menu.cc, Menu.h, MenuContainer.h, Object.cc, Object.h, ObjectProxy.cc, ObjectProxy.h, Panel.cc, Panel.h, PopupMenuControl.cc, PopupMenuControl.h, PushButtonControl.cc, PushButtonControl.h, PushTool.cc, PushTool.h, QtHandlesUtils.cc, QtHandlesUtils.h, RadioButtonControl.cc, RadioButtonControl.h, SliderControl.cc, SliderControl.h, Table.cc, Table.h, TextControl.cc, TextControl.h, TextEdit.cc, TextEdit.h, ToggleButtonControl.cc, ToggleButtonControl.h, ToggleTool.cc, ToggleTool.h, ToolBar.cc, ToolBar.h, ToolBarButton.cc, ToolBarButton.h, annotation-dialog.cc, annotation-dialog.h, gl-select.cc, gl-select.h, qopengl-functions.h, qt-graphics-toolkit.cc, qt-graphics-toolkit.h, module.mk, QTerminal.h, color-picker.cc, color-picker.h, command-widget.cc, command-widget.h, community-news.cc, community-news.h, dialog.cc, dialog.h, documentation-bookmarks.cc, documentation-bookmarks.h, documentation-dock-widget.cc, documentation-dock-widget.h, documentation.cc, documentation.h, dw-main-window.cc, dw-main-window.h, external-editor-interface.cc, external-editor-interface.h, files-dock-widget.cc, files-dock-widget.h, find-files-dialog.cc, find-files-dialog.h, find-files-model.cc, find-files-model.h, graphics-init.cc, graphics-init.h, gui-settings.cc, gui-settings.h, gui-utils.cc, gui-utils.h, history-dock-widget.cc, history-dock-widget.h, interpreter-qobject.cc, interpreter-qobject.h, led-indicator.cc, led-indicator.h, file-editor-interface.h, file-editor-tab.cc, file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc, find-dialog.h, marker.cc, marker.h, octave-qscintilla.cc, octave-qscintilla.h, octave-txt-lexer.cc, octave-txt-lexer.h, main-window.cc, main-window.h, news-reader.cc, news-reader.h, octave-dock-widget.cc, octave-dock-widget.h, octave-qobject.cc, octave-qobject.h, qt-application.cc, qt-application.h, qt-interpreter-events.cc, qt-interpreter-events.h, qt-utils.h, release-notes.cc, release-notes.h, resource-manager.cc, resource-manager.h, set-path-dialog.cc, set-path-dialog.h, set-path-model.cc, set-path-model.h, settings-dialog.cc, settings-dialog.h, shortcut-manager.cc, shortcut-manager.h, tab-bar.cc, tab-bar.h, terminal-dock-widget.cc, terminal-dock-widget.h, variable-editor-model.cc, variable-editor-model.h, variable-editor.cc, variable-editor.h, welcome-wizard.cc, welcome-wizard.h, workspace-model.cc, workspace-model.h, workspace-view.cc, workspace-view.h: Re-indent code after switch to using namespace macros.
author John W. Eaton <jwe@octave.org>
date Tue, 06 Dec 2022 14:53:00 -0500
parents c6d54dd31a7e
children deb553ac2c54 597f3ee61a48
line wrap: on
line diff
--- a/libgui/graphics/ToolBar.cc	Tue Dec 06 14:37:51 2022 -0500
+++ b/libgui/graphics/ToolBar.cc	Tue Dec 06 14:53:00 2022 -0500
@@ -46,144 +46,144 @@
 
 OCTAVE_BEGIN_NAMESPACE(octave)
 
-  static QIcon makeEmptyIcon (void)
-  {
-    QPixmap pix (16, 16);
+static QIcon makeEmptyIcon (void)
+{
+  QPixmap pix (16, 16);
 
-    pix.fill (Qt::transparent);
+  pix.fill (Qt::transparent);
 
-    return QIcon (pix);
-  }
+  return QIcon (pix);
+}
 
-  static QAction *
-  addEmptyAction (QToolBar *bar)
-  {
-    static const QIcon empty_icon = makeEmptyIcon ();
+static QAction *
+addEmptyAction (QToolBar *bar)
+{
+  static const QIcon empty_icon = makeEmptyIcon ();
 
-    QAction *a = bar->addAction (empty_icon, "Empty Toolbar");
+  QAction *a = bar->addAction (empty_icon, "Empty Toolbar");
 
-    a->setEnabled (false);
-    a->setToolTip ("");
+  a->setEnabled (false);
+  a->setToolTip ("");
 
-    return a;
-  }
+  return a;
+}
 
-  ToolBar *
-  ToolBar::create (octave::base_qobject& oct_qobj, octave::interpreter& interp,
-                   const graphics_object& go)
-  {
-    Object *parent = parentObject (interp, go);
+ToolBar *
+ToolBar::create (octave::base_qobject& oct_qobj, octave::interpreter& interp,
+                 const graphics_object& go)
+{
+  Object *parent = parentObject (interp, go);
 
-    if (parent)
-      {
-        QWidget *parentWidget = parent->qWidget<QWidget> ();
+  if (parent)
+    {
+      QWidget *parentWidget = parent->qWidget<QWidget> ();
 
-        if (parentWidget)
-          return new ToolBar (oct_qobj, interp, go,
-                              new QToolBar (parentWidget));
-      }
+      if (parentWidget)
+        return new ToolBar (oct_qobj, interp, go,
+                            new QToolBar (parentWidget));
+    }
 
-    return nullptr;
-  }
+  return nullptr;
+}
 
-  ToolBar::ToolBar (octave::base_qobject& oct_qobj, octave::interpreter& interp,
-                    const graphics_object& go, QToolBar *bar)
-    : Object (oct_qobj, interp, go, bar), m_empty (nullptr), m_figure (nullptr)
-  {
-    uitoolbar::properties& tp = properties<uitoolbar> ();
+ToolBar::ToolBar (octave::base_qobject& oct_qobj, octave::interpreter& interp,
+                  const graphics_object& go, QToolBar *bar)
+  : Object (oct_qobj, interp, go, bar), m_empty (nullptr), m_figure (nullptr)
+{
+  uitoolbar::properties& tp = properties<uitoolbar> ();
 
-    bar->setFloatable (false);
-    bar->setMovable (false);
-    bar->setVisible (tp.is_visible ());
-    bar->setStyleSheet (bar->styleSheet () + global_toolbar_style);
+  bar->setFloatable (false);
+  bar->setMovable (false);
+  bar->setVisible (tp.is_visible ());
+  bar->setStyleSheet (bar->styleSheet () + global_toolbar_style);
 
-    m_empty = addEmptyAction (bar);
+  m_empty = addEmptyAction (bar);
 
-    m_figure =
-      dynamic_cast<Figure *> (Object::fromQObject (bar->parentWidget ()));
+  m_figure =
+    dynamic_cast<Figure *> (Object::fromQObject (bar->parentWidget ()));
 
-    if (m_figure)
-      m_figure->addCustomToolBar (bar, tp.is_visible (),
-                                  tp.get_tag () == "__default_toolbar__");
+  if (m_figure)
+    m_figure->addCustomToolBar (bar, tp.is_visible (),
+                                tp.get_tag () == "__default_toolbar__");
 
-    bar->installEventFilter (this);
-  }
+  bar->installEventFilter (this);
+}
 
-  ToolBar::~ToolBar (void)
-  { }
+ToolBar::~ToolBar (void)
+{ }
 
-  void
-  ToolBar::update (int pId)
-  {
-    uitoolbar::properties& tp = properties<uitoolbar> ();
-    QToolBar *bar = qWidget<QToolBar> ();
+void
+ToolBar::update (int pId)
+{
+  uitoolbar::properties& tp = properties<uitoolbar> ();
+  QToolBar *bar = qWidget<QToolBar> ();
 
-    switch (pId)
-      {
-      case base_properties::ID_VISIBLE:
-        if (m_figure)
-          m_figure->showCustomToolBar (bar, tp.is_visible ());
-        break;
+  switch (pId)
+    {
+    case base_properties::ID_VISIBLE:
+      if (m_figure)
+        m_figure->showCustomToolBar (bar, tp.is_visible ());
+      break;
 
-      default:
-        Object::update (pId);
-        break;
-      }
-  }
+    default:
+      Object::update (pId);
+      break;
+    }
+}
 
-  bool
-  ToolBar::eventFilter (QObject *watched, QEvent *xevent)
-  {
-    if (watched == qObject ())
-      {
-        switch (xevent->type ())
+bool
+ToolBar::eventFilter (QObject *watched, QEvent *xevent)
+{
+  if (watched == qObject ())
+    {
+      switch (xevent->type ())
+        {
+        case QEvent::ActionAdded:
+        case QEvent::ActionRemoved:
           {
-          case QEvent::ActionAdded:
-          case QEvent::ActionRemoved:
-            {
-              QActionEvent *ae = dynamic_cast<QActionEvent *> (xevent);
-              QToolBar *bar = qWidget<QToolBar> ();
+            QActionEvent *ae = dynamic_cast<QActionEvent *> (xevent);
+            QToolBar *bar = qWidget<QToolBar> ();
 
-              if (ae->action () != m_empty)
-                {
-                  if (xevent->type () == QEvent::ActionAdded)
-                    {
-                      if (bar->actions ().size () == 2)
-                        QTimer::singleShot (0, this, &ToolBar::hideEmpty);
-                    }
-                  else
-                    {
-                      if (bar->actions ().size () == 1)
-                        m_empty->setVisible (true);
-                    }
-                }
-            }
-            break;
+            if (ae->action () != m_empty)
+              {
+                if (xevent->type () == QEvent::ActionAdded)
+                  {
+                    if (bar->actions ().size () == 2)
+                      QTimer::singleShot (0, this, &ToolBar::hideEmpty);
+                  }
+                else
+                  {
+                    if (bar->actions ().size () == 1)
+                      m_empty->setVisible (true);
+                  }
+              }
+          }
+          break;
 
-          default:
-            break;
-          }
-      }
+        default:
+          break;
+        }
+    }
 
-    return false;
-  }
+  return false;
+}
 
-  void
-  ToolBar::hideEmpty (void)
-  {
-    m_empty->setVisible (false);
-  }
+void
+ToolBar::hideEmpty (void)
+{
+  m_empty->setVisible (false);
+}
 
-  void
-  ToolBar::beingDeleted (void)
-  {
-    if (m_figure)
-      {
-        QToolBar *bar = qWidget<QToolBar> ();
+void
+ToolBar::beingDeleted (void)
+{
+  if (m_figure)
+    {
+      QToolBar *bar = qWidget<QToolBar> ();
 
-        if (bar)
-          m_figure->showCustomToolBar (bar, false);
-      }
-  }
+      if (bar)
+        m_figure->showCustomToolBar (bar, false);
+    }
+}
 
 OCTAVE_END_NAMESPACE(octave)