Mercurial > octave

diff libgui/graphics/Object.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 b6061813a693
children f0e61a67ad9f
line wrap: on
line diff
--- a/libgui/graphics/Object.cc	Thu Mar 19 12:25:28 2015 -0400
+++ b/libgui/graphics/Object.cc	Thu Mar 19 12:27:54 2015 -0400
@@ -47,7 +47,8 @@
   init (obj);
 }
 
-void Object::init (QObject* obj, bool)
+void
+Object::init (QObject* obj, bool)
 {
   if (m_qobject)
     qCritical ("QtHandles::Object::init: "
@@ -68,7 +69,8 @@
 {
 }
 
-graphics_object Object::object (void) const
+graphics_object
+Object::object (void) const
 {
   gh_manager::auto_lock lock (false);
 
@@ -80,7 +82,8 @@
   return gh_manager::get_object (m_handle);
 }
 
-void Object::slotUpdate (int pId)
+void
+Object::slotUpdate (int pId)
 {
   gh_manager::auto_lock lock;
 
@@ -92,6 +95,7 @@
     case base_properties::ID_BEINGDELETED:
       beingDeleted ();
       break;
+
     default:
       if (object ().valid_object ())
         update (pId);
@@ -99,14 +103,16 @@
     }
 }
 
-void Object::slotFinalize (void)
+void
+Object::slotFinalize (void)
 {
   gh_manager::auto_lock lock;
 
   finalize ();
 }
 
-void Object::slotRedraw (void)
+void
+Object::slotRedraw (void)
 {
   gh_manager::auto_lock lock;
 
@@ -114,7 +120,8 @@
     redraw ();
 }
 
-void Object::slotPrint (const QString& file_cmd, const QString& term)
+void
+Object::slotPrint (const QString& file_cmd, const QString& term)
 {
   gh_manager::auto_lock lock;
 
@@ -122,11 +129,13 @@
     print (file_cmd, term);
 }
 
-void Object::update (int /* pId */)
+void
+Object::update (int /* pId */)
 {
 }
 
-void Object::finalize (void)
+void
+Object::finalize (void)
 {
   if (m_qobject)
     {
@@ -136,15 +145,18 @@
   deleteLater ();
 }
 
-void Object::redraw (void)
+void
+Object::redraw (void)
 {
 }
 
-void Object::print (const QString& /* file_cmd */, const QString& /* term */)
+void
+Object::print (const QString& /* file_cmd */, const QString& /* term */)
 {
 }
 
-void Object::beingDeleted (void)
+void
+Object::beingDeleted (void)
 {
 }
 
@@ -154,7 +166,8 @@
     m_qobject = 0;
 }
 
-Object* Object::parentObject (const graphics_object& go)
+Object*
+Object::parentObject (const graphics_object& go)
 {
   gh_manager::auto_lock lock;
 
@@ -164,7 +177,8 @@
   return parent;
 }
 
-Object* Object::fromQObject (QObject* obj)
+Object*
+Object::fromQObject (QObject* obj)
 {
   QVariant v = obj->property ("QtHandles::Object");