Mercurial > octave
diff libgui/graphics/Canvas.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 | db1fdf4384dd |
| children | 855122b993da |
line wrap: on
line diff
--- a/libgui/graphics/Canvas.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/Canvas.cc Thu Apr 27 15:18:20 2017 -0700 @@ -122,7 +122,7 @@ */ void Canvas::updateCurrentPoint (const graphics_object& fig, - const graphics_object& obj, QMouseEvent* event) + const graphics_object& obj, QMouseEvent *event) { gh_manager::auto_lock lock; @@ -372,7 +372,7 @@ } void - Canvas::select_object (graphics_object obj, QMouseEvent* event, + Canvas::select_object (graphics_object obj, QMouseEvent *event, graphics_object& currentObj, graphics_object& axesObj, bool axes_only, std::vector<std::string> omit) { @@ -474,7 +474,7 @@ } void - Canvas::canvasMouseMoveEvent (QMouseEvent* event) + Canvas::canvasMouseMoveEvent (QMouseEvent *event) { gh_manager::auto_lock lock; graphics_object ax = gh_manager::get_object (m_mouseAxes); @@ -562,7 +562,7 @@ { // FIXME: should we use signal/slot mechanism instead of // directly calling parent fig methods - Figure* fig = + Figure *fig = dynamic_cast<Figure *> (Backend::toolkitObject (figObj)); axes::properties& ap = Utils::properties<axes> (axesObj); @@ -573,7 +573,7 @@ } void - Canvas::canvasMouseDoubleClickEvent (QMouseEvent* event) + Canvas::canvasMouseDoubleClickEvent (QMouseEvent *event) { // same processing as normal click, but event type is MouseButtonDblClick canvasMousePressEvent (event); @@ -606,7 +606,7 @@ } void - Canvas::canvasMousePressEvent (QMouseEvent* event) + Canvas::canvasMousePressEvent (QMouseEvent *event) { gh_manager::auto_lock lock; graphics_object obj = gh_manager::get_object (m_handle); @@ -649,7 +649,7 @@ Utils::properties<figure> (figObj).set_currentobject ( octave::numeric_limits<double>::NaN ()); - Figure* fig = dynamic_cast<Figure *> (Backend::toolkitObject (figObj)); + Figure *fig = dynamic_cast<Figure *> (Backend::toolkitObject (figObj)); MouseMode newMouseMode = NoMode; @@ -794,7 +794,7 @@ } void - Canvas::canvasMouseReleaseEvent (QMouseEvent* event) + Canvas::canvasMouseReleaseEvent (QMouseEvent *event) { if ((m_mouseMode == ZoomInMode || m_mouseMode == ZoomOutMode) && m_mouseAxes.ok ()) @@ -893,7 +893,7 @@ } void - Canvas::canvasWheelEvent (QWheelEvent* event) + Canvas::canvasWheelEvent (QWheelEvent *event) { gh_manager::auto_lock lock; graphics_object obj = gh_manager::get_object (m_handle); @@ -929,7 +929,7 @@ graphics_object figObj (obj.get_ancestor ("figure")); - Figure* fig = dynamic_cast<Figure *> (Backend::toolkitObject (figObj)); + Figure *fig = dynamic_cast<Figure *> (Backend::toolkitObject (figObj)); if (fig) newMouseMode = fig->mouseMode (); @@ -1001,7 +1001,7 @@ } bool - Canvas::canvasKeyPressEvent (QKeyEvent* event) + Canvas::canvasKeyPressEvent (QKeyEvent *event) { if (m_eventMask & KeyPress) { @@ -1028,7 +1028,7 @@ } bool - Canvas::canvasKeyReleaseEvent (QKeyEvent* event) + Canvas::canvasKeyReleaseEvent (QKeyEvent *event) { if (! event->isAutoRepeat () && (m_eventMask & KeyRelease)) { @@ -1042,7 +1042,7 @@ } Canvas* - Canvas::create (const std::string& /* name */, QWidget* parent, + Canvas::create (const std::string& /* name */, QWidget *parent, const graphics_handle& handle) { // Only OpenGL