Mercurial > octave
diff libgui/graphics/EditControl.cc @ 23449:c763214a8260
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 | 092078913d54 |
| children | 980f39c3ab90 |
line wrap: on
line diff
--- a/libgui/graphics/EditControl.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/EditControl.cc Thu Apr 27 15:18:20 2017 -0700 @@ -37,11 +37,11 @@ EditControl* EditControl::create (const graphics_object& go) { - Object* parent = Object::parentObject (go); + Object *parent = Object::parentObject (go); if (parent) { - Container* container = parent->innerContainer (); + Container *container = parent->innerContainer (); if (container) { @@ -57,14 +57,14 @@ return 0; } - EditControl::EditControl (const graphics_object& go, QLineEdit* edit) + EditControl::EditControl (const graphics_object& go, QLineEdit *edit) : BaseControl (go, edit), m_multiLine (false), m_textChanged (false) { init (edit); } void - EditControl::init (QLineEdit* edit, bool callBase) + EditControl::init (QLineEdit *edit, bool callBase) { if (callBase) BaseControl::init (edit, callBase); @@ -86,14 +86,14 @@ SLOT (returnPressed (void))); } - EditControl::EditControl (const graphics_object& go, TextEdit* edit) + EditControl::EditControl (const graphics_object& go, TextEdit *edit) : BaseControl (go, edit), m_multiLine (true), m_textChanged (false) { init (edit); } void - EditControl::init (TextEdit* edit, bool callBase) + EditControl::init (TextEdit *edit, bool callBase) { if (callBase) BaseControl::init (edit, callBase); @@ -149,7 +149,7 @@ EditControl::updateSingleLine (int pId) { uicontrol::properties& up = properties<uicontrol> (); - QLineEdit* edit = qWidget<QLineEdit> (); + QLineEdit *edit = qWidget<QLineEdit> (); switch (pId) { @@ -167,7 +167,7 @@ case uicontrol::properties::ID_MAX: if ((up.get_max () - up.get_min ()) > 1) { - QWidget* container = edit->parentWidget (); + QWidget *container = edit->parentWidget (); delete edit; init (new TextEdit (container), true); @@ -185,7 +185,7 @@ EditControl::updateMultiLine (int pId) { uicontrol::properties& up = properties<uicontrol> (); - TextEdit* edit = qWidget<TextEdit> (); + TextEdit *edit = qWidget<TextEdit> (); switch (pId) { @@ -198,7 +198,7 @@ case uicontrol::properties::ID_MAX: if ((up.get_max () - up.get_min ()) <= 1) { - QWidget* container = edit->parentWidget (); + QWidget *container = edit->parentWidget (); delete edit; init (new QLineEdit (container), true);