changeset 20073:726df008104d

maint: More cleanup of C++ code to follow Octave coding conventions. * ListBoxControl.cc, graphics.cc, ls-mat5.cc: Break long lines before comparison ops.
author John W. Eaton <jwe@octave.org>
date Thu, 26 Feb 2015 13:54:11 -0500
parents e9f89866074c
children 6ba3d0f7c6e8
files libgui/graphics/ListBoxControl.cc libinterp/corefcn/graphics.cc libinterp/corefcn/ls-mat5.cc
diffstat 3 files changed, 8 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/graphics/ListBoxControl.cc
+++ b/libgui/graphics/ListBoxControl.cc
@@ -98,9 +98,8 @@
           if (1 <= idx && idx <= lc)
             {
               list->item (idx-1)->setSelected (true);
-              if (i == 0
-                  && list->selectionMode () ==
-                        QAbstractItemView::SingleSelection)
+              if (i == 0 && (list->selectionMode ()
+                             == QAbstractItemView::SingleSelection))
                 break;
             }
         }
--- a/libinterp/corefcn/graphics.cc
+++ b/libinterp/corefcn/graphics.cc
@@ -6145,8 +6145,8 @@
 void
 axes::properties::update_aspectratios (void)
 {
-  if (updating_aspectratios.find (get___myhandle__ ().value ()) !=
-      updating_aspectratios.end ())
+  if (updating_aspectratios.find (get___myhandle__ ().value ())
+      != updating_aspectratios.end ())
     return;
 
   Matrix xlimits = get_xlim ().matrix_value ();
@@ -7172,8 +7172,8 @@
 axes::update_axis_limits (const std::string& axis_type,
                           const graphics_handle& h)
 {
-  if (updating_axis_limits.find (get_handle ().value ()) !=
-      updating_axis_limits.end ())
+  if (updating_axis_limits.find (get_handle ().value ())
+      != updating_axis_limits.end ())
     return;
 
   Matrix kids = Matrix (1, 1, h.value ());
--- a/libinterp/corefcn/ls-mat5.cc
+++ b/libinterp/corefcn/ls-mat5.cc
@@ -1279,8 +1279,8 @@
                       warning ("load: unable to reconstruct object inheritance");
 
                     tc = cls;
-                    if (load_path::find_method (classname, "loadobj") !=
-                        std::string ())
+                    if (load_path::find_method (classname, "loadobj")
+                        != std::string ())
                       {
                         octave_value_list tmp = feval ("loadobj", tc, 1);