Mercurial > octave
diff libgui/graphics/Figure.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 | 2aab625b502c |
line wrap: on
line diff
--- a/libgui/graphics/Figure.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/Figure.cc Thu Apr 27 15:18:20 2017 -0700 @@ -123,7 +123,7 @@ return new Figure (go, new FigureWindow ()); } - Figure::Figure (const graphics_object& go, FigureWindow* win) + Figure::Figure (const graphics_object& go, FigureWindow *win) : Object (go, win), m_blockUpdates (false), m_figureToolBar (0), m_menuBar (0), m_innerRect (), m_outerRect (), m_mouseModeGroup (0) { @@ -293,7 +293,7 @@ void Figure::createFigureToolBarAndMenuBar (void) { - QMainWindow* win = qWidget<QMainWindow> (); + QMainWindow *win = qWidget<QMainWindow> (); m_figureToolBar = win->addToolBar (tr ("Figure ToolBar")); m_figureToolBar->setMovable (false); @@ -319,7 +319,7 @@ m_menuBar = new MenuBar (win); win->setMenuBar (m_menuBar); - QMenu* fileMenu = m_menuBar->addMenu (tr ("&File")); + QMenu *fileMenu = m_menuBar->addMenu (tr ("&File")); fileMenu->menuAction ()->setObjectName ("builtinMenu"); fileMenu->addAction (tr ("&Save"), this, SLOT (fileSaveFigure (bool))); fileMenu->addAction (tr ("Save &As"), this, SLOT (fileSaveFigureAs (void))); @@ -327,14 +327,14 @@ fileMenu->addAction (tr ("&Close Figure"), this, SLOT (fileCloseFigure (void)), Qt::CTRL | Qt::Key_W); - QMenu* editMenu = m_menuBar->addMenu (tr ("&Edit")); + QMenu *editMenu = m_menuBar->addMenu (tr ("&Edit")); editMenu->menuAction ()->setObjectName ("builtinMenu"); editMenu->addAction (tr ("Cop&y"), this, SLOT (editCopy (bool)), Qt::CTRL | Qt::Key_C); editMenu->addSeparator (); editMenu->addActions (m_mouseModeGroup->actions ()); - QMenu* helpMenu = m_menuBar->addMenu (tr ("&Help")); + QMenu *helpMenu = m_menuBar->addMenu (tr ("&Help")); helpMenu->menuAction ()->setObjectName ("builtinMenu"); helpMenu->addAction (tr ("About Octave"), this, SLOT (helpAboutOctave (void))); @@ -362,7 +362,7 @@ void Figure::redraw (void) { - Canvas* canvas = m_container->canvas (m_handle); + Canvas *canvas = m_container->canvas (m_handle); if (canvas) { @@ -370,13 +370,13 @@ //canvas->setMouseMode (RotateMode); } - foreach (QFrame* frame, + foreach (QFrame *frame, qWidget<QWidget> ()->findChildren<QFrame*> ()) { if (frame->objectName () == "UIPanel" || frame->objectName () == "UIButtonGroup") { - Object* obj = Object::fromQObject (frame); + Object *obj = Object::fromQObject (frame); if (obj) obj->slotRedraw (); @@ -389,7 +389,7 @@ void Figure::print (const QString& file_cmd, const QString& term) { - Canvas* canvas = m_container->canvas (m_handle); + Canvas *canvas = m_container->canvas (m_handle); if (canvas) canvas->print (file_cmd, term); @@ -398,7 +398,7 @@ void Figure::beingDeleted (void) { - Canvas* canvas = m_container->canvas (m_handle.value (), false); + Canvas *canvas = m_container->canvas (m_handle.value (), false); if (canvas) canvas->blockRedraw (true); @@ -415,7 +415,7 @@ return; figure::properties& fp = properties<figure> (); - QMainWindow* win = qWidget<QMainWindow> (); + QMainWindow *win = qWidget<QMainWindow> (); m_blockUpdates = true; @@ -427,7 +427,7 @@ int toffset = 0; int boffset = 0; - foreach (QToolBar* tb, win->findChildren<QToolBar*> ()) + foreach (QToolBar *tb, win->findChildren<QToolBar*> ()) if (! tb->isHidden ()) toffset += tb->sizeHint ().height (); @@ -539,7 +539,7 @@ if (h1 <= 0) h1 = m_menuBar->sizeHint ().height (); - foreach (QAction* a, m_menuBar->actions ()) + foreach (QAction *a, m_menuBar->actions ()) if (a->objectName () == "builtinMenu") a->setVisible (visible); @@ -598,15 +598,15 @@ Matrix m_bbox; bool m_internal; graphics_handle m_handle; - Figure* m_figure; + Figure *m_figure; }; void - Figure::updateBoundingBoxHelper (void* data) + Figure::updateBoundingBoxHelper (void *data) { gh_manager::auto_lock lock; - UpdateBoundingBoxData* d = reinterpret_cast<UpdateBoundingBoxData *> (data); + UpdateBoundingBoxData *d = reinterpret_cast<UpdateBoundingBoxData *> (data); graphics_object go = gh_manager::get_object (d->m_handle); if (go.valid_object ()) @@ -622,7 +622,7 @@ void Figure::updateBoundingBox (bool internal, int flags) { - QWidget* win = qWidget<QWidget> (); + QWidget *win = qWidget<QWidget> (); Matrix bb (1, 4); if (internal) @@ -668,7 +668,7 @@ return; } - UpdateBoundingBoxData* d = new UpdateBoundingBoxData (); + UpdateBoundingBoxData *d = new UpdateBoundingBoxData (); d->m_bbox = bb; d->m_internal = internal; @@ -679,7 +679,7 @@ } bool - Figure::eventNotifyBefore (QObject* obj, QEvent* xevent) + Figure::eventNotifyBefore (QObject *obj, QEvent *xevent) { if (! m_blockUpdates) { @@ -696,7 +696,7 @@ break; case QEvent::ActionRemoved: { - QAction* a = dynamic_cast<QActionEvent *> (xevent)->action (); + QAction *a = dynamic_cast<QActionEvent *> (xevent)->action (); if (! a->isSeparator () && a->objectName () != "builtinMenu") @@ -727,7 +727,7 @@ } void - Figure::eventNotifyAfter (QObject* watched, QEvent* xevent) + Figure::eventNotifyAfter (QObject *watched, QEvent *xevent) { if (! m_blockUpdates) { @@ -768,7 +768,7 @@ case QEvent::ActionChanged: // The menubar may have been resized if no action is visible { - QAction* a = dynamic_cast<QActionEvent *> (xevent)->action (); + QAction *a = dynamic_cast<QActionEvent *> (xevent)->action (); if (m_menuBar->sizeHint ().height () != m_previousHeight && a->objectName () != "builtinMenu" && ! a->isSeparator ()) @@ -777,7 +777,7 @@ break; case QEvent::ActionAdded: { - QAction* a = dynamic_cast<QActionEvent *> (xevent)->action (); + QAction *a = dynamic_cast<QActionEvent *> (xevent)->action (); if (! a->isSeparator () && a->objectName () != "builtinMenu" @@ -832,7 +832,7 @@ fp.set___mouse_mode__ (mouse_mode_to_string (mode)); - Canvas* canvas = m_container->canvas (m_handle); + Canvas *canvas = m_container->canvas (m_handle); if (canvas) canvas->setCursor (mode); @@ -935,9 +935,9 @@ } void - Figure::addCustomToolBar (QToolBar* bar, bool visible) + Figure::addCustomToolBar (QToolBar *bar, bool visible) { - QMainWindow* win = qWidget<QMainWindow> (); + QMainWindow *win = qWidget<QMainWindow> (); if (! visible) win->addToolBar (bar); @@ -961,9 +961,9 @@ } void - Figure::showCustomToolBar (QToolBar* bar, bool visible) + Figure::showCustomToolBar (QToolBar *bar, bool visible) { - QMainWindow* win = qWidget<QMainWindow> (); + QMainWindow *win = qWidget<QMainWindow> (); if ((! bar->isHidden ()) != visible) { @@ -993,7 +993,7 @@ void Figure::toggleAxes (void) { - Canvas* canvas = m_container->canvas (m_handle); + Canvas *canvas = m_container->canvas (m_handle); if (canvas) canvas->toggleAxes (m_handle); @@ -1002,7 +1002,7 @@ void Figure::toggleGrid (void) { - Canvas* canvas = m_container->canvas (m_handle); + Canvas *canvas = m_container->canvas (m_handle); if (canvas) canvas->toggleGrid (m_handle); @@ -1011,7 +1011,7 @@ void Figure::autoAxes (void) { - Canvas* canvas = m_container->canvas (m_handle); + Canvas *canvas = m_container->canvas (m_handle); if (canvas) canvas->autoAxes (m_handle); @@ -1023,7 +1023,7 @@ // Enable mouse tracking on every widgets m_container->setMouseTracking (true); m_container->canvas (m_handle)->qWidget ()->setMouseTracking (true); - foreach (QWidget* w, m_container->findChildren<QWidget*> ()) + foreach (QWidget *w, m_container->findChildren<QWidget*> ()) w->setMouseTracking (true); }