Mercurial > octave

diff libgui/graphics/EditControl.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 2f4406e9dad6
children f0e61a67ad9f
line wrap: on
line diff
--- a/libgui/graphics/EditControl.cc	Thu Mar 19 12:25:28 2015 -0400
+++ b/libgui/graphics/EditControl.cc	Thu Mar 19 12:27:54 2015 -0400
@@ -34,7 +34,8 @@
 namespace QtHandles
 {
 
-EditControl* EditControl::create (const graphics_object& go)
+EditControl*
+EditControl::create (const graphics_object& go)
 {
   Object* parent = Object::parentObject (go);
 
@@ -62,7 +63,8 @@
   init (edit);
 }
 
-void EditControl::init (QLineEdit* edit, bool callBase)
+void
+EditControl::init (QLineEdit* edit, bool callBase)
 {
   if (callBase)
     BaseControl::init (edit, callBase);
@@ -83,12 +85,13 @@
 }
 
 EditControl::EditControl (const graphics_object& go, TextEdit* edit)
-     : BaseControl (go, edit), m_multiLine (true), m_textChanged (false)
+  : BaseControl (go, edit), m_multiLine (true), m_textChanged (false)
 {
   init (edit);
 }
 
-void EditControl::init (TextEdit* edit, bool callBase)
+void
+EditControl::init (TextEdit* edit, bool callBase)
 {
   if (callBase)
     BaseControl::init (edit, callBase);
@@ -112,12 +115,14 @@
 {
 }
 
-void EditControl::initCommon (QWidget*)
+void
+EditControl::initCommon (QWidget*)
 {
   m_textChanged = false;
 }
 
-void EditControl::update (int pId)
+void
+EditControl::update (int pId)
 {
   bool handled = false;
 
@@ -137,7 +142,8 @@
     }
 }
 
-bool EditControl::updateSingleLine (int pId)
+bool
+EditControl::updateSingleLine (int pId)
 {
   uicontrol::properties& up = properties<uicontrol> ();
   QLineEdit* edit = qWidget<QLineEdit> ();
@@ -147,11 +153,13 @@
     case uicontrol::properties::ID_STRING:
       edit->setText (Utils::fromStdString (up.get_string_string ()));
       return true;
+
     case uicontrol::properties::ID_HORIZONTALALIGNMENT:
     case uicontrol::properties::ID_VERTICALALIGNMENT:
       edit->setAlignment (Utils::fromHVAlign (up.get_horizontalalignment (),
                                               up.get_verticalalignment ()));
       return true;
+
     case uicontrol::properties::ID_MIN:
     case uicontrol::properties::ID_MAX:
       if ((up.get_max () - up.get_min ()) > 1)
@@ -162,6 +170,7 @@
           init (new TextEdit (container), true);
         }
       return true;
+
     default:
       break;
     }
@@ -169,7 +178,8 @@
   return false;
 }
 
-bool EditControl::updateMultiLine (int pId)
+bool
+EditControl::updateMultiLine (int pId)
 {
   uicontrol::properties& up = properties<uicontrol> ();
   TextEdit* edit = qWidget<TextEdit> ();
@@ -179,6 +189,7 @@
     case uicontrol::properties::ID_STRING:
       edit->setPlainText (Utils::fromStdString (up.get_string_string ()));
       return true;
+
     case uicontrol::properties::ID_MIN:
     case uicontrol::properties::ID_MAX:
       if ((up.get_max () - up.get_min ()) <= 1)
@@ -189,6 +200,7 @@
           init (new QLineEdit (container), true);
         }
       return true;
+
     default:
       break;
     }
@@ -196,12 +208,14 @@
   return false;
 }
 
-void EditControl::textChanged (void)
+void
+EditControl::textChanged (void)
 {
   m_textChanged = true;
 }
 
-void EditControl::editingFinished (void)
+void
+EditControl::editingFinished (void)
 {
   if (m_textChanged)
     {