Mercurial > octave

diff libgui/graphics/Container.cc @ 22411:c69805d1fa64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Style check C++ code in libgui/ * Backend.cc, Backend.h, 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, MouseModeActionGroup.cc, MouseModeActionGroup.h, Object.cc, Object.h, ObjectFactory.cc, ObjectFactory.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, TextControl.cc, TextControl.h, TextEdit.cc, TextEdit.h, ToggleButtonControl.cc, ToggleButtonControl.h, ToggleTool.cc, ToggleTool.h, ToolBar.cc, ToolBar.h, ToolBarButton.cc, ToolBarButton.h, __init_qt__.cc, __init_qt__.h, annotation-dialog.cc, annotation-dialog.h, gl-select.cc, gl-select.h, color-picker.cc, color-picker.h, dialog.h, documentation-dock-widget.cc, documentation-dock-widget.h, files-dock-widget.cc, files-dock-widget.h, find-files-dialog.h, find-files-model.cc, find-files-model.h, history-dock-widget.cc, history-dock-widget.h, liboctgui-build-info.h, liboctgui-build-info.in.cc, 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, octave-cmd.cc, octave-cmd.h, octave-dock-widget.cc, octave-dock-widget.h, octave-gui.cc, octave-gui.h, octave-interpreter.cc, octave-interpreter.h, octave-qt-link.cc, octave-qt-link.h, parser.cc, parser.h, webinfo.cc, webinfo.h, resource-manager.cc, resource-manager.h, settings-dialog.cc, settings-dialog.h, shortcut-manager.cc, shortcut-manager.h, terminal-dock-widget.h, thread-manager.cc, thread-manager.h, welcome-wizard.cc, welcome-wizard.h, workspace-model.cc, workspace-model.h, workspace-view.cc, workspace-view.h: Style check C++ code in libgui/
author Rik <rik@octave.org>
date Wed, 31 Aug 2016 12:20:46 -0700
parents bac0d6f07a3e
children 8758addcf265
line wrap: on
line diff
--- a/libgui/graphics/Container.cc	Wed Aug 31 14:37:33 2016 -0400
+++ b/libgui/graphics/Container.cc	Wed Aug 31 12:20:46 2016 -0700
@@ -37,51 +37,51 @@
 namespace QtHandles
 {
 
-Container::Container (QWidget* xparent)
-  : ContainerBase (xparent), m_canvas (0)
-{
-  setFocusPolicy (Qt::ClickFocus);
-}
+  Container::Container (QWidget* xparent)
+    : ContainerBase (xparent), m_canvas (0)
+  {
+    setFocusPolicy (Qt::ClickFocus);
+  }
 
-Container::~Container (void)
-{
-}
+  Container::~Container (void)
+  {
+  }
 
-Canvas*
-Container::canvas (const graphics_handle& gh, bool xcreate)
-{
-  if (! m_canvas && xcreate)
-    {
-      gh_manager::auto_lock lock;
-      graphics_object go = gh_manager::get_object (gh);
+  Canvas*
+  Container::canvas (const graphics_handle& gh, bool xcreate)
+  {
+    if (! m_canvas && xcreate)
+      {
+        gh_manager::auto_lock lock;
+        graphics_object go = gh_manager::get_object (gh);
 
-      if (go)
-        {
-          graphics_object fig = go.get_ancestor ("figure");
+        if (go)
+          {
+            graphics_object fig = go.get_ancestor ("figure");
 
-          m_canvas = Canvas::create (fig.get("renderer").string_value (),
-                                     this, gh);
+            m_canvas = Canvas::create (fig.get("renderer").string_value (),
+                                       this, gh);
 
-          QWidget* canvasWidget = m_canvas->qWidget ();
+            QWidget* canvasWidget = m_canvas->qWidget ();
 
-          canvasWidget->lower ();
-          canvasWidget->show ();
-          canvasWidget->setGeometry (0, 0, width (), height ());
-        }
-    }
+            canvasWidget->lower ();
+            canvasWidget->show ();
+            canvasWidget->setGeometry (0, 0, width (), height ());
+          }
+      }
 
-  return m_canvas;
-}
+    return m_canvas;
+  }
 
-void
-Container::resizeEvent (QResizeEvent* /* event */)
-{
-  if (m_canvas)
-    m_canvas->qWidget ()->setGeometry (0, 0, width (), height ());
+  void
+  Container::resizeEvent (QResizeEvent* /* event */)
+  {
+    if (m_canvas)
+      m_canvas->qWidget ()->setGeometry (0, 0, width (), height ());
 
-  gh_manager::auto_lock lock;
+    gh_manager::auto_lock lock;
 
-  foreach (QObject* qObj, children ())
+    foreach (QObject* qObj, children ())
     {
       if (qObj->isWidgetType ())
         {
@@ -96,19 +96,21 @@
                   Matrix bb = go.get_properties ().get_boundingbox (false);
 
                   obj->qWidget<QWidget> ()
-                    ->setGeometry (octave::math::round (bb(0)), octave::math::round (bb(1)),
-                                   octave::math::round (bb(2)), octave::math::round (bb(3)));
+                  ->setGeometry (octave::math::round (bb(0)), octave::math::round (bb(1)),
+                                 octave::math::round (bb(2)), octave::math::round (bb(3)));
                 }
             }
         }
     }
-}
+  }
 
-void
-Container::childEvent (QChildEvent* xevent)
-{
-  if (xevent->child ()->isWidgetType ())
-    qobject_cast<QWidget*> (xevent->child ())->setMouseTracking (hasMouseTracking ());
-}
+  void
+  Container::childEvent (QChildEvent* xevent)
+  {
+    if (xevent->child ()->isWidgetType ())
+      qobject_cast<QWidget*> (xevent->child ())->setMouseTracking (
+        hasMouseTracking ());
+  }
 
 }; // namespace QtHandles
+