Mercurial > octave

diff libgui/graphics/Menu.cc @ 23449:c763214a8260

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Use convention 'int *x' for naming pointers. * mycell.c, myfeval.c, mypow2.c, myprop.c, myset.c, mystruct.c, 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, 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, color-picker.cc, file-editor-tab.cc, file-editor.cc, file-editor.h, find-dialog.cc, find-dialog.h, octave-qscintilla.cc, main-window.cc, main-window.h, octave-cmd.cc, octave-dock-widget.cc, parser.cc, shortcut-manager.cc, workspace-view.cc, __ichol__.cc, __ilu__.cc, __magick_read__.cc, c-file-ptr-stream.cc, c-file-ptr-stream.h, cellfun.cc, data.cc, gl2ps-print.cc, graphics.cc, graphics.in.h, ls-hdf5.cc, ls-hdf5.h, ls-mat5.cc, mex.h, oct-map.cc, oct-map.h, oct-stream.cc, octave-link.cc, profiler.cc, profiler.h, psi.cc, qz.cc, sighandlers.cc, symtab.h, txt-eng.h, zfstream.cc, zfstream.h, __init_fltk__.cc, audiodevinfo.cc, gzip.cc, ov-class.cc, ov-classdef.cc, ov-classdef.h, ov-dld-fcn.h, ov-fcn-inline.cc, ov-java.cc, ov-java.h, ov.cc, pt-arg-list.cc, pt-array-list.cc, pt-bp.cc, pt-check.cc, pt-classdef.h, pt-decl.cc, pt-eval.cc, pt-idx.cc, pt-idx.h, pt-jit.cc, pt-misc.cc, pt-pr-code.cc, pt-select.cc, pt-stmt.cc, Array.cc, Array.h, CMatrix.cc, MSparse.cc, Sparse.h, dMatrix.cc, dim-vector.h, fCMatrix.cc, fMatrix.cc, CollocWt.cc, bsxfun-defs.cc, eigs-base.cc, gsvd.cc, gsvd.h, lo-lapack-proto.h, oct-norm.cc, randmtzig.cc, svd.cc, svd.h, mx-inlines.cc, oct-binmap.h, oct-sort.cc, oct-sort.h, oct-string.cc, oct-string.h, sparse-sort.cc, sparse-sort.h: Use convention 'int *x' for naming pointers.
author Rik <rik@octave.org>
date Thu, 27 Apr 2017 15:18:20 -0700
parents db1fdf4384dd
children 21baad6b35c4
line wrap: on
line diff
--- a/libgui/graphics/Menu.cc	Thu Apr 27 15:26:32 2017 -0400
+++ b/libgui/graphics/Menu.cc	Thu Apr 27 15:18:20 2017 -0700
@@ -60,11 +60,11 @@
   Menu*
   Menu::create (const graphics_object& go)
   {
-    Object* parent_obj = Object::parentObject (go);
+    Object *parent_obj = Object::parentObject (go);
 
     if (parent_obj)
       {
-        QObject* qObj = parent_obj->qObject ();
+        QObject *qObj = parent_obj->qObject ();
 
         if (qObj)
           return new Menu (go, new QAction (qObj), parent_obj);
@@ -73,7 +73,7 @@
     return 0;
   }
 
-  Menu::Menu (const graphics_object& go, QAction* action, Object* xparent)
+  Menu::Menu (const graphics_object& go, QAction *action, Object *xparent)
     : Object (go, action), m_parent (0), m_separator (0)
   {
     uimenu::properties& up = properties<uimenu> ();
@@ -97,7 +97,7 @@
         m_separator->setVisible (up.is_visible ());
       }
 
-    MenuContainer* menuContainer = dynamic_cast<MenuContainer *> (xparent);
+    MenuContainer *menuContainer = dynamic_cast<MenuContainer *> (xparent);
 
     if (menuContainer)
       m_parent = menuContainer->menu ();
@@ -114,7 +114,7 @@
 
             int count = 0;
 
-            foreach (QAction* a, m_parent->actions ())
+            foreach (QAction *a, m_parent->actions ())
               if (! a->isSeparator ())
                 count++;
 
@@ -125,9 +125,9 @@
           {
 
             int count = 0;
-            QAction* before = 0;
+            QAction *before = 0;
 
-            foreach (QAction* a, m_parent->actions ())
+            foreach (QAction *a, m_parent->actions ())
               {
                 if (! a->isSeparator ())
                   {
@@ -162,7 +162,7 @@
   Menu::update (int pId)
   {
     uimenu::properties& up = properties<uimenu> ();
-    QAction* action = qWidget<QAction> ();
+    QAction *action = qWidget<QAction> ();
 
     switch (pId)
       {
@@ -226,13 +226,13 @@
           m_parent->removeAction (action);
 
           int pos = static_cast<int> (up.get_position ());
-          QAction* before = 0;
+          QAction *before = 0;
 
           if (pos > 0)
             {
               int count = 0;
 
-              foreach (QAction* a, m_parent->actions ())
+              foreach (QAction *a, m_parent->actions ())
                 {
                   if (! a->isSeparator ())
                     {
@@ -264,8 +264,8 @@
   QWidget*
   Menu::menu (void)
   {
-    QAction* action = qWidget<QAction> ();
-    QMenu* _menu = action->menu ();
+    QAction *action = qWidget<QAction> ();
+    QMenu *_menu = action->menu ();
 
     if (! _menu)
       {
@@ -282,7 +282,7 @@
   void
   Menu::actionTriggered (void)
   {
-    QAction* action = qWidget<QAction> ();
+    QAction *action = qWidget<QAction> ();
 
     if (action->isCheckable ())
       action->setChecked (! action->isChecked ());
@@ -302,11 +302,11 @@
       {
         double count = 1.0;
 
-        foreach (QAction* a, m_parent->actions ())
+        foreach (QAction *a, m_parent->actions ())
           {
             if (! a->isSeparator ())
               {
-                Object* aObj = Object::fromQObject (a);
+                Object *aObj = Object::fromQObject (a);
 
                 if (aObj)
                   {