Mercurial > octave

diff libgui/graphics/Canvas.cc @ 19967:3cc0734283dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style fixes in Qt graphics code * Backend.cc, BaseControl.cc, ButtonControl.cc, Canvas.cc, CheckBoxControl.cc, Container.cc, ContextMenu.cc, EditControl.cc, Figure.cc, FigureWindow.cc, GLCanvas.cc, KeyMap.cc, ListBoxControl.cc, Logger.cc, Menu.cc, MouseModeActionGroup.cc, Object.cc, ObjectFactory.cc, ObjectProxy.cc, Panel.cc, PopupMenuControl.cc, PushButtonControl.cc, PushTool.cc, QtHandlesUtils.cc, RadioButtonControl.cc, SliderControl.cc, TextControl.cc, TextEdit.cc, ToggleButtonControl.cc, ToggleTool.cc, ToolBar.cc, ToolBarButton.cc, __init_qt__.cc: Follow a few more Octave coding conventions.
author John W. Eaton <jwe@octave.org>
date Thu, 19 Mar 2015 12:27:54 -0400
parents 210b301a3e39
children 0376c1225660 f0e61a67ad9f
line wrap: on
line diff
--- a/libgui/graphics/Canvas.cc	Thu Mar 19 12:25:28 2015 -0400
+++ b/libgui/graphics/Canvas.cc	Thu Mar 19 12:27:54 2015 -0400
@@ -43,7 +43,8 @@
 namespace QtHandles
 {
 
-void Canvas::redraw (bool sync)
+void
+Canvas::redraw (bool sync)
 {
   QWidget *w = qWidget ();
 
@@ -56,12 +57,14 @@
     }
 }
 
-void Canvas::blockRedraw (bool block)
+void
+Canvas::blockRedraw (bool block)
 {
   m_redrawBlocked = block;
 }
 
-void Canvas::setCursor (MouseMode mode)
+void
+Canvas::setCursor (MouseMode mode)
 {
   QWidget *w = qWidget ();
 
@@ -91,7 +94,8 @@
     }
 }
 
-void Canvas::print (const QString& file_cmd, const QString& term)
+void
+Canvas::print (const QString& file_cmd, const QString& term)
 {
   gh_manager::auto_lock lock;
   graphics_object obj = gh_manager::get_object (m_handle);
@@ -104,8 +108,9 @@
     }
 }
 
-void Canvas::updateCurrentPoint(const graphics_object& fig,
-                                const graphics_object& obj, QMouseEvent* event)
+void
+Canvas::updateCurrentPoint(const graphics_object& fig,
+                           const graphics_object& obj, QMouseEvent* event)
 {
   gh_manager::auto_lock lock;
 
@@ -141,7 +146,8 @@
     }
 }
 
-void Canvas::canvasToggleAxes (const graphics_handle& handle)
+void
+Canvas::canvasToggleAxes (const graphics_handle& handle)
 {
   gh_manager::auto_lock lock;
 
@@ -169,7 +175,8 @@
     }
 }
 
-void Canvas::canvasToggleGrid (const graphics_handle& handle)
+void
+Canvas::canvasToggleGrid (const graphics_handle& handle)
 {
   gh_manager::auto_lock lock;
 
@@ -219,7 +226,8 @@
   ap.set_zlimmode ("auto");
 }
 
-void Canvas::canvasAutoAxes (const graphics_handle& handle)
+void
+Canvas::canvasAutoAxes (const graphics_handle& handle)
 {
   gh_manager::auto_lock lock;
 
@@ -247,7 +255,8 @@
     }
 }
 
-void Canvas::canvasPaintEvent (void)
+void
+Canvas::canvasPaintEvent (void)
 {
   if (! m_redrawBlocked)
     {
@@ -332,7 +341,8 @@
   return zm.contents ("Direction").string_value ();
 }
 
-void Canvas::canvasMouseMoveEvent (QMouseEvent* event)
+void
+Canvas::canvasMouseMoveEvent (QMouseEvent* event)
 {
   gh_manager::auto_lock lock;
   graphics_object ax = gh_manager::get_object (m_mouseAxes);
@@ -401,7 +411,8 @@
     }
 }
 
-void Canvas::canvasMouseDoubleClickEvent (QMouseEvent* event)
+void
+Canvas::canvasMouseDoubleClickEvent (QMouseEvent* event)
 {
   if (event->buttons () != Qt::LeftButton)
     return;
@@ -485,7 +496,8 @@
   return retval;
 }
 
-void Canvas::canvasMousePressEvent (QMouseEvent* event)
+void
+Canvas::canvasMousePressEvent (QMouseEvent* event)
 {
   gh_manager::auto_lock lock;
   graphics_object obj = gh_manager::get_object (m_handle);
@@ -656,7 +668,8 @@
     }
 }
 
-void Canvas::canvasMouseReleaseEvent (QMouseEvent* event)
+void
+Canvas::canvasMouseReleaseEvent (QMouseEvent* event)
 {
   if ((m_mouseMode == ZoomInMode || m_mouseMode == ZoomOutMode)
       && m_mouseAxes.ok ())
@@ -722,7 +735,8 @@
   m_mouseMode = NoMode;
 }
 
-void Canvas::canvasWheelEvent (QWheelEvent* event)
+void
+Canvas::canvasWheelEvent (QWheelEvent* event)
 {
   gh_manager::auto_lock lock;
   graphics_object obj = gh_manager::get_object (m_handle);
@@ -829,7 +843,8 @@
     }
 }
 
-bool Canvas::canvasKeyPressEvent (QKeyEvent* event)
+bool
+Canvas::canvasKeyPressEvent (QKeyEvent* event)
 {
   if (m_eventMask & KeyPress)
     {
@@ -845,7 +860,8 @@
   return false;
 }
 
-bool Canvas::canvasKeyReleaseEvent (QKeyEvent* event)
+bool
+Canvas::canvasKeyReleaseEvent (QKeyEvent* event)
 {
   if (! event->isAutoRepeat () && (m_eventMask & KeyRelease))
     {
@@ -858,8 +874,9 @@
   return false;
 }
 
-Canvas* Canvas::create (const std::string& /* name */, QWidget* parent,
-                        const graphics_handle& handle)
+Canvas*
+Canvas::create (const std::string& /* name */, QWidget* parent,
+                const graphics_handle& handle)
 {
   // Only OpenGL
   return new GLCanvas (parent, handle);