Mercurial > octave
changeset 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.
line wrap: on
line diff
--- a/examples/code/mycell.c Thu Apr 27 15:26:32 2017 -0400 +++ b/examples/code/mycell.c Thu Apr 27 15:18:20 2017 -0700 @@ -1,8 +1,8 @@ #include "mex.h" void -mexFunction (int nlhs, mxArray* plhs[], - int nrhs, const mxArray* prhs[]) +mexFunction (int nlhs, mxArray *plhs[], + int nrhs, const mxArray *prhs[]) { mwSize n; mwIndex i;
--- a/examples/code/myfeval.c Thu Apr 27 15:26:32 2017 -0400 +++ b/examples/code/myfeval.c Thu Apr 27 15:18:20 2017 -0700 @@ -1,8 +1,8 @@ #include "mex.h" void -mexFunction (int nlhs, mxArray* plhs[], - int nrhs, const mxArray* prhs[]) +mexFunction (int nlhs, mxArray *plhs[], + int nrhs, const mxArray *prhs[]) { char *str;
--- a/examples/code/mypow2.c Thu Apr 27 15:26:32 2017 -0400 +++ b/examples/code/mypow2.c Thu Apr 27 15:18:20 2017 -0700 @@ -1,8 +1,8 @@ #include "mex.h" void -mexFunction (int nlhs, mxArray* plhs[], - int nrhs, const mxArray* prhs[]) +mexFunction (int nlhs, mxArray *plhs[], + int nrhs, const mxArray *prhs[]) { mwSize n; mwIndex i;
--- a/examples/code/myprop.c Thu Apr 27 15:26:32 2017 -0400 +++ b/examples/code/myprop.c Thu Apr 27 15:18:20 2017 -0700 @@ -1,8 +1,8 @@ #include "mex.h" void -mexFunction (int nlhs, mxArray* plhs[], - int nrhs, const mxArray* prhs[]) +mexFunction (int nlhs, mxArray *plhs[], + int nrhs, const mxArray *prhs[]) { double handle; char property[256];
--- a/examples/code/myset.c Thu Apr 27 15:26:32 2017 -0400 +++ b/examples/code/myset.c Thu Apr 27 15:18:20 2017 -0700 @@ -1,8 +1,8 @@ #include "mex.h" void -mexFunction (int nlhs, mxArray* plhs[], - int nrhs, const mxArray* prhs[]) +mexFunction (int nlhs, mxArray *plhs[], + int nrhs, const mxArray *prhs[]) { char *str; mxArray *v;
--- a/examples/code/mystruct.c Thu Apr 27 15:26:32 2017 -0400 +++ b/examples/code/mystruct.c Thu Apr 27 15:18:20 2017 -0700 @@ -1,8 +1,8 @@ #include "mex.h" void -mexFunction (int nlhs, mxArray* plhs[], - int nrhs, const mxArray* prhs[]) +mexFunction (int nlhs, mxArray *plhs[], + int nrhs, const mxArray *prhs[]) { int i; mwIndex j;
--- a/libgui/graphics/Backend.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/Backend.cc Thu Apr 27 15:18:20 2017 -0700 @@ -72,7 +72,7 @@ Backend::Backend (void) : QObject (), base_graphics_toolkit ("qt") { - ObjectFactory* factory = ObjectFactory::instance (); + ObjectFactory *factory = ObjectFactory::instance (); connect (this, SIGNAL (createObject (double)), factory, SLOT (createObject (double))); @@ -97,7 +97,7 @@ Logger::debug ("Backend::initialize %s from thread %08x", go.type ().c_str (), QThread::currentThreadId ()); - ObjectProxy* proxy = new ObjectProxy (); + ObjectProxy *proxy = new ObjectProxy (); graphics_object gObj (go); OCTAVE_PTR_TYPE tmp (reinterpret_cast<OCTAVE_INTPTR_TYPE> (proxy)); @@ -130,7 +130,7 @@ Logger::debug ("Backend::update %s(%d) from thread %08x", go.type ().c_str (), pId, QThread::currentThreadId ()); - ObjectProxy* proxy = toolkitObjectProxy (go); + ObjectProxy *proxy = toolkitObjectProxy (go); if (proxy) { @@ -154,7 +154,7 @@ Logger::debug ("Backend::finalize %s from thread %08x", go.type ().c_str (), QThread::currentThreadId ()); - ObjectProxy* proxy = toolkitObjectProxy (go); + ObjectProxy *proxy = toolkitObjectProxy (go); if (proxy) { @@ -172,7 +172,7 @@ { if (go.get_properties ().is_visible ()) { - ObjectProxy* proxy = toolkitObjectProxy (go); + ObjectProxy *proxy = toolkitObjectProxy (go); if (proxy) proxy->redraw (); @@ -187,7 +187,7 @@ { if (go.get_properties ().is_visible ()) { - ObjectProxy* proxy = toolkitObjectProxy (go); + ObjectProxy *proxy = toolkitObjectProxy (go); if (proxy) proxy->print (QString::fromStdString (file_cmd), @@ -198,7 +198,7 @@ Object* Backend::toolkitObject (const graphics_object& go) { - ObjectProxy* proxy = toolkitObjectProxy (go); + ObjectProxy *proxy = toolkitObjectProxy (go); if (proxy) return proxy->object ();
--- a/libgui/graphics/Backend.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/Backend.h Thu Apr 27 15:18:20 2017 -0700 @@ -59,9 +59,9 @@ const std::string& file_cmd, const std::string& /*debug_file*/) const; - static Object* toolkitObject (const graphics_object& go); + static Object * toolkitObject (const graphics_object& go); - static ObjectProxy* toolkitObjectProxy (const graphics_object& go); + static ObjectProxy * toolkitObjectProxy (const graphics_object& go); signals: void createObject (double handle);
--- a/libgui/graphics/BaseControl.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/BaseControl.cc Thu Apr 27 15:18:20 2017 -0700 @@ -37,7 +37,7 @@ { static void - updatePalette (const uicontrol::properties& props, QWidget* w) + updatePalette (const uicontrol::properties& props, QWidget *w) { QPalette p = w->palette (); @@ -88,14 +88,14 @@ w->setPalette (p); } - BaseControl::BaseControl (const graphics_object& go, QWidget* w) + BaseControl::BaseControl (const graphics_object& go, QWidget *w) : Object (go, w), m_normalizedFont (false), m_keyPressHandlerDefined (false) { init (w); } void - BaseControl::init (QWidget* w, bool callBase) + BaseControl::init (QWidget *w, bool callBase) { if (callBase) Object::init (w, callBase); @@ -124,7 +124,7 @@ BaseControl::update (int pId) { uicontrol::properties& up = properties<uicontrol> (); - QWidget* w = qWidget<QWidget> (); + QWidget *w = qWidget<QWidget> (); switch (pId) { @@ -177,7 +177,7 @@ } bool - BaseControl::eventFilter (QObject* watched, QEvent* xevent) + BaseControl::eventFilter (QObject *watched, QEvent *xevent) { switch (xevent->type ()) {
--- a/libgui/graphics/BaseControl.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/BaseControl.h Thu Apr 27 15:18:20 2017 -0700 @@ -34,15 +34,15 @@ class BaseControl : public Object { public: - BaseControl (const graphics_object& go, QWidget* w); + BaseControl (const graphics_object& go, QWidget *w); ~BaseControl (void); - Container* innerContainer (void) { return 0; } + Container * innerContainer (void) { return 0; } - bool eventFilter (QObject* watched, QEvent* e); + bool eventFilter (QObject *watched, QEvent *e); protected: - void init (QWidget* w, bool callBase = false); + void init (QWidget *w, bool callBase = false); void update (int pId); private:
--- a/libgui/graphics/ButtonControl.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/ButtonControl.cc Thu Apr 27 15:18:20 2017 -0700 @@ -34,7 +34,7 @@ namespace QtHandles { - ButtonControl::ButtonControl (const graphics_object& go, QAbstractButton* btn) + ButtonControl::ButtonControl (const graphics_object& go, QAbstractButton *btn) : BaseControl (go, btn), m_blockCallback (false) { uicontrol::properties& up = properties<uicontrol> (); @@ -63,7 +63,7 @@ ButtonControl::update (int pId) { uicontrol::properties& up = properties<uicontrol> (); - QAbstractButton* btn = qWidget<QAbstractButton> (); + QAbstractButton *btn = qWidget<QAbstractButton> (); switch (pId) { @@ -92,9 +92,9 @@ btn->setChecked (false); if (up.style_is ("radiobutton") || up.style_is ("togglebutton")) { - Object* parent = Object::parentObject (gh_manager::get_object ( + Object *parent = Object::parentObject (gh_manager::get_object ( up.get___myhandle__ ())); - ButtonGroup* btnGroup = dynamic_cast<ButtonGroup *>(parent); + ButtonGroup *btnGroup = dynamic_cast<ButtonGroup *>(parent); if (btnGroup) btnGroup->selectNothing (); } @@ -115,7 +115,7 @@ void ButtonControl::toggled (bool checked) { - QAbstractButton* btn = qWidget<QAbstractButton> (); + QAbstractButton *btn = qWidget<QAbstractButton> (); if (! m_blockCallback && btn->isCheckable ()) { @@ -135,7 +135,7 @@ void ButtonControl::clicked (void) { - QAbstractButton* btn = qWidget<QAbstractButton> (); + QAbstractButton *btn = qWidget<QAbstractButton> (); if (! btn->isCheckable ()) gh_manager::post_callback (m_handle, "callback");
--- a/libgui/graphics/ButtonControl.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/ButtonControl.h Thu Apr 27 15:18:20 2017 -0700 @@ -35,7 +35,7 @@ Q_OBJECT public: - ButtonControl (const graphics_object& go, QAbstractButton* btn); + ButtonControl (const graphics_object& go, QAbstractButton *btn); ~ButtonControl (void); protected:
--- a/libgui/graphics/ButtonGroup.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/ButtonGroup.cc Thu Apr 27 15:18:20 2017 -0700 @@ -95,15 +95,15 @@ ButtonGroup* ButtonGroup::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) { - QFrame* frame = new QFrame (container); + QFrame *frame = new QFrame (container); return new ButtonGroup (go, new QButtonGroup (frame), frame); } } @@ -111,8 +111,8 @@ return 0; } - ButtonGroup::ButtonGroup (const graphics_object& go, QButtonGroup* buttongroup, - QFrame* frame) + ButtonGroup::ButtonGroup (const graphics_object& go, QButtonGroup *buttongroup, + QFrame *frame) : Object (go, frame), m_hiddenbutton(0), m_container (0), m_title (0), m_blockUpdates (false) { @@ -138,9 +138,9 @@ if (frame->hasMouseTracking ()) { - foreach (QWidget* w, frame->findChildren<QWidget*> ()) + foreach (QWidget *w, frame->findChildren<QWidget*> ()) w->setMouseTracking (true); - foreach (QWidget* w, buttongroup->findChildren<QWidget*> ()) + foreach (QWidget *w, buttongroup->findChildren<QWidget*> ()) w->setMouseTracking (true); } @@ -173,7 +173,7 @@ { } bool - ButtonGroup::eventFilter (QObject* watched, QEvent* xevent) + ButtonGroup::eventFilter (QObject *watched, QEvent *xevent) { if (! m_blockUpdates) { @@ -195,7 +195,7 @@ if (pp.fontunits_is ("normalized")) { - QFrame* frame = qWidget<QFrame> (); + QFrame *frame = qWidget<QFrame> (); m_title->setFont (Utils::computeFont<uibuttongroup> (pp, frame->height ())); @@ -209,7 +209,7 @@ case QEvent::MouseButtonPress: { - QMouseEvent* m = dynamic_cast<QMouseEvent *> (xevent); + QMouseEvent *m = dynamic_cast<QMouseEvent *> (xevent); if (m->button () == Qt::RightButton) { @@ -250,7 +250,7 @@ ButtonGroup::update (int pId) { uibuttongroup::properties& pp = properties<uibuttongroup> (); - QFrame* frame = qWidget<QFrame> (); + QFrame *frame = qWidget<QFrame> (); m_blockUpdates = true; @@ -349,10 +349,10 @@ graphics_handle h = pp.get_selectedobject (); gh_manager::auto_lock lock; graphics_object go = gh_manager::get_object (h); - Object* selectedObject = Backend::toolkitObject (go); - ToggleButtonControl* toggle = static_cast<ToggleButtonControl *> + Object *selectedObject = Backend::toolkitObject (go); + ToggleButtonControl *toggle = static_cast<ToggleButtonControl *> (selectedObject); - RadioButtonControl* radio = static_cast<RadioButtonControl *>(selectedObject); + RadioButtonControl *radio = static_cast<RadioButtonControl *>(selectedObject); if (toggle) { go.get_properties ().set ("value", 1); @@ -378,7 +378,7 @@ void ButtonGroup::redraw (void) { - Canvas* canvas = m_container->canvas (m_handle); + Canvas *canvas = m_container->canvas (m_handle); if (canvas) canvas->redraw (); @@ -388,7 +388,7 @@ ButtonGroup::updateLayout (void) { uibuttongroup::properties& pp = properties<uibuttongroup> (); - QFrame* frame = qWidget<QFrame> (); + QFrame *frame = qWidget<QFrame> (); Matrix bb = pp.get_boundingbox (true); int bw = borderWidthFromProperties (pp); @@ -433,7 +433,7 @@ void - ButtonGroup::addButton (QAbstractButton* btn) + ButtonGroup::addButton (QAbstractButton *btn) { m_buttongroup->addButton (btn); connect (btn, SIGNAL (toggled (bool)), SLOT (buttonToggled (bool))); @@ -450,12 +450,12 @@ graphics_handle oldValue = bp.get_selectedobject (); - QAbstractButton* checkedBtn = m_buttongroup->checkedButton (); + QAbstractButton *checkedBtn = m_buttongroup->checkedButton (); graphics_handle newValue = graphics_handle (); if (checkedBtn != m_hiddenbutton) { - Object* checkedObj = Object::fromQObject (checkedBtn); + Object *checkedObj = Object::fromQObject (checkedBtn); newValue = checkedObj->properties ().get___myhandle__ (); } @@ -466,7 +466,7 @@ } void - ButtonGroup::buttonClicked (QAbstractButton* btn) + ButtonGroup::buttonClicked (QAbstractButton *btn) { Q_UNUSED (btn); @@ -475,8 +475,8 @@ graphics_handle oldValue = bp.get_selectedobject (); - QAbstractButton* checkedBtn = m_buttongroup->checkedButton (); - Object* checkedObj = Object::fromQObject (checkedBtn); + QAbstractButton *checkedBtn = m_buttongroup->checkedButton (); + Object *checkedObj = Object::fromQObject (checkedBtn); graphics_handle newValue = checkedObj->properties ().get___myhandle__ (); if (oldValue != newValue)
--- a/libgui/graphics/ButtonGroup.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/ButtonGroup.h Thu Apr 27 15:18:20 2017 -0700 @@ -41,17 +41,17 @@ Q_OBJECT public: - ButtonGroup (const graphics_object& go, QButtonGroup* buttongroup, - QFrame* frame); + ButtonGroup (const graphics_object& go, QButtonGroup *buttongroup, + QFrame *frame); ~ButtonGroup (void); - Container* innerContainer (void) { return m_container; } + Container * innerContainer (void) { return m_container; } - bool eventFilter (QObject* watched, QEvent* event); + bool eventFilter (QObject *watched, QEvent *event); - static ButtonGroup* create (const graphics_object& go); + static ButtonGroup * create (const graphics_object& go); - void addButton (QAbstractButton* btn); + void addButton (QAbstractButton *btn); void selectNothing (void); @@ -61,16 +61,16 @@ private slots: void buttonToggled (bool toggled); - void buttonClicked (QAbstractButton* btn); + void buttonClicked (QAbstractButton *btn); private: void updateLayout (void); private: - QButtonGroup* m_buttongroup; - QRadioButton* m_hiddenbutton; - Container* m_container; - QLabel* m_title; + QButtonGroup *m_buttongroup; + QRadioButton *m_hiddenbutton; + Container *m_container; + QLabel *m_title; bool m_blockUpdates; };
--- 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
--- a/libgui/graphics/Canvas.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/Canvas.h Thu Apr 27 15:18:20 2017 -0700 @@ -62,10 +62,10 @@ void setCursor (MouseMode mode); - virtual QWidget* qWidget (void) = 0; + virtual QWidget * qWidget (void) = 0; - static Canvas* create (const std::string& name, QWidget* parent, - const graphics_handle& handle); + static Canvas * create (const std::string& name, QWidget *parent, + const graphics_handle& handle); virtual void toggleAxes (const graphics_handle& handle) = 0; virtual void toggleGrid (const graphics_handle& handle) = 0; @@ -92,13 +92,13 @@ void canvasToggleGrid (const graphics_handle& handle); void canvasAutoAxes (const graphics_handle& handle); void canvasPaintEvent (void); - void canvasMouseDoubleClickEvent (QMouseEvent* event); - void canvasMouseMoveEvent (QMouseEvent* event); - void canvasMousePressEvent (QMouseEvent* event); - void canvasMouseReleaseEvent (QMouseEvent* event); - void canvasWheelEvent (QWheelEvent* event); - bool canvasKeyPressEvent (QKeyEvent* event); - bool canvasKeyReleaseEvent (QKeyEvent* event); + void canvasMouseDoubleClickEvent (QMouseEvent *event); + void canvasMouseMoveEvent (QMouseEvent *event); + void canvasMousePressEvent (QMouseEvent *event); + void canvasMouseReleaseEvent (QMouseEvent *event); + void canvasWheelEvent (QWheelEvent *event); + bool canvasKeyPressEvent (QKeyEvent *event); + bool canvasKeyReleaseEvent (QKeyEvent *event); void updateCurrentPoint (const graphics_object& fig, const graphics_object& obj, QMouseEvent *event); @@ -106,7 +106,7 @@ const graphics_object& obj); void annotation_callback (const octave_value_list& args); - void select_object (graphics_object obj, QMouseEvent* event, + void select_object (graphics_object obj, QMouseEvent *event, graphics_object& currentObj, graphics_object& axesObj, bool axes_only = false, std::vector<std::string> omit = std::vector<std::string> ());
--- a/libgui/graphics/CheckBoxControl.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/CheckBoxControl.cc Thu Apr 27 15:18:20 2017 -0700 @@ -35,11 +35,11 @@ CheckBoxControl* CheckBoxControl::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) return new CheckBoxControl (go, new QCheckBox (container)); @@ -48,7 +48,7 @@ return 0; } - CheckBoxControl::CheckBoxControl (const graphics_object& go, QCheckBox* box) + CheckBoxControl::CheckBoxControl (const graphics_object& go, QCheckBox *box) : ButtonControl (go, box) { box->setAutoFillBackground (true);
--- a/libgui/graphics/CheckBoxControl.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/CheckBoxControl.h Thu Apr 27 15:18:20 2017 -0700 @@ -33,10 +33,10 @@ class CheckBoxControl : public ButtonControl { public: - CheckBoxControl (const graphics_object& go, QCheckBox* box); + CheckBoxControl (const graphics_object& go, QCheckBox *box); ~CheckBoxControl (void); - static CheckBoxControl* create (const graphics_object& go); + static CheckBoxControl * create (const graphics_object& go); }; }
--- a/libgui/graphics/Container.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/Container.cc Thu Apr 27 15:18:20 2017 -0700 @@ -37,7 +37,7 @@ namespace QtHandles { - Container::Container (QWidget* xparent) + Container::Container (QWidget *xparent) : ContainerBase (xparent), m_canvas (0) { setFocusPolicy (Qt::ClickFocus); @@ -61,7 +61,7 @@ m_canvas = Canvas::create (fig.get ("renderer").string_value (), this, gh); - QWidget* canvasWidget = m_canvas->qWidget (); + QWidget *canvasWidget = m_canvas->qWidget (); canvasWidget->lower (); canvasWidget->show (); @@ -80,11 +80,11 @@ gh_manager::auto_lock lock; - foreach (QObject* qObj, children ()) + foreach (QObject *qObj, children ()) { if (qObj->isWidgetType ()) { - Object* obj = Object::fromQObject (qObj); + Object *obj = Object::fromQObject (qObj); if (obj) { @@ -104,7 +104,7 @@ } void - Container::childEvent (QChildEvent* xevent) + Container::childEvent (QChildEvent *xevent) { // Enable mouse tracking in child widgets as they are added if the // container also has mouse tracking enabled. There is no need to
--- a/libgui/graphics/Container.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/Container.h Thu Apr 27 15:18:20 2017 -0700 @@ -39,17 +39,17 @@ class Container : public ContainerBase { public: - Container (QWidget* parent); + Container (QWidget *parent); ~Container (void); - Canvas* canvas (const graphics_handle& handle, bool create = true); + Canvas * canvas (const graphics_handle& handle, bool create = true); protected: - void childEvent (QChildEvent* event); - void resizeEvent (QResizeEvent* event); + void childEvent (QChildEvent *event); + void resizeEvent (QResizeEvent *event); private: - Canvas* m_canvas; + Canvas *m_canvas; }; }
--- a/libgui/graphics/ContextMenu.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/ContextMenu.cc Thu Apr 27 15:18:20 2017 -0700 @@ -36,11 +36,11 @@ ContextMenu* ContextMenu::create (const graphics_object& go) { - Object* xparent = Object::parentObject (go); + Object *xparent = Object::parentObject (go); if (xparent) { - QWidget* w = xparent->qWidget<QWidget> (); + QWidget *w = xparent->qWidget<QWidget> (); return new ContextMenu (go, new QMenu (w)); } @@ -48,7 +48,7 @@ return 0; } - ContextMenu::ContextMenu (const graphics_object& go, QMenu* xmenu) + ContextMenu::ContextMenu (const graphics_object& go, QMenu *xmenu) : Object (go, xmenu) { xmenu->setAutoFillBackground (true); @@ -64,7 +64,7 @@ ContextMenu::update (int pId) { uicontextmenu::properties& up = properties<uicontextmenu> (); - QMenu* xmenu = qWidget<QMenu> (); + QMenu *xmenu = qWidget<QMenu> (); switch (pId) { @@ -72,7 +72,7 @@ if (up.is_visible ()) { Matrix pos = up.get_position ().matrix_value (); - QWidget* parentW = xmenu->parentWidget (); + QWidget *parentW = xmenu->parentWidget (); QPoint pt; pt.rx () = octave::math::round (pos(0)); @@ -121,12 +121,12 @@ if (go.valid_object ()) { - ContextMenu* cMenu = + ContextMenu *cMenu = dynamic_cast<ContextMenu *> (Backend::toolkitObject (go)); if (cMenu) { - QMenu* menu = cMenu->qWidget<QMenu> (); + QMenu *menu = cMenu->qWidget<QMenu> (); if (menu) menu->popup (pt);
--- a/libgui/graphics/ContextMenu.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/ContextMenu.h Thu Apr 27 15:18:20 2017 -0700 @@ -38,15 +38,15 @@ Q_OBJECT public: - ContextMenu (const graphics_object& go, QMenu* menu); + ContextMenu (const graphics_object& go, QMenu *menu); ~ContextMenu (void); - static ContextMenu* create (const graphics_object& go); + static ContextMenu * create (const graphics_object& go); static void executeAt (const base_properties& props, const QPoint& pt); - Container* innerContainer (void) { return 0; } + Container * innerContainer (void) { return 0; } - QWidget* menu (void); + QWidget * menu (void); protected: void update (int pId);
--- 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);
--- a/libgui/graphics/EditControl.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/EditControl.h Thu Apr 27 15:18:20 2017 -0700 @@ -38,19 +38,19 @@ Q_OBJECT public: - EditControl (const graphics_object& go, QLineEdit* edit); - EditControl (const graphics_object& go, TextEdit* edit); + EditControl (const graphics_object& go, QLineEdit *edit); + EditControl (const graphics_object& go, TextEdit *edit); ~EditControl (void); - static EditControl* create (const graphics_object& go); + static EditControl * create (const graphics_object& go); protected: void update (int pId); private: - void init (QLineEdit* edit, bool callBase = false); - void init (TextEdit* edit, bool callBase = false); - void initCommon (QWidget* widget); + void init (QLineEdit *edit, bool callBase = false); + void init (TextEdit *edit, bool callBase = false); + void initCommon (QWidget *widget); bool updateSingleLine (int pId); bool updateMultiLine (int pId);
--- 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); }
--- a/libgui/graphics/Figure.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/Figure.h Thu Apr 27 15:18:20 2017 -0700 @@ -67,22 +67,22 @@ friend class ToolBar; public: - Figure (const graphics_object& go, FigureWindow* win); + Figure (const graphics_object& go, FigureWindow *win); ~Figure (void); - static Figure* create (const graphics_object& go); + static Figure * create (const graphics_object& go); QString fileName (void); void setFileName (const QString& name); MouseMode mouseMode (void); - Container* innerContainer (void); - QWidget* menu (void); + Container * innerContainer (void); + QWidget * menu (void); void updateStatusBar (ColumnVector pt); - bool eventNotifyBefore (QObject* watched, QEvent* event); - void eventNotifyAfter (QObject* watched, QEvent* event); + bool eventNotifyBefore (QObject *watched, QEvent *event); + void eventNotifyAfter (QObject *watched, QEvent *event); protected: enum UpdateBoundingBoxFlag @@ -103,8 +103,8 @@ void createFigureToolBarAndMenuBar (void); void showFigureToolBar (bool visible); void showMenuBar (bool visible, int height = -1); - void addCustomToolBar (QToolBar* bar, bool visible); - void showCustomToolBar (QToolBar* bar, bool visible); + void addCustomToolBar (QToolBar *bar, bool visible); + void showCustomToolBar (QToolBar *bar, bool visible); void updateFigureToolBarAndMenuBar (void); @@ -132,14 +132,14 @@ void asyncUpdate (void); private: - Container* m_container; + Container *m_container; bool m_blockUpdates; - QToolBar* m_figureToolBar; - MenuBar* m_menuBar; - QStatusBar* m_statusBar; + QToolBar *m_figureToolBar; + MenuBar *m_menuBar; + QStatusBar *m_statusBar; QRect m_innerRect; QRect m_outerRect; - MouseModeActionGroup* m_mouseModeGroup; + MouseModeActionGroup *m_mouseModeGroup; int m_previousHeight; };
--- a/libgui/graphics/FigureWindow.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/FigureWindow.cc Thu Apr 27 15:18:20 2017 -0700 @@ -31,7 +31,7 @@ namespace QtHandles { - FigureWindow::FigureWindow (QWidget* xparent) + FigureWindow::FigureWindow (QWidget *xparent) : FigureWindowBase (xparent) { // set icon from application resources
--- a/libgui/graphics/FigureWindow.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/FigureWindow.h Thu Apr 27 15:18:20 2017 -0700 @@ -37,10 +37,10 @@ Q_OBJECT public: - FigureWindow (QWidget* parent = 0); + FigureWindow (QWidget *parent = 0); ~FigureWindow (void); - QMenu* createPopupMenu (void); + QMenu * createPopupMenu (void); }; }
--- a/libgui/graphics/GLCanvas.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/GLCanvas.cc Thu Apr 27 15:18:20 2017 -0700 @@ -33,7 +33,7 @@ namespace QtHandles { - GLCanvas::GLCanvas (QWidget* xparent, const graphics_handle& gh) + GLCanvas::GLCanvas (QWidget *xparent, const graphics_handle& gh) #if defined (Q_OS_WIN32) : QGLWidget (QGLFormat (QGL::SampleBuffers | QGL::AlphaChannel | QGL::IndirectRendering), @@ -153,44 +153,44 @@ } void - GLCanvas::mouseDoubleClickEvent (QMouseEvent* xevent) + GLCanvas::mouseDoubleClickEvent (QMouseEvent *xevent) { canvasMouseDoubleClickEvent (xevent); } void - GLCanvas::mouseMoveEvent (QMouseEvent* xevent) + GLCanvas::mouseMoveEvent (QMouseEvent *xevent) { canvasMouseMoveEvent (xevent); } void - GLCanvas::mousePressEvent (QMouseEvent* xevent) + GLCanvas::mousePressEvent (QMouseEvent *xevent) { canvasMousePressEvent (xevent); } void - GLCanvas::mouseReleaseEvent (QMouseEvent* xevent) + GLCanvas::mouseReleaseEvent (QMouseEvent *xevent) { canvasMouseReleaseEvent (xevent); } void - GLCanvas::wheelEvent (QWheelEvent* xevent) + GLCanvas::wheelEvent (QWheelEvent *xevent) { canvasWheelEvent (xevent); } void - GLCanvas::keyPressEvent (QKeyEvent* xevent) + GLCanvas::keyPressEvent (QKeyEvent *xevent) { if (! canvasKeyPressEvent (xevent)) QGLWidget::keyPressEvent (xevent); } void - GLCanvas::keyReleaseEvent (QKeyEvent* xevent) + GLCanvas::keyReleaseEvent (QKeyEvent *xevent) { if (! canvasKeyReleaseEvent (xevent)) QGLWidget::keyReleaseEvent (xevent);
--- a/libgui/graphics/GLCanvas.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/GLCanvas.h Thu Apr 27 15:18:20 2017 -0700 @@ -33,7 +33,7 @@ class GLCanvas : public QGLWidget, public Canvas { public: - GLCanvas (QWidget* parent, const graphics_handle& handle); + GLCanvas (QWidget *parent, const graphics_handle& handle); ~GLCanvas (void); void draw (const graphics_handle& handle); @@ -45,17 +45,17 @@ int /* width */, int /* height */) { } graphics_object selectFromAxes (const graphics_object& ax, const QPoint& pt); - QWidget* qWidget (void) { return this; } + QWidget * qWidget (void) { return this; } protected: void paintGL (void); - void mouseDoubleClickEvent (QMouseEvent* event); - void mouseMoveEvent (QMouseEvent* event); - void mousePressEvent (QMouseEvent* event); - void mouseReleaseEvent (QMouseEvent* event); - void wheelEvent (QWheelEvent* event); - void keyPressEvent (QKeyEvent* event); - void keyReleaseEvent (QKeyEvent* event); + void mouseDoubleClickEvent (QMouseEvent *event); + void mouseMoveEvent (QMouseEvent *event); + void mousePressEvent (QMouseEvent *event); + void mouseReleaseEvent (QMouseEvent *event); + void wheelEvent (QWheelEvent *event); + void keyPressEvent (QKeyEvent *event); + void keyReleaseEvent (QKeyEvent *event); }; }
--- a/libgui/graphics/GenericEventNotify.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/GenericEventNotify.h Thu Apr 27 15:18:20 2017 -0700 @@ -40,15 +40,15 @@ GenericEventNotifySender (void) : m_receivers () { } virtual ~GenericEventNotifySender (void) = default; - void addReceiver (GenericEventNotifyReceiver* r) + void addReceiver (GenericEventNotifyReceiver *r) { m_receivers.insert (r); } - void removeReceiver (GenericEventNotifyReceiver* r) + void removeReceiver (GenericEventNotifyReceiver *r) { m_receivers.remove (r); } protected: - bool notifyReceiversBefore (QObject* obj, QEvent* evt); - void notifyReceiversAfter (QObject* obj, QEvent* evt); + bool notifyReceiversBefore (QObject *obj, QEvent *evt); + void notifyReceiversAfter (QObject *obj, QEvent *evt); private: QSet<GenericEventNotifyReceiver*> m_receivers; @@ -60,15 +60,15 @@ GenericEventNotifyReceiver (void) { } virtual ~GenericEventNotifyReceiver (void) = default; - virtual bool eventNotifyBefore (QObject* obj, QEvent* evt) = 0; - virtual void eventNotifyAfter (QObject* obj, QEvent* evt) = 0; + virtual bool eventNotifyBefore (QObject *obj, QEvent *evt) = 0; + virtual void eventNotifyAfter (QObject *obj, QEvent *evt) = 0; }; inline - bool GenericEventNotifySender::notifyReceiversBefore (QObject* obj, - QEvent* evt) + bool GenericEventNotifySender::notifyReceiversBefore (QObject *obj, + QEvent *evt) { - foreach (GenericEventNotifyReceiver* r, m_receivers) + foreach (GenericEventNotifyReceiver *r, m_receivers) if (r->eventNotifyBefore (obj, evt)) return true; @@ -76,10 +76,10 @@ } inline - void GenericEventNotifySender::notifyReceiversAfter (QObject* obj, - QEvent* evt) + void GenericEventNotifySender::notifyReceiversAfter (QObject *obj, + QEvent *evt) { - foreach (GenericEventNotifyReceiver* r, m_receivers) + foreach (GenericEventNotifyReceiver *r, m_receivers) r->eventNotifyAfter (obj, evt); } @@ -87,10 +87,10 @@ class T : public B, public GenericEventNotifySender \ { \ public: \ - T (QWidget* xparent) : B (xparent), GenericEventNotifySender () { } \ + T (QWidget *xparent) : B (xparent), GenericEventNotifySender () { } \ ~ T (void) = default; \ \ - bool event (QEvent* evt) \ + bool event (QEvent *evt) \ { \ bool result = true; \ if (! notifyReceiversBefore (this, evt)) \
--- a/libgui/graphics/ListBoxControl.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/ListBoxControl.cc Thu Apr 27 15:18:20 2017 -0700 @@ -36,7 +36,7 @@ { static void - updateSelection (QListWidget* list, const Matrix& value) + updateSelection (QListWidget *list, const Matrix& value) { octave_idx_type n = value.numel (); int lc = list->count (); @@ -67,11 +67,11 @@ ListBoxControl* ListBoxControl::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) return new ListBoxControl (go, new QListWidget (container)); @@ -80,7 +80,7 @@ return 0; } - ListBoxControl::ListBoxControl (const graphics_object& go, QListWidget* list) + ListBoxControl::ListBoxControl (const graphics_object& go, QListWidget *list) : BaseControl (go, list), m_blockCallback (false), m_selectionChanged (false) { uicontrol::properties& up = properties<uicontrol> (); @@ -128,7 +128,7 @@ ListBoxControl::update (int pId) { uicontrol::properties& up = properties<uicontrol> (); - QListWidget* list = qWidget<QListWidget> (); + QListWidget *list = qWidget<QListWidget> (); switch (pId) { @@ -166,7 +166,7 @@ { if (! m_blockCallback) { - QListWidget* list = qWidget<QListWidget> (); + QListWidget *list = qWidget<QListWidget> (); QModelIndexList l = list->selectionModel ()->selectedIndexes (); Matrix value (dim_vector (1, l.size ())); @@ -201,7 +201,7 @@ } bool - ListBoxControl::eventFilter (QObject* watched, QEvent* e) + ListBoxControl::eventFilter (QObject *watched, QEvent *e) { // listbox change if (watched == m_qobject) @@ -224,13 +224,13 @@ else { bool override_return = false; - QListWidget* list = qWidget<QListWidget> (); + QListWidget *list = qWidget<QListWidget> (); switch (e->type ()) { case QEvent::MouseButtonPress: { - QMouseEvent* m = dynamic_cast<QMouseEvent *> (e); + QMouseEvent *m = dynamic_cast<QMouseEvent *> (e); if (m->button () & Qt::RightButton) override_return = true; @@ -244,7 +244,7 @@ } case QEvent::MouseButtonRelease: { - QMouseEvent* m = dynamic_cast<QMouseEvent *> (e); + QMouseEvent *m = dynamic_cast<QMouseEvent *> (e); if (m->button () & Qt::RightButton) override_return = true;
--- a/libgui/graphics/ListBoxControl.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/ListBoxControl.h Thu Apr 27 15:18:20 2017 -0700 @@ -37,14 +37,14 @@ Q_OBJECT public: - ListBoxControl (const graphics_object& go, QListWidget* list); + ListBoxControl (const graphics_object& go, QListWidget *list); ~ListBoxControl (void); - static ListBoxControl* create (const graphics_object& go); + static ListBoxControl * create (const graphics_object& go); protected: void update (int pId); - bool eventFilter (QObject* watched, QEvent* e); + bool eventFilter (QObject *watched, QEvent *e); void sendSelectionChange (); private slots:
--- a/libgui/graphics/Logger.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/Logger.cc Thu Apr 27 15:18:20 2017 -0700 @@ -35,8 +35,8 @@ namespace QtHandles { - Logger* Logger::s_instance = 0; - QMutex* Logger::s_mutex = 0; + Logger *Logger::s_instance = 0; + QMutex *Logger::s_mutex = 0; Logger::Logger (void) : m_debugEnabled (false) @@ -63,7 +63,7 @@ } #define STATIC_LOGGER(fun) \ - void Logger::fun (const char* fmt, ...) \ + void Logger::fun (const char *fmt, ...) \ { \ QMutexLocker lock (s_mutex); \ va_list vl; \ @@ -75,7 +75,7 @@ STATIC_LOGGER (debug) void - Logger::debugV (const char* fmt, va_list arg) + Logger::debugV (const char *fmt, va_list arg) { if (m_debugEnabled) {
--- a/libgui/graphics/Logger.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/Logger.h Thu Apr 27 15:18:20 2017 -0700 @@ -33,21 +33,21 @@ class Logger { public: - static void debug (const char* fmt, ...); + static void debug (const char *fmt, ...); private: bool m_debugEnabled; - static Logger* s_instance; - static QMutex* s_mutex; + static Logger *s_instance; + static QMutex *s_mutex; private: Logger (void); ~Logger (void); - static Logger* instance (void); + static Logger * instance (void); - void debugV (const char* fmt, va_list arg); + void debugV (const char *fmt, va_list arg); }; }
--- 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) {
--- a/libgui/graphics/Menu.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/Menu.h Thu Apr 27 15:18:20 2017 -0700 @@ -38,14 +38,14 @@ Q_OBJECT public: - Menu (const graphics_object& go, QAction* action, Object* parent); + Menu (const graphics_object& go, QAction *action, Object *parent); ~Menu (void); - static Menu* create (const graphics_object& go); + static Menu * create (const graphics_object& go); - Container* innerContainer (void) { return 0; } + Container * innerContainer (void) { return 0; } - QWidget* menu (void); + QWidget * menu (void); protected: void update (int pId); @@ -58,8 +58,8 @@ void updateSiblingPositions (void); private: - QWidget* m_parent; - QAction* m_separator; + QWidget *m_parent; + QAction *m_separator; }; }
--- a/libgui/graphics/MenuContainer.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/MenuContainer.h Thu Apr 27 15:18:20 2017 -0700 @@ -31,7 +31,7 @@ class MenuContainer { public: - virtual QWidget* menu (void) = 0; + virtual QWidget * menu (void) = 0; }; }
--- a/libgui/graphics/MouseModeActionGroup.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/MouseModeActionGroup.cc Thu Apr 27 15:18:20 2017 -0700 @@ -33,7 +33,7 @@ namespace QtHandles { - MouseModeActionGroup::MouseModeActionGroup (QObject* xparent) + MouseModeActionGroup::MouseModeActionGroup (QObject *xparent) : QObject (xparent), m_current (0) { m_actions.append (new QAction (QIcon (":/images/rotate.png"), @@ -53,7 +53,7 @@ m_actions.append (new QAction (QIcon (":/images/select.png"), tr ("Select"), this)); - foreach (QAction* a, m_actions) + foreach (QAction *a, m_actions) { a->setCheckable (true); connect (a, SIGNAL (toggled (bool)), this, SLOT (actionToggled (bool)));
--- a/libgui/graphics/MouseModeActionGroup.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/MouseModeActionGroup.h Thu Apr 27 15:18:20 2017 -0700 @@ -38,7 +38,7 @@ Q_OBJECT public: - MouseModeActionGroup (QObject* parent = 0); + MouseModeActionGroup (QObject *parent = 0); ~MouseModeActionGroup (void); QList<QAction*> actions (void) const { return m_actions; } @@ -53,7 +53,7 @@ private: QList<QAction*> m_actions; - QAction* m_current; + QAction *m_current; }; };
--- a/libgui/graphics/Object.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/Object.cc Thu Apr 27 15:18:20 2017 -0700 @@ -34,7 +34,7 @@ namespace QtHandles { - Object::Object (const graphics_object& go, QObject* obj) + Object::Object (const graphics_object& go, QObject *obj) : QObject (), m_handle (go.get_handle ()), m_qobject (0) { gh_manager::auto_lock lock (false); @@ -48,7 +48,7 @@ } void - Object::init (QObject* obj, bool) + Object::init (QObject *obj, bool) { if (m_qobject) qCritical ("QtHandles::Object::init: " @@ -155,7 +155,7 @@ Object::beingDeleted (void) { } - void Object::objectDestroyed (QObject* obj) + void Object::objectDestroyed (QObject *obj) { if (obj && obj == m_qobject) m_qobject = 0; @@ -166,14 +166,14 @@ { gh_manager::auto_lock lock; - Object* parent = Backend::toolkitObject + Object *parent = Backend::toolkitObject (gh_manager::get_object (go.get_parent ())); return parent; } Object* - Object::fromQObject (QObject* obj) + Object::fromQObject (QObject *obj) { QVariant v = obj->property ("QtHandles::Object");
--- a/libgui/graphics/Object.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/Object.h Thu Apr 27 15:18:20 2017 -0700 @@ -42,7 +42,7 @@ Q_OBJECT public: - Object (const graphics_object& go, QObject* obj = 0); + Object (const graphics_object& go, QObject *obj = 0); virtual ~Object (void); @@ -68,14 +68,14 @@ graphics_object object (void) const; - virtual QObject* qObject (void) { return m_qobject; } + virtual QObject * qObject (void) { return m_qobject; } template <typename T> - T* qWidget (void) { return qobject_cast<T *>(qObject ()); } + T * qWidget (void) { return qobject_cast<T *>(qObject ()); } - virtual Container* innerContainer (void) = 0; + virtual Container * innerContainer (void) = 0; - static Object* fromQObject (QObject* obj); + static Object * fromQObject (QObject *obj); public slots: void slotUpdate (int pId); @@ -86,8 +86,8 @@ void objectDestroyed (QObject *obj = 0); protected: - static Object* parentObject (const graphics_object& go); - void init (QObject* obj, bool callBase = false); + static Object * parentObject (const graphics_object& go); + void init (QObject *obj, bool callBase = false); virtual void update (int pId); virtual void finalize (void); @@ -98,7 +98,7 @@ protected: graphics_handle m_handle; - QObject* m_qobject; + QObject *m_qobject; }; }
--- a/libgui/graphics/ObjectFactory.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/ObjectFactory.cc Thu Apr 27 15:18:20 2017 -0700 @@ -84,7 +84,7 @@ qWarning ("ObjectFactory::createObject: object is being deleted"); else { - ObjectProxy* proxy = Backend::toolkitObjectProxy (go); + ObjectProxy *proxy = Backend::toolkitObjectProxy (go); if (proxy) { @@ -92,7 +92,7 @@ "create %s from thread %08x", go.type ().c_str (), QThread::currentThreadId ()); - Object* obj = 0; + Object *obj = 0; if (go.isa ("figure")) obj = Figure::create (go);
--- a/libgui/graphics/ObjectFactory.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/ObjectFactory.h Thu Apr 27 15:18:20 2017 -0700 @@ -37,7 +37,7 @@ Q_OBJECT public: - static ObjectFactory* instance (void); + static ObjectFactory * instance (void); public slots: void createObject (double handle);
--- a/libgui/graphics/ObjectProxy.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/ObjectProxy.cc Thu Apr 27 15:18:20 2017 -0700 @@ -34,14 +34,14 @@ namespace QtHandles { - ObjectProxy::ObjectProxy (Object* obj) + ObjectProxy::ObjectProxy (Object *obj) : QObject (), m_object (0) { init (obj); } void - ObjectProxy::init (Object* obj) + ObjectProxy::init (Object *obj) { if (obj != m_object) { @@ -75,7 +75,7 @@ } void - ObjectProxy::setObject (Object* obj) + ObjectProxy::setObject (Object *obj) { emit sendFinalize (); init (obj);
--- a/libgui/graphics/ObjectProxy.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/ObjectProxy.h Thu Apr 27 15:18:20 2017 -0700 @@ -37,15 +37,15 @@ Q_OBJECT public: - ObjectProxy (Object* obj = 0); + ObjectProxy (Object *obj = 0); void update (int pId); void finalize (void); void redraw (void); void print (const QString& file_cmd, const QString& term); - Object* object (void) { return m_object; } - void setObject (Object* obj); + Object * object (void) { return m_object; } + void setObject (Object *obj); signals: void sendUpdate (int pId); @@ -54,10 +54,10 @@ void sendPrint (const QString& file_cmd, const QString& term); private: - void init (Object* obj); + void init (Object *obj); private: - Object* m_object; + Object *m_object; }; };
--- a/libgui/graphics/Panel.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/Panel.cc Thu Apr 27 15:18:20 2017 -0700 @@ -87,11 +87,11 @@ Panel* Panel::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) return new Panel (go, new QFrame (container)); @@ -100,7 +100,7 @@ return 0; } - Panel::Panel (const graphics_object& go, QFrame* frame) + Panel::Panel (const graphics_object& go, QFrame *frame) : Object (go, frame), m_container (0), m_title (0), m_blockUpdates (false) { uipanel::properties& pp = properties<uipanel> (); @@ -121,7 +121,7 @@ if (frame->hasMouseTracking ()) { - foreach (QWidget* w, frame->findChildren<QWidget*> ()) + foreach (QWidget *w, frame->findChildren<QWidget*> ()) w->setMouseTracking (true); } @@ -148,7 +148,7 @@ { } bool - Panel::eventFilter (QObject* watched, QEvent* xevent) + Panel::eventFilter (QObject *watched, QEvent *xevent) { if (! m_blockUpdates) { @@ -170,7 +170,7 @@ if (pp.fontunits_is ("normalized")) { - QFrame* frame = qWidget<QFrame> (); + QFrame *frame = qWidget<QFrame> (); m_title->setFont (Utils::computeFont<uipanel> (pp, frame->height ())); @@ -184,7 +184,7 @@ case QEvent::MouseButtonPress: { - QMouseEvent* m = dynamic_cast<QMouseEvent *> (xevent); + QMouseEvent *m = dynamic_cast<QMouseEvent *> (xevent); if (m->button () == Qt::RightButton) { @@ -232,7 +232,7 @@ Panel::update (int pId) { uipanel::properties& pp = properties<uipanel> (); - QFrame* frame = qWidget<QFrame> (); + QFrame *frame = qWidget<QFrame> (); m_blockUpdates = true; @@ -336,7 +336,7 @@ void Panel::redraw (void) { - Canvas* canvas = m_container->canvas (m_handle); + Canvas *canvas = m_container->canvas (m_handle); if (canvas) canvas->redraw (); @@ -346,7 +346,7 @@ Panel::updateLayout (void) { uipanel::properties& pp = properties<uipanel> (); - QFrame* frame = qWidget<QFrame> (); + QFrame *frame = qWidget<QFrame> (); Matrix bb = pp.get_boundingbox (true); int bw = borderWidthFromProperties (pp);
--- a/libgui/graphics/Panel.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/Panel.h Thu Apr 27 15:18:20 2017 -0700 @@ -36,14 +36,14 @@ class Panel : public Object { public: - Panel (const graphics_object& go, QFrame* frame); + Panel (const graphics_object& go, QFrame *frame); ~Panel (void); - Container* innerContainer (void) { return m_container; } + Container * innerContainer (void) { return m_container; } - bool eventFilter (QObject* watched, QEvent* event); + bool eventFilter (QObject *watched, QEvent *event); - static Panel* create (const graphics_object& go); + static Panel * create (const graphics_object& go); protected: void update (int pId); @@ -53,8 +53,8 @@ void updateLayout (void); private: - Container* m_container; - QLabel* m_title; + Container *m_container; + QLabel *m_title; bool m_blockUpdates; };
--- a/libgui/graphics/PopupMenuControl.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/PopupMenuControl.cc Thu Apr 27 15:18:20 2017 -0700 @@ -36,11 +36,11 @@ PopupMenuControl* PopupMenuControl::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) return new PopupMenuControl (go, new QComboBox (container)); @@ -68,7 +68,7 @@ void PopupMenuControl::update (int pId) { uicontrol::properties& up = properties<uicontrol> (); - QComboBox* box = qWidget<QComboBox> (); + QComboBox *box = qWidget<QComboBox> (); switch (pId) {
--- a/libgui/graphics/PopupMenuControl.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/PopupMenuControl.h Thu Apr 27 15:18:20 2017 -0700 @@ -35,10 +35,10 @@ Q_OBJECT public: - PopupMenuControl (const graphics_object& go, QComboBox* box); + PopupMenuControl (const graphics_object& go, QComboBox *box); ~PopupMenuControl (void); - static PopupMenuControl* create (const graphics_object& go); + static PopupMenuControl * create (const graphics_object& go); protected: void update (int pId);
--- a/libgui/graphics/PushButtonControl.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/PushButtonControl.cc Thu Apr 27 15:18:20 2017 -0700 @@ -37,11 +37,11 @@ PushButtonControl* PushButtonControl::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) return new PushButtonControl (go, new QPushButton (container)); @@ -51,7 +51,7 @@ } PushButtonControl::PushButtonControl (const graphics_object& go, - QPushButton* btn) + QPushButton *btn) : ButtonControl (go, btn) { btn->setAutoFillBackground (true); @@ -64,7 +64,7 @@ PushButtonControl::update (int pId) { uicontrol::properties& up = properties<uicontrol> (); - QPushButton* btn = qWidget<QPushButton> (); + QPushButton *btn = qWidget<QPushButton> (); switch (pId) {
--- a/libgui/graphics/PushButtonControl.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/PushButtonControl.h Thu Apr 27 15:18:20 2017 -0700 @@ -33,10 +33,10 @@ class PushButtonControl : public ButtonControl { public: - PushButtonControl (const graphics_object& go, QPushButton* btn); + PushButtonControl (const graphics_object& go, QPushButton *btn); ~PushButtonControl (void); - static PushButtonControl* create (const graphics_object& go); + static PushButtonControl * create (const graphics_object& go); protected: void update (int pId);
--- a/libgui/graphics/PushTool.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/PushTool.cc Thu Apr 27 15:18:20 2017 -0700 @@ -34,11 +34,11 @@ PushTool* PushTool::create (const graphics_object& go) { - Object* parent = Object::parentObject (go); + Object *parent = Object::parentObject (go); if (parent) { - QWidget* parentWidget = parent->qWidget<QWidget> (); + QWidget *parentWidget = parent->qWidget<QWidget> (); if (parentWidget) return new PushTool (go, new QAction (parentWidget)); @@ -47,7 +47,7 @@ return 0; } - PushTool::PushTool (const graphics_object& go, QAction* action) + PushTool::PushTool (const graphics_object& go, QAction *action) : ToolBarButton<uipushtool> (go, action) { connect (action, SIGNAL (triggered (bool)), this, SLOT (clicked (void)));
--- a/libgui/graphics/PushTool.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/PushTool.h Thu Apr 27 15:18:20 2017 -0700 @@ -33,10 +33,10 @@ Q_OBJECT public: - PushTool (const graphics_object& go, QAction* action); + PushTool (const graphics_object& go, QAction *action); ~PushTool (void); - static PushTool* create (const graphics_object& go); + static PushTool * create (const graphics_object& go); protected: void update (int pId);
--- a/libgui/graphics/QtHandlesUtils.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/QtHandlesUtils.cc Thu Apr 27 15:18:20 2017 -0700 @@ -155,7 +155,7 @@ toRgb (const QColor& c) { Matrix rgb (1, 3); - double* rgbData = rgb.fortran_vec (); + double *rgbData = rgb.fortran_vec (); // qreal is a typedef for double except for ARM CPU architectures // where it is a typedef for float (Bug #44970). @@ -167,7 +167,7 @@ } std::string - figureSelectionType (QMouseEvent* event, bool isDoubleClick) + figureSelectionType (QMouseEvent *event, bool isDoubleClick) { if (isDoubleClick) return std::string ("open"); @@ -208,13 +208,13 @@ 2) Used for QKeyEvents where cursor position must be determined. */ Matrix - figureCurrentPoint (const graphics_object& fig, QMouseEvent* event) + figureCurrentPoint (const graphics_object& fig, QMouseEvent *event) { - Object* tkFig = Backend::toolkitObject (fig); + Object *tkFig = Backend::toolkitObject (fig); if (tkFig) { - Container* c = tkFig->innerContainer (); + Container *c = tkFig->innerContainer (); if (c) { @@ -231,11 +231,11 @@ Matrix figureCurrentPoint (const graphics_object& fig) { - Object* tkFig = Backend::toolkitObject (fig); + Object *tkFig = Backend::toolkitObject (fig); if (tkFig) { - Container* c = tkFig->innerContainer (); + Container *c = tkFig->innerContainer (); if (c) { @@ -356,7 +356,7 @@ } octave_scalar_map - makeKeyEventStruct (QKeyEvent* event) + makeKeyEventStruct (QKeyEvent *event) { octave_scalar_map retval;
--- a/libgui/graphics/QtHandlesUtils.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/QtHandlesUtils.h Thu Apr 27 15:18:20 2017 -0700 @@ -58,10 +58,10 @@ Qt::Alignment fromHVAlign (const std::string& halign, const std::string& valign); - std::string figureSelectionType (QMouseEvent* event, + std::string figureSelectionType (QMouseEvent *event, bool isDoubleClick = false); - Matrix figureCurrentPoint (const graphics_object& fig, QMouseEvent* event); + Matrix figureCurrentPoint (const graphics_object& fig, QMouseEvent *event); Matrix figureCurrentPoint (const graphics_object& fig); template <typename T> @@ -77,7 +77,7 @@ QImage makeImageFromCData (const octave_value& v, int width = -1, int height = -1); - octave_scalar_map makeKeyEventStruct (QKeyEvent* event); + octave_scalar_map makeKeyEventStruct (QKeyEvent *event); } }
--- a/libgui/graphics/RadioButtonControl.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/RadioButtonControl.cc Thu Apr 27 15:18:20 2017 -0700 @@ -37,11 +37,11 @@ RadioButtonControl* RadioButtonControl::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) return new RadioButtonControl (go, new QRadioButton (container)); @@ -51,11 +51,11 @@ } RadioButtonControl::RadioButtonControl (const graphics_object& go, - QRadioButton* radio) + QRadioButton *radio) : ButtonControl (go, radio) { - Object* parent = Object::parentObject (go); - ButtonGroup* btnGroup = dynamic_cast<ButtonGroup *>(parent); + Object *parent = Object::parentObject (go); + ButtonGroup *btnGroup = dynamic_cast<ButtonGroup *>(parent); if (btnGroup) btnGroup->addButton (radio);
--- a/libgui/graphics/RadioButtonControl.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/RadioButtonControl.h Thu Apr 27 15:18:20 2017 -0700 @@ -33,10 +33,10 @@ class RadioButtonControl : public ButtonControl { public: - RadioButtonControl (const graphics_object& go, QRadioButton* box); + RadioButtonControl (const graphics_object& go, QRadioButton *box); ~RadioButtonControl (void); - static RadioButtonControl* create (const graphics_object& go); + static RadioButtonControl * create (const graphics_object& go); }; }
--- a/libgui/graphics/SliderControl.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/SliderControl.cc Thu Apr 27 15:18:20 2017 -0700 @@ -38,11 +38,11 @@ SliderControl* SliderControl::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) return new SliderControl (go, new QScrollBar (container)); @@ -52,7 +52,7 @@ } SliderControl::SliderControl (const graphics_object& go, - QAbstractSlider* slider) + QAbstractSlider *slider) : BaseControl (go, slider), m_blockUpdates (false) { uicontrol::properties& up = properties<uicontrol> (); @@ -87,7 +87,7 @@ SliderControl::update (int pId) { uicontrol::properties& up = properties<uicontrol> (); - QScrollBar* slider = qWidget<QScrollBar> (); + QScrollBar *slider = qWidget<QScrollBar> (); switch (pId) {
--- a/libgui/graphics/SliderControl.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/SliderControl.h Thu Apr 27 15:18:20 2017 -0700 @@ -35,10 +35,10 @@ Q_OBJECT public: - SliderControl (const graphics_object& go, QAbstractSlider* slider); + SliderControl (const graphics_object& go, QAbstractSlider *slider); ~SliderControl (void); - static SliderControl* create (const graphics_object& go); + static SliderControl * create (const graphics_object& go); protected: void update (int pId);
--- a/libgui/graphics/TextControl.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/TextControl.cc Thu Apr 27 15:18:20 2017 -0700 @@ -36,11 +36,11 @@ TextControl* TextControl::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) return new TextControl (go, new QLabel (container)); @@ -49,7 +49,7 @@ return 0; } - TextControl::TextControl (const graphics_object& go, QLabel* label) + TextControl::TextControl (const graphics_object& go, QLabel *label) : BaseControl (go, label) { uicontrol::properties& up = properties<uicontrol> (); @@ -69,7 +69,7 @@ TextControl::update (int pId) { uicontrol::properties& up = properties<uicontrol> (); - QLabel* label = qWidget<QLabel> (); + QLabel *label = qWidget<QLabel> (); switch (pId) {
--- a/libgui/graphics/TextControl.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/TextControl.h Thu Apr 27 15:18:20 2017 -0700 @@ -33,10 +33,10 @@ class TextControl : public BaseControl { public: - TextControl (const graphics_object& go, QLabel* label); + TextControl (const graphics_object& go, QLabel *label); ~TextControl (void); - static TextControl* create (const graphics_object& go); + static TextControl * create (const graphics_object& go); protected: void update (int pId);
--- a/libgui/graphics/TextEdit.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/TextEdit.cc Thu Apr 27 15:18:20 2017 -0700 @@ -32,7 +32,7 @@ { void - TextEdit::focusOutEvent (QFocusEvent* xevent) + TextEdit::focusOutEvent (QFocusEvent *xevent) { QTextEdit::focusOutEvent (xevent); @@ -40,7 +40,7 @@ } void - TextEdit::keyPressEvent (QKeyEvent* xevent) + TextEdit::keyPressEvent (QKeyEvent *xevent) { QTextEdit::keyPressEvent (xevent);
--- a/libgui/graphics/TextEdit.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/TextEdit.h Thu Apr 27 15:18:20 2017 -0700 @@ -33,7 +33,7 @@ Q_OBJECT public: - TextEdit (QWidget* xparent) : QTextEdit (xparent) { } + TextEdit (QWidget *xparent) : QTextEdit (xparent) { } ~TextEdit (void) = default; signals: @@ -41,8 +41,8 @@ void returnPressed (void); protected: - void focusOutEvent (QFocusEvent* event); - void keyPressEvent (QKeyEvent* event); + void focusOutEvent (QFocusEvent *event); + void keyPressEvent (QKeyEvent *event); }; }
--- a/libgui/graphics/ToggleButtonControl.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/ToggleButtonControl.cc Thu Apr 27 15:18:20 2017 -0700 @@ -37,11 +37,11 @@ ToggleButtonControl* ToggleButtonControl::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) return new ToggleButtonControl (go, new QPushButton (container)); @@ -51,11 +51,11 @@ } ToggleButtonControl::ToggleButtonControl (const graphics_object& go, - QPushButton* btn) + QPushButton *btn) : ButtonControl (go, btn) { - Object* parent = Object::parentObject (go); - ButtonGroup* btnGroup = dynamic_cast<ButtonGroup *>(parent); + Object *parent = Object::parentObject (go); + ButtonGroup *btnGroup = dynamic_cast<ButtonGroup *>(parent); if (btnGroup) btnGroup->addButton (btn);
--- a/libgui/graphics/ToggleButtonControl.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/ToggleButtonControl.h Thu Apr 27 15:18:20 2017 -0700 @@ -33,10 +33,10 @@ class ToggleButtonControl : public ButtonControl { public: - ToggleButtonControl (const graphics_object& go, QPushButton* box); + ToggleButtonControl (const graphics_object& go, QPushButton *box); ~ToggleButtonControl (void); - static ToggleButtonControl* create (const graphics_object& go); + static ToggleButtonControl * create (const graphics_object& go); }; }
--- a/libgui/graphics/ToggleTool.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/ToggleTool.cc Thu Apr 27 15:18:20 2017 -0700 @@ -34,11 +34,11 @@ ToggleTool* ToggleTool::create (const graphics_object& go) { - Object* parent = Object::parentObject (go); + Object *parent = Object::parentObject (go); if (parent) { - QWidget* parentWidget = parent->qWidget<QWidget> (); + QWidget *parentWidget = parent->qWidget<QWidget> (); if (parentWidget) return new ToggleTool (go, new QAction (parentWidget)); @@ -47,7 +47,7 @@ return 0; } - ToggleTool::ToggleTool (const graphics_object& go, QAction* action) + ToggleTool::ToggleTool (const graphics_object& go, QAction *action) : ToolBarButton<uitoggletool> (go, action) { uitoggletool::properties& tp = properties<uitoggletool> (); @@ -66,7 +66,7 @@ ToggleTool::update (int pId) { uitoggletool::properties& tp = properties<uitoggletool> (); - QAction* action = qWidget<QAction> (); + QAction *action = qWidget<QAction> (); switch (pId) {
--- a/libgui/graphics/ToggleTool.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/ToggleTool.h Thu Apr 27 15:18:20 2017 -0700 @@ -33,10 +33,10 @@ Q_OBJECT public: - ToggleTool (const graphics_object& go, QAction* action); + ToggleTool (const graphics_object& go, QAction *action); ~ToggleTool (void); - static ToggleTool* create (const graphics_object& go); + static ToggleTool * create (const graphics_object& go); protected: void update (int pId);
--- a/libgui/graphics/ToolBar.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/ToolBar.cc Thu Apr 27 15:18:20 2017 -0700 @@ -42,7 +42,7 @@ { static QAction* - addEmptyAction (QToolBar* bar) + addEmptyAction (QToolBar *bar) { static QIcon _empty; @@ -55,7 +55,7 @@ _empty = QIcon (pix); } - QAction* a = bar->addAction (_empty, "Empty Toolbar"); + QAction *a = bar->addAction (_empty, "Empty Toolbar"); a->setEnabled (false); a->setToolTip (""); @@ -66,11 +66,11 @@ ToolBar* ToolBar::create (const graphics_object& go) { - Object* parent = Object::parentObject (go); + Object *parent = Object::parentObject (go); if (parent) { - QWidget* parentWidget = parent->qWidget<QWidget> (); + QWidget *parentWidget = parent->qWidget<QWidget> (); if (parentWidget) return new ToolBar (go, new QToolBar (parentWidget)); @@ -79,7 +79,7 @@ return 0; } - ToolBar::ToolBar (const graphics_object& go, QToolBar* bar) + ToolBar::ToolBar (const graphics_object& go, QToolBar *bar) : Object (go, bar), m_empty (0), m_figure (0) { uitoolbar::properties& tp = properties<uitoolbar> (); @@ -106,7 +106,7 @@ ToolBar::update (int pId) { uitoolbar::properties& tp = properties<uitoolbar> (); - QToolBar* bar = qWidget<QToolBar> (); + QToolBar *bar = qWidget<QToolBar> (); switch (pId) { @@ -122,7 +122,7 @@ } bool - ToolBar::eventFilter (QObject* watched, QEvent* xevent) + ToolBar::eventFilter (QObject *watched, QEvent *xevent) { if (watched == qObject ()) { @@ -131,8 +131,8 @@ case QEvent::ActionAdded: case QEvent::ActionRemoved: { - QActionEvent* ae = dynamic_cast<QActionEvent *> (xevent); - QToolBar* bar = qWidget<QToolBar> (); + QActionEvent *ae = dynamic_cast<QActionEvent *> (xevent); + QToolBar *bar = qWidget<QToolBar> (); if (ae->action () != m_empty) { @@ -169,7 +169,7 @@ { if (m_figure) { - QToolBar* bar = qWidget<QToolBar> (); + QToolBar *bar = qWidget<QToolBar> (); if (bar) m_figure->showCustomToolBar (bar, false);
--- a/libgui/graphics/ToolBar.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/ToolBar.h Thu Apr 27 15:18:20 2017 -0700 @@ -38,14 +38,14 @@ Q_OBJECT public: - ToolBar (const graphics_object& go, QToolBar* bar); + ToolBar (const graphics_object& go, QToolBar *bar); ~ToolBar (void); - static ToolBar* create (const graphics_object& go); + static ToolBar * create (const graphics_object& go); - Container* innerContainer (void) { return 0; } + Container * innerContainer (void) { return 0; } - bool eventFilter (QObject* watched, QEvent* event); + bool eventFilter (QObject *watched, QEvent *event); protected: void update (int pId); @@ -55,8 +55,8 @@ void hideEmpty (void); private: - QAction* m_empty; - Figure* m_figure; + QAction *m_empty; + Figure *m_figure; }; }
--- a/libgui/graphics/ToolBarButton.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/ToolBarButton.cc Thu Apr 27 15:18:20 2017 -0700 @@ -34,7 +34,7 @@ { template <typename T> - ToolBarButton<T>::ToolBarButton (const graphics_object& go, QAction* action) + ToolBarButton<T>::ToolBarButton (const graphics_object& go, QAction *action) : Object (go, action), m_separator (0) { typename T::properties& tp = properties<T> (); @@ -51,7 +51,7 @@ } action->setEnabled (tp.is_enable ()); - QWidget* w = qobject_cast<QWidget *> (action->parent ()); + QWidget *w = qobject_cast<QWidget *> (action->parent ()); w->insertAction (w->actions ().back (), action); if (m_separator) @@ -67,7 +67,7 @@ ToolBarButton<T>::update (int pId) { typename T::properties& tp = properties<T> (); - QAction* action = qWidget<QAction> (); + QAction *action = qWidget<QAction> (); switch (pId) { @@ -98,7 +98,7 @@ m_separator->setSeparator (true); m_separator->setVisible (tp.is_visible ()); - QWidget* w = qobject_cast<QWidget *> (action->parent ()); + QWidget *w = qobject_cast<QWidget *> (action->parent ()); w->insertAction (action, m_separator); }
--- a/libgui/graphics/ToolBarButton.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/graphics/ToolBarButton.h Thu Apr 27 15:18:20 2017 -0700 @@ -36,16 +36,16 @@ class ToolBarButton : public Object { public: - ToolBarButton (const graphics_object& go, QAction* action); + ToolBarButton (const graphics_object& go, QAction *action); ~ToolBarButton (void); - Container* innerContainer (void) { return 0; } + Container * innerContainer (void) { return 0; } protected: void update (int pId); private: - QAction* m_separator; + QAction *m_separator; }; };
--- a/libgui/src/color-picker.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/src/color-picker.cc Thu Apr 27 15:18:20 2017 -0700 @@ -32,7 +32,7 @@ #include "color-picker.h" // constuctor with initial color as parameter -color_picker::color_picker (QColor old_color, QWidget* p) : QPushButton (p) +color_picker::color_picker (QColor old_color, QWidget *p) : QPushButton (p) { _color = old_color; setFlat (true);
--- a/libgui/src/m-editor/file-editor-tab.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/src/m-editor/file-editor-tab.cc Thu Apr 27 15:18:20 2017 -0700 @@ -1504,7 +1504,7 @@ else file = tr ("<unnamed>"); - QMessageBox* msgBox + QMessageBox *msgBox = new QMessageBox (QMessageBox::Warning, tr ("Octave Editor"), tr ("The file\n\n" " %1\n\n" @@ -1876,7 +1876,7 @@ _file_system_watcher.addPath (file_to_save); // Create a NonModal message about error. - QMessageBox* msgBox + QMessageBox *msgBox = new QMessageBox (QMessageBox::Critical, tr ("Octave Editor"), tr ("Could not open file %1 for write:\n%2."). @@ -1949,7 +1949,7 @@ // If the tab is removed in response to a QFileDialog signal, the tab // can't be a parent. - QFileDialog* fileDialog; + QFileDialog *fileDialog; if (remove_on_success) { // If tab is closed, "this" cannot be parent in which case modality @@ -2200,7 +2200,7 @@ // Create a WindowModal message that blocks the edit area // by making _edit_area parent. - QMessageBox* msgBox + QMessageBox *msgBox = new QMessageBox (QMessageBox::Warning, tr ("Octave Editor"), tr ("It seems that \'%1\' has been modified by another application. Do you want to reload it?"). @@ -2229,7 +2229,7 @@ // Create a WindowModal message. The file editor tab can't be made // parent because it may be deleted depending upon the response. // Instead, change the _edit_area to read only. - QMessageBox* msgBox + QMessageBox *msgBox = new QMessageBox (QMessageBox::Warning, tr ("Octave Editor"), tr ("It seems that the file\n" "%1\n"
--- a/libgui/src/m-editor/file-editor.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/src/m-editor/file-editor.cc Thu Apr 27 15:18:20 2017 -0700 @@ -1043,7 +1043,7 @@ { // remove all standard actions from scintilla QList<QAction *> all_actions = menu->actions (); - QAction* a; + QAction *a; foreach (a, all_actions) menu->removeAction (a); @@ -2353,7 +2353,7 @@ file_editor_tab_widget::file_editor_tab_widget (QWidget *p) : QTabWidget (p) { - file_editor_tab_bar* bar; + file_editor_tab_bar *bar; bar = new file_editor_tab_bar (this); connect (bar, SIGNAL (close_current_tab_signal (bool)),
--- a/libgui/src/m-editor/file-editor.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/src/m-editor/file-editor.h Thu Apr 27 15:18:20 2017 -0700 @@ -78,7 +78,7 @@ file_editor_tab_widget (QWidget *p); ~file_editor_tab_widget (); - QTabBar* tabBar () const; + QTabBar * tabBar () const; }; @@ -145,50 +145,50 @@ signals: void fetab_settings_changed (const QSettings *settings); - void fetab_change_request (const QWidget* ID); - void fetab_file_name_query (const QWidget* ID); + void fetab_change_request (const QWidget *ID); + void fetab_file_name_query (const QWidget *ID); // Save is a ping-pong type of communication - void fetab_save_file (const QWidget* ID, const QString& fileName, + void fetab_save_file (const QWidget *ID, const QString& fileName, bool remove_on_success); // No fetab_open, functionality in editor // No fetab_new, functionality in editor - void fetab_context_help (const QWidget* ID, bool); - void fetab_context_edit (const QWidget* ID); + void fetab_context_help (const QWidget *ID, bool); + void fetab_context_edit (const QWidget *ID); void fetab_check_modified_file (void); - void fetab_save_file (const QWidget* ID); - void fetab_save_file_as (const QWidget* ID); - void fetab_print_file (const QWidget* ID); - void fetab_run_file (const QWidget* ID); - void fetab_context_run (const QWidget* ID); - void fetab_toggle_bookmark (const QWidget* ID); - void fetab_next_bookmark (const QWidget* ID); - void fetab_previous_bookmark (const QWidget* ID); - void fetab_remove_bookmark (const QWidget* ID); - void fetab_toggle_breakpoint (const QWidget* ID); - void fetab_next_breakpoint (const QWidget* ID); - void fetab_previous_breakpoint (const QWidget* ID); - void fetab_remove_all_breakpoints (const QWidget* ID); - void fetab_comment_selected_text (const QWidget* ID); - void fetab_uncomment_selected_text (const QWidget* ID); - void fetab_indent_selected_text (const QWidget* ID); - void fetab_unindent_selected_text (const QWidget* ID); - void fetab_convert_eol (const QWidget* ID, QsciScintilla::EolMode eol_mode); - void fetab_find (const QWidget* ID, QList<QAction *>); - void fetab_find_next (const QWidget* ID); - void fetab_find_previous (const QWidget* ID); - void fetab_goto_line (const QWidget* ID, int line = -1); - void fetab_move_match_brace (const QWidget* ID, bool select); + void fetab_save_file (const QWidget *ID); + void fetab_save_file_as (const QWidget *ID); + void fetab_print_file (const QWidget *ID); + void fetab_run_file (const QWidget *ID); + void fetab_context_run (const QWidget *ID); + void fetab_toggle_bookmark (const QWidget *ID); + void fetab_next_bookmark (const QWidget *ID); + void fetab_previous_bookmark (const QWidget *ID); + void fetab_remove_bookmark (const QWidget *ID); + void fetab_toggle_breakpoint (const QWidget *ID); + void fetab_next_breakpoint (const QWidget *ID); + void fetab_previous_breakpoint (const QWidget *ID); + void fetab_remove_all_breakpoints (const QWidget *ID); + void fetab_comment_selected_text (const QWidget *ID); + void fetab_uncomment_selected_text (const QWidget *ID); + void fetab_indent_selected_text (const QWidget *ID); + void fetab_unindent_selected_text (const QWidget *ID); + void fetab_convert_eol (const QWidget *ID, QsciScintilla::EolMode eol_mode); + void fetab_find (const QWidget *ID, QList<QAction *>); + void fetab_find_next (const QWidget *ID); + void fetab_find_previous (const QWidget *ID); + void fetab_goto_line (const QWidget *ID, int line = -1); + void fetab_move_match_brace (const QWidget *ID, bool select); void fetab_completion (const QWidget*); - void fetab_insert_debugger_pointer (const QWidget* ID, int line = -1); - void fetab_delete_debugger_pointer (const QWidget* ID, int line = -1); - void fetab_do_breakpoint_marker (bool insert, const QWidget* ID, + void fetab_insert_debugger_pointer (const QWidget *ID, int line = -1); + void fetab_delete_debugger_pointer (const QWidget *ID, int line = -1); + void fetab_do_breakpoint_marker (bool insert, const QWidget *ID, int line = -1, const QString& = ""); - void fetab_set_focus (const QWidget* ID); - void fetab_scintilla_command (const QWidget* ID, unsigned int sci_msg); + void fetab_set_focus (const QWidget *ID); + void fetab_scintilla_command (const QWidget *ID, unsigned int sci_msg); - void fetab_zoom_in (const QWidget* ID); - void fetab_zoom_out (const QWidget* ID); - void fetab_zoom_normal (const QWidget* ID); + void fetab_zoom_in (const QWidget *ID); + void fetab_zoom_out (const QWidget *ID); + void fetab_zoom_normal (const QWidget *ID); void fetab_set_directory (const QString& dir); void fetab_recover_from_exit (void); @@ -201,7 +201,7 @@ public slots: void focus (void); - void set_focus (QWidget* fet); + void set_focus (QWidget *fet); void enable_menu_shortcuts (bool); bool check_closing (void); @@ -353,7 +353,7 @@ QAction * add_action (QMenu *menu, const QIcon& icon, const QString& text, const char *member); - QMenu* m_add_menu (QMenuBar *p, QString text); + QMenu * m_add_menu (QMenuBar *p, QString text); std::map<QString, tab_info> editor_tab_map; QHash<QMenu*, QStringList> _hash_menu_text;
--- a/libgui/src/m-editor/find-dialog.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/src/m-editor/find-dialog.cc Thu Apr 27 15:18:20 2017 -0700 @@ -78,7 +78,7 @@ #include "find-dialog.h" -find_dialog::find_dialog (QsciScintilla* edit_area, +find_dialog::find_dialog (QsciScintilla *edit_area, QList<QAction *> find_actions, QWidget *p) : QDialog (p) {
--- a/libgui/src/m-editor/find-dialog.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/src/m-editor/find-dialog.h Thu Apr 27 15:18:20 2017 -0700 @@ -76,7 +76,7 @@ { Q_OBJECT public: - find_dialog (QsciScintilla* edit_area, QList<QAction *> find_actions, + find_dialog (QsciScintilla *edit_area, QList<QAction *> find_actions, QWidget *parent = 0); void init_search_text ();
--- a/libgui/src/m-editor/octave-qscintilla.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/src/m-editor/octave-qscintilla.cc Thu Apr 27 15:18:20 2017 -0700 @@ -264,7 +264,7 @@ { // remove all standard actions from scintilla QList<QAction *> all_actions = context_menu->actions (); - QAction* a; + QAction *a; foreach (a, all_actions) context_menu->removeAction (a);
--- a/libgui/src/main-window.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/src/main-window.cc Thu Apr 27 15:18:20 2017 -0700 @@ -245,7 +245,7 @@ void main_window::focus_changed (QWidget *, QWidget *new_widget) { - octave_dock_widget* dock = 0; + octave_dock_widget *dock = 0; QWidget *w_new = new_widget; // get a copy of new focus widget QWidget *start = w_new; // Save it as start of our search int count = 0; // fallback to prevent endless loop
--- a/libgui/src/main-window.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/src/main-window.h Thu Apr 27 15:18:20 2017 -0700 @@ -284,13 +284,13 @@ QAction * add_action (QMenu *menu, const QIcon& icon, const QString& text, const char *member, const QWidget *receiver = 0); - QMenu* m_add_menu (QMenuBar *p, QString text); + QMenu * m_add_menu (QMenuBar *p, QString text); void construct_menu_bar (void); void construct_file_menu (QMenuBar *p); void construct_new_menu (QMenu *p); void construct_edit_menu (QMenuBar *p); QAction * construct_debug_menu_item (const char *icon, const QString& item, - const char* member); + const char *member); void construct_debug_menu (QMenuBar *p); QAction * construct_window_menu_item (QMenu *p, const QString& item, bool checkable, QWidget*);
--- a/libgui/src/octave-cmd.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/src/octave-cmd.cc Thu Apr 27 15:18:20 2017 -0700 @@ -112,7 +112,7 @@ // add_cmd: add a command to the queue void -octave_command_queue::add_cmd (octave_cmd* cmd) +octave_command_queue::add_cmd (octave_cmd *cmd) { _queue_mutex.lock (); _queue.append (cmd);
--- a/libgui/src/octave-dock-widget.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/src/octave-dock-widget.cc Thu Apr 27 15:18:20 2017 -0700 @@ -173,7 +173,7 @@ octave_dock_widget::set_title (const QString& title) { #if defined (Q_OS_WIN32) - QHBoxLayout* h_layout + QHBoxLayout *h_layout = static_cast<QHBoxLayout *> (titleBarWidget ()->layout ()); QLabel *label = new QLabel (title); label->setStyleSheet ("background: transparent;");
--- a/libgui/src/qtinfo/parser.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/src/qtinfo/parser.cc Thu Apr 27 15:18:20 2017 -0700 @@ -377,7 +377,7 @@ text.replace ("<", "<"); text.replace (">", ">"); - text.replace ("\n* Menu:", + text.replace ("\n *Menu:", "\n<font style=\"color:DarkRed;font-weight:bold\">Menu:</font>"); text.replace ("See also:", "<font style=\"color:DarkRed;font-style:italic;font-weight:bold\">See also:</font>");
--- a/libgui/src/shortcut-manager.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/src/shortcut-manager.cc Thu Apr 27 15:18:20 2017 -0700 @@ -424,8 +424,8 @@ { shortcut_t sc = _sc.at (i); - QTreeWidgetItem* section = _level_hash[sc.settings_key.section (':',0,0)]; - QTreeWidgetItem* tree_item = new QTreeWidgetItem (section); + QTreeWidgetItem *section = _level_hash[sc.settings_key.section (':',0,0)]; + QTreeWidgetItem *tree_item = new QTreeWidgetItem (section); // set a slightly transparent foreground for default columns QColor fg = QColor (tree_item->foreground (1).color ()); @@ -445,7 +445,7 @@ // write one or all actual shortcut set(s) into a settings file void -shortcut_manager::do_write_shortcuts (QSettings* settings, +shortcut_manager::do_write_shortcuts (QSettings *settings, bool closing) { bool sc_ctrld = false; @@ -472,7 +472,7 @@ } void -shortcut_manager::do_set_shortcut (QAction* action, const QString& key) +shortcut_manager::do_set_shortcut (QAction *action, const QString& key) { int index; @@ -486,7 +486,7 @@ } void -shortcut_manager::handle_double_clicked (QTreeWidgetItem* item, int col) +shortcut_manager::handle_double_clicked (QTreeWidgetItem *item, int col) { if (col != 2) return; @@ -637,7 +637,7 @@ _sc.replace (i,sc); // replace the old with the new one // update the tree view - QTreeWidgetItem* tree_item = _index_item_hash[i]; // get related tree item + QTreeWidgetItem *tree_item = _index_item_hash[i]; // get related tree item tree_item->setText (2, sc.actual_sc.toString ()); // display new shortcut } }
--- a/libgui/src/workspace-view.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libgui/src/workspace-view.cc Thu Apr 27 15:18:20 2017 -0700 @@ -389,7 +389,7 @@ { QString var_name = get_var_name (index); - QInputDialog* inputDialog = new QInputDialog (); + QInputDialog *inputDialog = new QInputDialog (); inputDialog->setOptions (QInputDialog::NoButtons);
--- a/libinterp/corefcn/__ichol__.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/__ichol__.cc Thu Apr 27 15:18:20 2017 -0700 @@ -85,8 +85,8 @@ opt = OFF; // Input matrix pointers - octave_idx_type* cidx = sm.cidx (); - octave_idx_type* ridx = sm.ridx (); + octave_idx_type *cidx = sm.cidx (); + octave_idx_type *ridx = sm.ridx (); T* data = sm.data (); // Working arrays @@ -229,8 +229,8 @@ opt = OFF; // Input matrix pointers - octave_idx_type* cidx = sm.cidx (); - octave_idx_type* ridx = sm.ridx (); + octave_idx_type *cidx = sm.cidx (); + octave_idx_type *ridx = sm.ridx (); T* data = sm.data (); // Output matrix data structures. Because the final zero pattern pattern of @@ -243,9 +243,9 @@ max_len = sm.nnz (); max_len += (0.1 * max_len) > n ? 0.1 * max_len : n; Array <octave_idx_type> cidx_out_l (dim_vector (n + 1, 1)); - octave_idx_type* cidx_l = cidx_out_l.fortran_vec (); + octave_idx_type *cidx_l = cidx_out_l.fortran_vec (); Array <octave_idx_type> ridx_out_l (dim_vector (max_len ,1)); - octave_idx_type* ridx_l = ridx_out_l.fortran_vec (); + octave_idx_type *ridx_l = ridx_out_l.fortran_vec (); Array <T> data_out_l (dim_vector (max_len, 1)); T* data_l = data_out_l.fortran_vec ();
--- a/libinterp/corefcn/__ilu__.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/__ilu__.cc Thu Apr 27 15:18:20 2017 -0700 @@ -60,9 +60,9 @@ opt = OFF; // Input matrix pointers - octave_idx_type* cidx = sm.cidx (); - octave_idx_type* ridx = sm.ridx (); - T* data = sm.data (); + octave_idx_type *cidx = sm.cidx (); + octave_idx_type *ridx = sm.ridx (); + T *data = sm.data (); // Working arrays OCTAVE_LOCAL_BUFFER (octave_idx_type, iw, n); @@ -180,8 +180,8 @@ template <typename octave_matrix_t, typename T> void ilu_crout (octave_matrix_t& sm_l, octave_matrix_t& sm_u, - octave_matrix_t& L, octave_matrix_t& U, T* cols_norm, - T* rows_norm, const T droptol = 0, + octave_matrix_t& L, octave_matrix_t& U, T *cols_norm, + T *rows_norm, const T droptol = 0, const std::string milu = "off") { // Map the strings into chars for faster comparing inside loops @@ -206,24 +206,24 @@ max_len_l += (0.1 * max_len_l) > n ? 0.1 * max_len_l : n; // Extract pointers to the arrays for faster access inside loops - octave_idx_type* cidx_in_u = sm_u.cidx (); - octave_idx_type* ridx_in_u = sm_u.ridx (); - T* data_in_u = sm_u.data (); - octave_idx_type* cidx_in_l = sm_l.cidx (); - octave_idx_type* ridx_in_l = sm_l.ridx (); - T* data_in_l = sm_l.data (); + octave_idx_type *cidx_in_u = sm_u.cidx (); + octave_idx_type *ridx_in_u = sm_u.ridx (); + T *data_in_u = sm_u.data (); + octave_idx_type *cidx_in_l = sm_l.cidx (); + octave_idx_type *ridx_in_l = sm_l.ridx (); + T *data_in_l = sm_l.data (); // L output arrays Array <octave_idx_type> ridx_out_l (dim_vector (max_len_l, 1)); - octave_idx_type* ridx_l = ridx_out_l.fortran_vec (); + octave_idx_type *ridx_l = ridx_out_l.fortran_vec (); Array <T> data_out_l (dim_vector (max_len_l, 1)); - T* data_l = data_out_l.fortran_vec (); + T *data_l = data_out_l.fortran_vec (); // U output arrays Array <octave_idx_type> ridx_out_u (dim_vector (max_len_u, 1)); - octave_idx_type* ridx_u = ridx_out_u.fortran_vec (); + octave_idx_type *ridx_u = ridx_out_u.fortran_vec (); Array <T> data_out_u (dim_vector (max_len_u, 1)); - T* data_u = data_out_u.fortran_vec (); + T *data_u = data_out_u.fortran_vec (); // Working arrays OCTAVE_LOCAL_BUFFER (octave_idx_type, cidx_l, n + 1); @@ -518,7 +518,7 @@ template <typename octave_matrix_t, typename T> void ilu_tp (octave_matrix_t& sm, octave_matrix_t& L, octave_matrix_t& U, - octave_idx_type nnz_u, octave_idx_type nnz_l, T* cols_norm, + octave_idx_type nnz_u, octave_idx_type nnz_l, T *cols_norm, Array <octave_idx_type>& perm_vec, const T droptol = T(0), const T thresh = T(0), const std::string milu = "off", const double udiag = 0) @@ -539,9 +539,9 @@ sm = sm.transpose (); // Extract pointers to the arrays for faster access inside loops - octave_idx_type* cidx_in = sm.cidx (); - octave_idx_type* ridx_in = sm.ridx (); - T* data_in = sm.data (); + octave_idx_type *cidx_in = sm.cidx (); + octave_idx_type *ridx_in = sm.ridx (); + T *data_in = sm.data (); octave_idx_type jrow, i, j, k, jj, c, total_len_l, total_len_u, p_perm, max_ind, max_len_l, max_len_u; T zero = T(0); @@ -555,19 +555,19 @@ // Extract pointers to the arrays for faster access inside loops Array <octave_idx_type> cidx_out_l (dim_vector (n + 1, 1)); - octave_idx_type* cidx_l = cidx_out_l.fortran_vec (); + octave_idx_type *cidx_l = cidx_out_l.fortran_vec (); Array <octave_idx_type> ridx_out_l (dim_vector (max_len_l, 1)); - octave_idx_type* ridx_l = ridx_out_l.fortran_vec (); + octave_idx_type *ridx_l = ridx_out_l.fortran_vec (); Array <T> data_out_l (dim_vector (max_len_l, 1)); - T* data_l = data_out_l.fortran_vec (); + T *data_l = data_out_l.fortran_vec (); // Data for U Array <octave_idx_type> cidx_out_u (dim_vector (n + 1, 1)); - octave_idx_type* cidx_u = cidx_out_u.fortran_vec (); + octave_idx_type *cidx_u = cidx_out_u.fortran_vec (); Array <octave_idx_type> ridx_out_u (dim_vector (max_len_u, 1)); - octave_idx_type* ridx_u = ridx_out_u.fortran_vec (); + octave_idx_type *ridx_u = ridx_out_u.fortran_vec (); Array <T> data_out_u (dim_vector (max_len_u, 1)); - T* data_u = data_out_u.fortran_vec (); + T *data_u = data_out_u.fortran_vec (); // Working arrays and permutation arrays octave_idx_type w_len_u, w_len_l; @@ -577,7 +577,7 @@ std::set <octave_idx_type>::iterator it, it2; OCTAVE_LOCAL_BUFFER (T, w_data, n); OCTAVE_LOCAL_BUFFER (octave_idx_type, iperm, n); - octave_idx_type* perm = perm_vec.fortran_vec (); + octave_idx_type *perm = perm_vec.fortran_vec (); OCTAVE_LOCAL_BUFFER (octave_idx_type, uptr, n); // Initialize working and permutation arrays
--- a/libinterp/corefcn/__magick_read__.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/__magick_read__.cc Thu Apr 27 15:18:20 2017 -0700 @@ -288,7 +288,7 @@ const octave_idx_type def_elem = frameidx(0); T img = T (dim_vector (nRows, nCols, 1, nFrames)); - P* img_fvec = img.fortran_vec (); + P *img_fvec = img.fortran_vec (); const octave_idx_type row_start = region.row_start (); const octave_idx_type col_start = region.col_start (); @@ -340,10 +340,10 @@ if (imvec[def_elem].matte () && nargout >= 3) { const Matrix amap = maps(1).matrix_value (); - const double* amap_fvec = amap.fortran_vec (); + const double *amap_fvec = amap.fortran_vec (); NDArray alpha (dim_vector (nRows, nCols, 1, nFrames)); - double* alpha_fvec = alpha.fortran_vec (); + double *alpha_fvec = alpha.fortran_vec (); // GraphicsMagick stores the alpha values inverted, i.e., // 1 for transparent and 0 for opaque so we fix that here. @@ -940,8 +940,8 @@ typedef typename T::element_type P; uint32NDArray out (img.dims ()); - octave_uint32* out_fvec = out.fortran_vec (); - const P* img_fvec = img.fortran_vec (); + octave_uint32 *out_fvec = out.fortran_vec (); + const P *img_fvec = img.fortran_vec (); const octave_uint32 max = octave_uint32::max (); const octave_idx_type numel = img.numel (); @@ -1011,7 +1011,7 @@ // even if it's always the same. We can least get a vector for the Colors. std::vector<Magick::ColorRGB> colormap; { - const double* cmap_fvec = cmap.fortran_vec (); + const double *cmap_fvec = cmap.fortran_vec (); const octave_idx_type G_offset = cmap_size; const octave_idx_type B_offset = cmap_size * 2; for (octave_idx_type map_idx = 0; map_idx < cmap_size; map_idx++) @@ -1042,9 +1042,9 @@ // values (no indexes), then set the image as PseudoClass and GM // would create a colormap for us. However, we wouldn't have control // over the order of that colormap. And that's why we set both. - Magick::PixelPacket* pix = m_img.getPixels (0, 0, nCols, nRows); - Magick::IndexPacket* ind = m_img.getIndexes (); - const P* img_fvec = img.fortran_vec (); + Magick::PixelPacket *pix = m_img.getPixels (0, 0, nCols, nRows); + Magick::IndexPacket *ind = m_img.getIndexes (); + const P *img_fvec = img.fortran_vec (); octave_idx_type GM_idx = 0; for (octave_idx_type column = 0; column < nCols; column++) @@ -2055,7 +2055,7 @@ // be all zeros. So rather than send a matrix of zeros, we will // check for that, and send an empty vector instead. RowVector chromaticities (8); - double* chroma_fvec = chromaticities.fortran_vec (); + double *chroma_fvec = chromaticities.fortran_vec (); img.chromaWhitePoint (&chroma_fvec[0], &chroma_fvec[1]); img.chromaRedPrimary (&chroma_fvec[2], &chroma_fvec[3]); img.chromaGreenPrimary (&chroma_fvec[4], &chroma_fvec[5]);
--- a/libinterp/corefcn/c-file-ptr-stream.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/c-file-ptr-stream.cc Thu Apr 27 15:18:20 2017 -0700 @@ -82,7 +82,7 @@ } std::streamsize -c_file_ptr_buf::xsputn (const char* s, std::streamsize n) +c_file_ptr_buf::xsputn (const char *s, std::streamsize n) { if (f) return std::fwrite (s, 1, n, f); @@ -226,7 +226,7 @@ } std::streamsize -c_zfile_ptr_buf::xsputn (const char* s, std::streamsize n) +c_zfile_ptr_buf::xsputn (const char *s, std::streamsize n) { if (f) return gzwrite (f, s, n);
--- a/libinterp/corefcn/c-file-ptr-stream.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/c-file-ptr-stream.h Thu Apr 27 15:18:20 2017 -0700 @@ -39,7 +39,7 @@ typedef int (*close_fcn) (FILE *); - FILE* stdiofile (void) { return f; } + FILE *stdiofile (void) { return f; } c_file_ptr_buf (FILE *f_arg, close_fcn cf_arg = file_close) : std::streambuf (), f (f_arg), cf (cf_arg)
--- a/libinterp/corefcn/cellfun.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/cellfun.cc Thu Apr 27 15:18:20 2017 -0700 @@ -457,7 +457,7 @@ { if (func.is_function_handle ()) { - octave_fcn_handle* f = func.fcn_handle_value (); + octave_fcn_handle *f = func.fcn_handle_value (); // Overloaded function handles need to check the type of the // arguments for each element of the array, so they cannot be @@ -1162,7 +1162,7 @@ { if (func.is_function_handle ()) { - octave_fcn_handle* f = func.fcn_handle_value (); + octave_fcn_handle *f = func.fcn_handle_value (); // Overloaded function handles need to check the type of the // arguments for each element of the array, so they cannot be
--- a/libinterp/corefcn/data.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/data.cc Thu Apr 27 15:18:20 2017 -0700 @@ -7745,8 +7745,8 @@ { \ const X##NDArray in = args(0). X## _array_value (); \ size_t inlen = in.numel () * sizeof (X## _t) / sizeof (char); \ - const char* inc = reinterpret_cast<const char *> (in.data ()); \ - char* out; \ + const char *inc = reinterpret_cast<const char *> (in.data ()); \ + char *out; \ if (octave_base64_encode (inc, inlen, &out)) \ { \ retval(0) = octave_value (out); \ @@ -7775,7 +7775,7 @@ inlen = in.numel () * sizeof (float) / sizeof (char); const char* inc; inc = reinterpret_cast<const char *> (in.data ()); - char* out; + char *out; if (octave_base64_encode (inc, inlen, &out)) { retval(0) = octave_value (out); @@ -7789,7 +7789,7 @@ inlen = in.numel () * sizeof (double) / sizeof (char); const char* inc; inc = reinterpret_cast<const char *> (in.data ()); - char* out; + char *out; if (octave_base64_encode (inc, inlen, &out)) { retval(0) = octave_value (out);
--- a/libinterp/corefcn/gl2ps-print.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/gl2ps-print.cc Thu Apr 27 15:18:20 2017 -0700 @@ -231,7 +231,7 @@ gl2ps_sort = GL2PS_SIMPLE_SORT; // Use a temporary file in case an overflow happens - FILE* tmpf = octave_tmpfile_wrapper (); + FILE *tmpf = octave_tmpfile_wrapper (); if (! tmpf) error ("gl2ps_renderer::draw: couldn't open temporary file for printing");
--- a/libinterp/corefcn/graphics.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/graphics.cc Thu Apr 27 15:18:20 2017 -0700 @@ -1531,9 +1531,9 @@ /* sparse/bool arrays that are converted, to */ \ /* not be deallocated early */ \ const A m1 = data.F ## array_value (); \ - const T* d1 = m1.data (); \ + const T *d1 = m1.data (); \ const A m2 = v.F ## array_value (); \ - const T* d2 = m2.data (); \ + const T *d2 = m2.data (); \ \ bool flag = true; \ \ @@ -9615,7 +9615,7 @@ { graphics_handle h = val; - base_graphics_object* bgo = new figure (h, 0); + base_graphics_object *bgo = new figure (h, 0); graphics_object go (bgo); handle_map[h] = go; @@ -9693,7 +9693,7 @@ function_event (void) = delete; - function_event (graphics_event::event_fcn fcn, void* data = 0) + function_event (graphics_event::event_fcn fcn, void *data = 0) : base_graphics_event (), function (fcn), function_data (data) { } @@ -9712,7 +9712,7 @@ graphics_event::event_fcn function; - void* function_data; + void *function_data; }; class @@ -9989,7 +9989,7 @@ } void -gh_manager::do_post_function (graphics_event::event_fcn fcn, void* fcn_data) +gh_manager::do_post_function (graphics_event::event_fcn fcn, void *fcn_data) { gh_manager::auto_lock guard;
--- a/libinterp/corefcn/graphics.in.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/graphics.in.h Thu Apr 27 15:18:20 2017 -0700 @@ -82,7 +82,7 @@ error ("invalid axis scale"); } - virtual base_scaler* clone () const + virtual base_scaler * clone () const { return new base_scaler (); } virtual bool is_linear (void) const @@ -102,7 +102,7 @@ double unscale (double d) const { return d; } - base_scaler* clone (void) const { return new lin_scaler (); } + base_scaler * clone (void) const { return new lin_scaler (); } bool is_linear (void) const { return true; } }; @@ -136,7 +136,7 @@ double unscale (double d) const { return pow (10.0, d); } - base_scaler* clone (void) const + base_scaler * clone (void) const { return new log_scaler (); } private: @@ -176,7 +176,7 @@ double unscale (double d) const { return -pow (10.0, -d); } - base_scaler* clone (void) const + base_scaler * clone (void) const { return new neg_log_scaler (); } private: @@ -387,7 +387,7 @@ OCTINTERP_API void run_listeners (listener_mode mode = POSTSET); - virtual base_property* clone (void) const + virtual base_property * clone (void) const { return new base_property (*this); } protected: @@ -435,7 +435,7 @@ return *this; } - base_property* clone (void) const { return new string_property (*this); } + base_property * clone (void) const { return new string_property (*this); } protected: bool do_set (const octave_value& val) @@ -541,7 +541,7 @@ return *this; } - base_property* clone (void) const + base_property * clone (void) const { return new string_array_property (*this); } protected: @@ -746,7 +746,7 @@ return *this; } - base_property* clone (void) const { return new text_label_property (*this); } + base_property * clone (void) const { return new text_label_property (*this); } protected: @@ -944,7 +944,7 @@ return *this; } - base_property* clone (void) const { return new radio_property (*this); } + base_property * clone (void) const { return new radio_property (*this); } protected: bool do_set (const octave_value& newval) @@ -1130,7 +1130,7 @@ operator octave_value (void) const { return get (); } - base_property* clone (void) const { return new color_property (*this); } + base_property * clone (void) const { return new color_property (*this); } std::string values_as_string (void) const { return radio_val.values_as_string (); } @@ -1182,7 +1182,7 @@ return *this; } - base_property* clone (void) const + base_property * clone (void) const { double_property *p = new double_property (*this); @@ -1335,7 +1335,7 @@ operator octave_value (void) const { return get (); } - base_property* clone (void) const + base_property * clone (void) const { return new double_radio_property (*this); } protected: @@ -1427,7 +1427,7 @@ return *this; } - base_property* clone (void) const + base_property * clone (void) const { array_property *p = new array_property (*this); @@ -1537,7 +1537,7 @@ return *this; } - base_property* clone (void) const + base_property * clone (void) const { row_vector_property *p = new row_vector_property (*this); @@ -1581,7 +1581,7 @@ { } bool_property (const std::string& nm, const graphics_handle& h, - const char* val) + const char *val) : radio_property (nm, h, radio_values ("on|off"), val) { } @@ -1596,7 +1596,7 @@ return *this; } - base_property* clone (void) const { return new bool_property (*this); } + base_property * clone (void) const { return new bool_property (*this); } protected: bool do_set (const octave_value& val) @@ -1640,7 +1640,7 @@ void invalidate (void) { current_val = octave::numeric_limits<double>::NaN (); } - base_property* clone (void) const { return new handle_property (*this); } + base_property * clone (void) const { return new handle_property (*this); } void add_constraint (const std::string& type) { type_constraints.insert (type); } @@ -1673,7 +1673,7 @@ return *this; } - base_property* clone (void) const { return new any_property (*this); } + base_property * clone (void) const { return new any_property (*this); } protected: bool do_set (const octave_value& v) @@ -1716,7 +1716,7 @@ return *this; } - base_property* clone (void) const { return new children_property (*this); } + base_property * clone (void) const { return new children_property (*this); } bool remove_child (double val) { @@ -1908,7 +1908,7 @@ return *this; } - base_property* clone (void) const { return new callback_property (*this); } + base_property * clone (void) const { return new callback_property (*this); } protected: bool do_set (const octave_value& v) @@ -2265,7 +2265,7 @@ rep->count++; } - graphics_toolkit (base_graphics_toolkit* b) + graphics_toolkit (base_graphics_toolkit *b) : rep (b) { rep->count++; @@ -6525,7 +6525,7 @@ instance->do_post_callback (h, name, data); } - static void post_function (graphics_event::event_fcn fcn, void* data = 0) + static void post_function (graphics_event::event_fcn fcn, void *data = 0) { if (instance_ok ()) instance->do_post_function (fcn, data); @@ -6724,7 +6724,7 @@ void do_post_callback (const graphics_handle& h, const std::string& name, const octave_value& data); - void do_post_function (graphics_event::event_fcn fcn, void* fcn_data); + void do_post_function (graphics_event::event_fcn fcn, void *fcn_data); void do_post_set (const graphics_handle& h, const std::string& name, const octave_value& value, bool notify_toolkit = true);
--- a/libinterp/corefcn/ls-hdf5.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/ls-hdf5.cc Thu Apr 27 15:18:20 2017 -0700 @@ -703,7 +703,7 @@ } octave_hdf5_err -hdf5_h5g_iterate (octave_hdf5_id loc_id, const char* name, int *idx, +hdf5_h5g_iterate (octave_hdf5_id loc_id, const char *name, int *idx, void *operator_data) { #if defined (HAVE_HDF5)
--- a/libinterp/corefcn/ls-hdf5.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/ls-hdf5.h Thu Apr 27 15:18:20 2017 -0700 @@ -126,7 +126,7 @@ hdf5_read_next_data (octave_hdf5_id group_id, const char *name, void *dv); extern OCTINTERP_API octave_hdf5_err -hdf5_h5g_iterate (octave_hdf5_id loc_id, const char* name, int *idx, +hdf5_h5g_iterate (octave_hdf5_id loc_id, const char *name, int *idx, void *operator_data); extern OCTINTERP_API bool
--- a/libinterp/corefcn/ls-mat5.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/ls-mat5.cc Thu Apr 27 15:18:20 2017 -0700 @@ -1196,7 +1196,7 @@ } else { - octave_class* cls + octave_class *cls = new octave_class (m, classname, std::list<std::string> ()); @@ -1882,7 +1882,7 @@ } int -save_mat5_array_length (const double* val, octave_idx_type nel, +save_mat5_array_length (const double *val, octave_idx_type nel, bool save_as_floats) { if (nel > 0) @@ -2012,7 +2012,7 @@ } int -save_mat5_array_length (const Complex* val, octave_idx_type nel, +save_mat5_array_length (const Complex *val, octave_idx_type nel, bool save_as_floats) { int ret; @@ -2033,7 +2033,7 @@ } int -save_mat5_array_length (const FloatComplex* val, octave_idx_type nel, +save_mat5_array_length (const FloatComplex *val, octave_idx_type nel, bool save_as_floats) { int ret;
--- a/libinterp/corefcn/mex.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/mex.h Thu Apr 27 15:18:20 2017 -0700 @@ -69,9 +69,9 @@ #endif #if defined (V4) -void mexFunction (int nlhs, mxArray* plhs[], int nrhs, mxArray *prhs[]); +void mexFunction (int nlhs, mxArray *plhs[], int nrhs, mxArray *prhs[]); #else -void mexFunction (int nlhs, mxArray* plhs[], int nrhs, const mxArray *prhs[]); +void mexFunction (int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]); #endif /* V4 floating point routines renamed in V5. */
--- a/libinterp/corefcn/oct-map.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/oct-map.cc Thu Apr 27 15:18:20 2017 -0700 @@ -122,7 +122,7 @@ bool octave_fields::equal_up_to_order (const octave_fields& other, - octave_idx_type* perm) const + octave_idx_type *perm) const { bool retval = true;
--- a/libinterp/corefcn/oct-map.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/oct-map.h Thu Apr 27 15:18:20 2017 -0700 @@ -130,7 +130,7 @@ // returns a permutation needed to bring the fields of *other* // into the order of *this*. bool equal_up_to_order (const octave_fields& other, - octave_idx_type* perm) const; + octave_idx_type *perm) const; bool equal_up_to_order (const octave_fields& other, Array<octave_idx_type>& perm) const;
--- a/libinterp/corefcn/oct-stream.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/oct-stream.cc Thu Apr 27 15:18:20 2017 -0700 @@ -4170,7 +4170,7 @@ template <typename T> std::istream& octave_scan_1 (std::istream& is, const scanf_format_elt& fmt, - T* valptr) + T *valptr) { T value = T (); @@ -4257,7 +4257,7 @@ template <typename T> std::istream& - octave_scan (std::istream& is, const scanf_format_elt& fmt, T* valptr) + octave_scan (std::istream& is, const scanf_format_elt& fmt, T *valptr) { if (fmt.width) { @@ -4284,14 +4284,14 @@ template <> std::istream& octave_scan<> (std::istream& is, const scanf_format_elt& /* fmt */, - char* valptr) + char *valptr) { return is >> valptr; } template <> std::istream& - octave_scan<> (std::istream& is, const scanf_format_elt& fmt, double* valptr) + octave_scan<> (std::istream& is, const scanf_format_elt& fmt, double *valptr) { double& ref = *valptr;
--- a/libinterp/corefcn/octave-link.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/octave-link.cc Thu Apr 27 15:18:20 2017 -0700 @@ -76,7 +76,7 @@ // responsibility of the caller to delete obj. void -octave_link::connect_link (octave_link* obj) +octave_link::connect_link (octave_link *obj) { if (obj && instance) error ("octave_link is already linked!");
--- a/libinterp/corefcn/profiler.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/profiler.cc Thu Apr 27 15:18:20 2017 -0700 @@ -53,7 +53,7 @@ return retval; } -profile_data_accumulator::tree_node::tree_node (tree_node* p, octave_idx_type f) +profile_data_accumulator::tree_node::tree_node (tree_node *p, octave_idx_type f) : parent (p), fcn_id (f), children (), time (0.0), calls (0) { } @@ -66,7 +66,7 @@ profile_data_accumulator::tree_node* profile_data_accumulator::tree_node::enter (octave_idx_type fcn) { - tree_node* retval; + tree_node *retval; child_map::iterator pos = children.find (fcn); if (pos == children.end ()) @@ -111,7 +111,7 @@ } if (! entry.recursive) - for (const tree_node* i = parent; i; i = i->parent) + for (const tree_node *i = parent; i; i = i->parent) if (i->fcn_id == fcn_id) { entry.recursive = true; @@ -125,7 +125,7 @@ } octave_value -profile_data_accumulator::tree_node::get_hierarchical (double* total) const +profile_data_accumulator::tree_node::get_hierarchical (double *total) const { // Note that we don't generate the entry just for this node, but // rather a struct-array with entries for all children. This way, the
--- a/libinterp/corefcn/profiler.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/profiler.h Thu Apr 27 15:18:20 2017 -0700 @@ -146,23 +146,23 @@ // Enter a child function. It is created in the list of children if it // wasn't already there. The now-active child node is returned. - tree_node* enter (octave_idx_type); + tree_node *enter (octave_idx_type); // Exit function. As a sanity-check, it is verified that the currently // active function actually is the one handed in here. Returned is the // then-active node, which is our parent. - tree_node* exit (octave_idx_type); + tree_node *exit (octave_idx_type); void build_flat (flat_profile&) const; // Get the hierarchical profile for this node and its children. If total // is set, accumulate total time of the subtree in that variable as // additional return value. - octave_value get_hierarchical (double* total = 0) const; + octave_value get_hierarchical (double *total = 0) const; private: - tree_node* parent; + tree_node *parent; octave_idx_type fcn_id; typedef std::map<octave_idx_type, tree_node*> child_map; @@ -186,8 +186,8 @@ bool enabled; - tree_node* call_tree; - tree_node* active_fcn; + tree_node *call_tree; + tree_node *active_fcn; // Store last timestamp we had, when the currently active function was called. double last_time;
--- a/libinterp/corefcn/psi.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/psi.cc Thu Apr 27 15:18:20 2017 -0700 @@ -87,8 +87,8 @@ const A ## NDArray z = oct_z.M ## array_value (); \ A ## NDArray psi_z (z.dims ()); \ \ - const E* zv = z.data (); \ - E* psi_zv = psi_z.fortran_vec (); \ + const E *zv = z.data (); \ + E *psi_zv = psi_z.fortran_vec (); \ const octave_idx_type n = z.numel (); \ for (octave_idx_type i = 0; i < n; i++) \ *psi_zv++ = octave::math::psi (*zv++); \ @@ -124,8 +124,8 @@ const A ## NDArray z = oct_z.M ## array_value (); \ A ## NDArray psi_z (z.dims ()); \ \ - const E* zv = z.data (); \ - E* psi_zv = psi_z.fortran_vec (); \ + const E *zv = z.data (); \ + E *psi_zv = psi_z.fortran_vec (); \ const octave_idx_type n = z.numel (); \ for (octave_idx_type i = 0; i < n; i++) \ { \
--- a/libinterp/corefcn/qz.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/qz.cc Thu Apr 27 15:18:20 2017 -0700 @@ -66,9 +66,9 @@ // Only processes Z, not Q. F77_RET_T F77_FUNC (dsubsp, DSUBSP) (const F77_INT& NMAX, const F77_INT& N, - F77_DBLE* A, F77_DBLE* B, F77_DBLE* Z, + F77_DBLE *A, F77_DBLE *B, F77_DBLE *Z, sort_function, const F77_DBLE& EPS, - F77_INT& NDIM, F77_INT& FAIL, F77_INT* IND); + F77_INT& NDIM, F77_INT& FAIL, F77_INT *IND); } // fcrhp, fin, fout, folhp:
--- a/libinterp/corefcn/sighandlers.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/sighandlers.cc Thu Apr 27 15:18:20 2017 -0700 @@ -332,7 +332,7 @@ static void cleanup_instance (void) { delete instance; instance = 0; } - static base_interrupt_manager* instance; + static base_interrupt_manager *instance; }; base_interrupt_manager *interrupt_manager::instance = 0;
--- a/libinterp/corefcn/symtab.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/symtab.h Thu Apr 27 15:18:20 2017 -0700 @@ -465,7 +465,7 @@ scope_id decl_scope; - octave_user_function* curr_fcn; + octave_user_function *curr_fcn; std::string name;
--- a/libinterp/corefcn/txt-eng.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/txt-eng.h Thu Apr 27 15:18:20 2017 -0700 @@ -114,7 +114,7 @@ text_element_list (void) : text_element (), octave::base_list<text_element*> () { } - text_element_list (text_element* e) + text_element_list (text_element *e) : text_element (), octave::base_list<text_element*> () { push_back (e); } @@ -136,7 +136,7 @@ text_element_subscript : public text_element { public: - text_element_subscript (text_element* e) + text_element_subscript (text_element *e) : text_element (), elem (e) { } text_element_subscript (char c) @@ -148,10 +148,10 @@ void accept (text_processor& p); - text_element* get_element (void) { return elem; } + text_element * get_element (void) { return elem; } private: - text_element* elem; + text_element *elem; private: text_element_subscript (void); @@ -162,7 +162,7 @@ text_element_superscript : public text_element { public: - text_element_superscript (text_element* e) + text_element_superscript (text_element *e) : text_element (), elem (e) { } text_element_superscript (char c) @@ -174,10 +174,10 @@ void accept (text_processor& p); - text_element* get_element (void) { return elem; } + text_element * get_element (void) { return elem; } private: - text_element* elem; + text_element *elem; private: text_element_superscript (void); @@ -188,10 +188,10 @@ text_element_combined : public text_element_list { public: - text_element_combined (text_element* e) + text_element_combined (text_element *e) : text_element_list (e) { } - text_element_combined (text_element* e1, text_element* e2) + text_element_combined (text_element *e1, text_element *e2) : text_element_list(e1) { push_back (e2); } @@ -378,11 +378,11 @@ virtual ~text_parser (void) = default; - virtual text_element* parse (const std::string& s) = 0; + virtual text_element * parse (const std::string& s) = 0; public: - static text_element* parse (const std::string& s, - const caseless_str& interpreter); + static text_element * parse (const std::string& s, + const caseless_str& interpreter); }; class @@ -399,7 +399,7 @@ // preferable to having to know when and where to delete the object it // creates... - text_element* parse (const std::string& s) + text_element * parse (const std::string& s) { return new text_element_string (s); } @@ -417,13 +417,13 @@ ~text_parser_tex (void) { destroy_lexer (); } - text_element* parse (const std::string& s); + text_element * parse (const std::string& s); - void* get_scanner (void) { return scanner; } + void * get_scanner (void) { return scanner; } - void set_parse_result (text_element* e) { result = e; } + void set_parse_result (text_element *e) { result = e; } - text_element* get_parse_result (void) { return result; } + text_element * get_parse_result (void) { return result; } private: bool init_lexer (const std::string& s); @@ -431,11 +431,11 @@ void destroy_lexer (void); private: - void* scanner; + void *scanner; - void* buffer_state; + void *buffer_state; - text_element* result; + text_element *result; }; inline text_element*
--- a/libinterp/corefcn/zfstream.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/zfstream.cc Thu Apr 27 15:18:20 2017 -0700 @@ -140,7 +140,7 @@ if (! this->is_open ()) return 0; // Assume success - gzfilebuf* retval = this; + gzfilebuf *retval = this; // Attempt to sync and close gzipped file if (this->sync () == -1) retval = 0; @@ -158,7 +158,7 @@ // Convert int open mode to mode string bool -gzfilebuf::open_mode (std::ios_base::openmode mode, char* c_mode) const +gzfilebuf::open_mode (std::ios_base::openmode mode, char *c_mode) const { // FIXME: do we need testb? // bool testb = mode & std::ios_base::binary; @@ -347,7 +347,7 @@ // Assign new buffer std::streambuf* -gzfilebuf::setbuf (char_type* p, std::streamsize n) +gzfilebuf::setbuf (char_type *p, std::streamsize n) { // First make sure stuff is sync'ed, for safety if (this->sync () == -1) @@ -520,7 +520,7 @@ { this->init (&sb); } // Initialize stream buffer and open file -gzifstream::gzifstream (const char* name, std::ios_base::openmode mode) +gzifstream::gzifstream (const char *name, std::ios_base::openmode mode) : std::istream (0), sb () { this->init (&sb); @@ -537,7 +537,7 @@ // Open file and go into fail() state if unsuccessful void -gzifstream::open (const char* name, std::ios_base::openmode mode) +gzifstream::open (const char *name, std::ios_base::openmode mode) { if (! sb.open (name, mode | std::ios_base::in)) this->setstate (std::ios_base::failbit); @@ -569,7 +569,7 @@ { this->init (&sb); } // Initialize stream buffer and open file -gzofstream::gzofstream (const char* name, std::ios_base::openmode mode) +gzofstream::gzofstream (const char *name, std::ios_base::openmode mode) : std::ostream (0), sb () { this->init (&sb); @@ -586,7 +586,7 @@ // Open file and go into fail() state if unsuccessful void -gzofstream::open (const char* name, std::ios_base::openmode mode) +gzofstream::open (const char *name, std::ios_base::openmode mode) { if (! sb.open (name, mode | std::ios_base::out)) this->setstate (std::ios_base::failbit);
--- a/libinterp/corefcn/zfstream.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/corefcn/zfstream.h Thu Apr 27 15:18:20 2017 -0700 @@ -93,7 +93,7 @@ * @return @c this on success, NULL on failure. */ gzfilebuf* - open (const char* name, + open (const char *name, std::ios_base::openmode mode); /** @@ -120,7 +120,7 @@ */ bool open_mode (std::ios_base::openmode mode, - char* c_mode) const; + char *c_mode) const; /** * @brief Number of characters available in stream buffer. @@ -163,7 +163,7 @@ * Call setbuf(0,0) to enable unbuffered output. */ virtual std::streambuf* - setbuf (char_type* p, + setbuf (char_type *p, std::streamsize n); /** @@ -250,7 +250,7 @@ * For simplicity this remains allocated on the free store for the * entire life span of the gzfilebuf object, unless replaced by setbuf. */ - char_type* buffer; + char_type *buffer; /** * @brief Stream buffer size. @@ -287,7 +287,7 @@ * @param mode Open mode flags (forced to contain ios::in). */ explicit - gzifstream (const char* name, + gzifstream (const char *name, std::ios_base::openmode mode = std::ios_base::in); /** @@ -326,7 +326,7 @@ * convenience. */ void - open (const char* name, + open (const char *name, std::ios_base::openmode mode = std::ios_base::in); /** @@ -374,7 +374,7 @@ * @param mode Open mode flags (forced to contain ios::out). */ explicit - gzofstream (const char* name, + gzofstream (const char *name, std::ios_base::openmode mode = std::ios_base::out); /** @@ -413,7 +413,7 @@ * convenience. */ void - open (const char* name, + open (const char *name, std::ios_base::openmode mode = std::ios_base::out); /**
--- a/libinterp/dldfcn/__init_fltk__.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/dldfcn/__init_fltk__.cc Thu Apr 27 15:18:20 2017 -0700 @@ -103,7 +103,7 @@ #define FLTK_GRAPHICS_TOOLKIT_NAME "fltk" -const char* help_text = "\ +const char *help_text = "\ Keyboard Shortcuts\n\ a - autoscale\n\ p - pan/zoom\n\ @@ -299,7 +299,7 @@ } }; -void script_cb (Fl_Widget*, void* data) +void script_cb (Fl_Widget *, void *data) { static_cast<uimenu::properties *> (data)->execute_callback (); } @@ -452,7 +452,7 @@ std::string fltk_label = uimenup.get___fltk_label__ (); if (! fltk_label.empty ()) { - Fl_Menu_Item* item = + Fl_Menu_Item *item = const_cast<Fl_Menu_Item *> (m_menubar->find_item (fltk_label.c_str ())); if (item) { @@ -471,7 +471,7 @@ std::string fltk_label = uimenup.get___fltk_label__ (); if (! fltk_label.empty ()) { - Fl_Menu_Item* item + Fl_Menu_Item *item = const_cast<Fl_Menu_Item *> (m_menubar->find_item (fltk_label.c_str ())); if (item) { @@ -489,7 +489,7 @@ std::string fltk_label = uimenup.get___fltk_label__ (); if (! fltk_label.empty ()) { - Fl_Menu_Item* item + Fl_Menu_Item *item = const_cast<Fl_Menu_Item *> (m_menubar->find_item (fltk_label.c_str ())); if (item) { @@ -506,7 +506,7 @@ std::string fltk_label = uimenup.get___fltk_label__ (); if (! fltk_label.empty ()) { - Fl_Menu_Item* item + Fl_Menu_Item *item = const_cast<Fl_Menu_Item *> (m_menubar->find_item (fltk_label.c_str ())); if (item) { @@ -534,7 +534,7 @@ for (idx = curr_idx - 1; idx >= 0; idx--) { - Fl_Menu_Item* item + Fl_Menu_Item *item = const_cast<Fl_Menu_Item *> (&m_menubar->menu () [idx]); itemflags = item->flags; if (item->label ()) @@ -559,7 +559,7 @@ std::string fltk_label = uimenup.get___fltk_label__ (); if (! fltk_label.empty ()) { - Fl_Menu_Item* item + Fl_Menu_Item *item = const_cast<Fl_Menu_Item *> (m_menubar->find_item (fltk_label.c_str ())); if (item) { @@ -587,7 +587,7 @@ bool item_added = false; do { - const Fl_Menu_Item* item + const Fl_Menu_Item *item = m_menubar->find_item (fltk_label.c_str ()); if (item) @@ -759,7 +759,7 @@ private: - Fl_Menu_Bar* m_menubar; + Fl_Menu_Bar *m_menubar; }; #if defined (HAVE_X_WINDOWS) @@ -1075,18 +1075,18 @@ // Menu height static const int m_menu_h = 25; - fltk_uimenu* m_uimenu; - - OpenGL_fltk* m_canvas; - - Fl_Button* m_autoscale; - Fl_Button* m_togglegrid; - Fl_Button* m_panzoom; - Fl_Button* m_rotate; - Fl_Button* m_help; - Fl_Output* m_status; - - Fl_Box* m_resize_dummy; + fltk_uimenu *m_uimenu; + + OpenGL_fltk *m_canvas; + + Fl_Button *m_autoscale; + Fl_Button *m_togglegrid; + Fl_Button *m_panzoom; + Fl_Button *m_rotate; + Fl_Button *m_help; + Fl_Output *m_status; + + Fl_Box *m_resize_dummy; graphics_object m_ax_obj; @@ -1094,7 +1094,7 @@ int m_pos_y; // Window callback. - static void window_close (Fl_Widget*, void* data) + static void window_close (Fl_Widget *, void *data) { octave_value_list args; args(0) = static_cast<plot_window *> (data)->number (); @@ -1102,12 +1102,12 @@ } // Button callbacks. - static void button_callback (Fl_Widget* ww, void* data) + static void button_callback (Fl_Widget *ww, void *data) { static_cast<plot_window *> (data)->button_press (ww, data); } - void button_press (Fl_Widget* widg, void*) + void button_press (Fl_Widget *widg, void *) { if (widg == m_autoscale) axis_auto (); @@ -1305,7 +1305,7 @@ return 0; } - octave_scalar_map format_key_event (int e_key, const char* e_text, int e_state) + octave_scalar_map format_key_event (int e_key, const char *e_text, int e_state) { octave_scalar_map evt;
--- a/libinterp/dldfcn/audiodevinfo.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/dldfcn/audiodevinfo.cc Thu Apr 27 15:18:20 2017 -0700 @@ -1830,7 +1830,7 @@ int nargin = args.length (); - audiorecorder* recorder = new audiorecorder (); + audiorecorder *recorder = new audiorecorder (); if (nargin > 0) { @@ -2223,7 +2223,7 @@ "audio playback and recording through PortAudio"); #else - audioplayer* recorder = new audioplayer (); + audioplayer *recorder = new audioplayer (); if (! recorder) error ("__player_audioplayer__: Couldn't instantiate new audioplayer");
--- a/libinterp/dldfcn/gzip.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/dldfcn/gzip.cc Thu Apr 27 15:18:20 2017 -0700 @@ -122,7 +122,7 @@ m_fp = nullptr; } - std::FILE* m_fp; + std::FILE *m_fp; }; #if defined (HAVE_BZ2) @@ -131,7 +131,7 @@ { public: - static const constexpr char* extension = ".bz2"; + static const constexpr char *extension = ".bz2"; static void zip (const std::string& source_path, const std::string& dest_path) @@ -203,7 +203,7 @@ int m_status; CFile m_source; CFile m_dest; - BZFILE* m_bz; + BZFILE *m_bz; }; }; @@ -242,7 +242,7 @@ { public: - static const constexpr char* extension = ".gz"; + static const constexpr char *extension = ".gz"; static void zip (const std::string& source_path, const std::string& dest_path) @@ -260,7 +260,7 @@ public: // Bytef is a typedef for unsigned char - unsigned char* p; + unsigned char *p; uchar_array (void) = delete; @@ -463,7 +463,7 @@ CFile m_source; CFile m_dest; gzip_header m_header; - z_stream* m_strm; + z_stream *m_strm; }; };
--- a/libinterp/octave-value/ov-class.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/octave-value/ov-class.cc Thu Apr 27 15:18:20 2017 -0700 @@ -864,7 +864,7 @@ octave_base_value * octave_class::find_parent_class (const std::string& parent_class_name) { - octave_base_value* retval = 0; + octave_base_value *retval = 0; if (parent_class_name == class_name ()) retval = this; @@ -893,7 +893,7 @@ octave_base_value * octave_class::unique_parent_class (const std::string& parent_class_name) { - octave_base_value* retval = 0; + octave_base_value *retval = 0; if (parent_class_name == class_name ()) retval = this;
--- a/libinterp/octave-value/ov-classdef.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/octave-value/ov-classdef.cc Thu Apr 27 15:18:20 2017 -0700 @@ -268,7 +268,7 @@ { cdef_class cls; - octave_function* fcn = octave::call_stack::current (); + octave_function *fcn = octave::call_stack::current (); in_constructor = false; @@ -427,15 +427,15 @@ { octave::tree_evaluator *tw = octave::current_evaluator; - octave_function* stack_fcn = octave::call_stack::current (); - - octave_function* method_fcn = ov.function_value (true); + octave_function *stack_fcn = octave::call_stack::current (); + + octave_function *method_fcn = ov.function_value (true); // Does the top of the call stack match our target function? if (stack_fcn && stack_fcn == method_fcn) { - octave_user_function* uf = method_fcn->user_function_value (true); + octave_user_function *uf = method_fcn->user_function_value (true); // We can only check the context object for user-function (not builtin), // where we have access to the parameters (arguments and return values). @@ -449,7 +449,7 @@ // methods, it's the first argument of the function; for ctors, it // is the first return value. - octave::tree_parameter_list* pl = uf->is_classdef_constructor () + octave::tree_parameter_list *pl = uf->is_classdef_constructor () ? uf->return_list () : uf->parameter_list (); if (pl && pl->size () > 0) @@ -1004,7 +1004,7 @@ ~octave_classdef_meta (void) { object.meta_release (); } - octave_function* function_value (bool = false) { return this; } + octave_function * function_value (bool = false) { return this; } octave_value_list subsref (const std::string& type, @@ -1072,7 +1072,7 @@ ~octave_classdef_superclass_ref (void) = default; - octave_function* function_value (bool = false) { return this; } + octave_function * function_value (bool = false) { return this; } octave_value_list subsref (const std::string& type, @@ -2514,7 +2514,7 @@ static octave_value compute_attribute_value (octave::tree_evaluator *tw, - octave::tree_classdef_attribute* t) + octave::tree_classdef_attribute *t) { octave::tree_expression *expr = t->expression (); @@ -2540,7 +2540,7 @@ template <typename T> static std::string -attribute_value_to_string (T* t, octave_value v) +attribute_value_to_string (T *t, octave_value v) { if (v.is_string ()) return v.string_value (); @@ -2552,7 +2552,7 @@ cdef_class cdef_class::make_meta_class (octave::tree_evaluator *tw, - octave::tree_classdef* t, bool is_at_folder) + octave::tree_classdef *t, bool is_at_folder) { cdef_class retval; std::string class_name, full_class_name; @@ -2619,7 +2619,7 @@ } } - octave::tree_classdef_body* b = t->body (); + octave::tree_classdef_body *b = t->body (); if (b) { @@ -2847,7 +2847,7 @@ octave_function* cdef_class::get_method_function (const std::string& /* nm */) { - octave_classdef_meta* p = new octave_classdef_meta (*this); + octave_classdef_meta *p = new octave_classdef_meta (*this); return p; } @@ -3306,7 +3306,7 @@ if (o.is_function ()) { - octave_function* fcn = o.function_value (); + octave_function *fcn = o.function_value (); // NOTE: the case where the package query is the last // part of this subsref index is handled in the parse @@ -3533,7 +3533,7 @@ //---------------------------------------------------------------------------- -cdef_manager* cdef_manager::instance = 0; +cdef_manager *cdef_manager::instance = 0; void cdef_manager::create_instance (void) @@ -3660,7 +3660,7 @@ octave_function* cdef_manager::do_find_package_symbol (const std::string& pack_name) { - octave_function* retval = 0; + octave_function *retval = 0; cdef_package pack = find_package (pack_name, false);
--- a/libinterp/octave-value/ov-classdef.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/octave-value/ov-classdef.h Thu Apr 27 15:18:20 2017 -0700 @@ -65,22 +65,22 @@ virtual void set_class (const cdef_class&) { err_invalid_object ("set_class"); } - virtual cdef_object_rep* clone (void) const + virtual cdef_object_rep * clone (void) const { err_invalid_object ("clone"); } - virtual cdef_object_rep* empty_clone (void) const + virtual cdef_object_rep * empty_clone (void) const { err_invalid_object ("empty_clone"); } - virtual cdef_object_rep* copy (void) const + virtual cdef_object_rep * copy (void) const { err_invalid_object ("copy"); } - virtual cdef_object_rep* make_array (void) const + virtual cdef_object_rep * make_array (void) const { err_invalid_object ("make_array"); } @@ -273,7 +273,7 @@ octave_map map_value (void) const; - const cdef_object_rep* get_rep (void) const { return rep; } + const cdef_object_rep * get_rep (void) const { return rep; } bool ok (void) const { return rep->is_valid (); } @@ -296,7 +296,7 @@ bool is (const cdef_object& obj) const { return rep == obj.rep; } protected: - cdef_object_rep* get_rep (void) { return rep; } + cdef_object_rep * get_rep (void) { return rep; } void make_unique (int ignore_copies) { @@ -324,10 +324,10 @@ void set_class (const cdef_class& cls); - cdef_object_rep* empty_clone (void) const + cdef_object_rep * empty_clone (void) const { return new cdef_object_base (*this); } - cdef_object_rep* make_array (void) const; + cdef_object_rep * make_array (void) const; protected: // Restricted copying! @@ -360,7 +360,7 @@ cdef_object_array (const Array<cdef_object>& a) : cdef_object_base (), array (a) { } - cdef_object_rep* clone (void) const + cdef_object_rep * clone (void) const { return new cdef_object_array (*this); } dim_vector dims (void) const { return array.dims (); } @@ -466,14 +466,14 @@ ~handle_cdef_object (void); - cdef_object_rep* clone (void) const + cdef_object_rep * clone (void) const { handle_cdef_object *obj = const_cast<handle_cdef_object *> (this); obj->refcount++; return obj; } - cdef_object_rep* copy (void) const + cdef_object_rep * copy (void) const { return new handle_cdef_object (*this); } bool is_valid (void) const { return true; } @@ -499,10 +499,10 @@ ~value_cdef_object (void); - cdef_object_rep* clone (void) const + cdef_object_rep * clone (void) const { return new value_cdef_object (*this); } - cdef_object_rep* copy (void) const { return clone (); } + cdef_object_rep * copy (void) const { return clone (); } bool is_valid (void) const { return true; } @@ -526,7 +526,7 @@ ~cdef_meta_object_rep (void) = default; - cdef_object_rep* copy (void) const + cdef_object_rep * copy (void) const { return new cdef_meta_object_rep (*this); } bool is_meta_object (void) const { return true; } @@ -600,10 +600,10 @@ { return get_rep ()->meta_is_postfix_index_handled (type); } private: - cdef_meta_object_rep* get_rep (void) + cdef_meta_object_rep * get_rep (void) { return dynamic_cast<cdef_meta_object_rep *> (cdef_object::get_rep ()); } - const cdef_meta_object_rep* get_rep (void) const + const cdef_meta_object_rep * get_rep (void) const { return dynamic_cast<const cdef_meta_object_rep *> (cdef_object::get_rep ()); } }; @@ -624,7 +624,7 @@ cdef_class_rep (octave::tree_evaluator *tw, const std::list<cdef_class>& superclasses); - cdef_object_rep* copy (void) const { return new cdef_class_rep (*this); } + cdef_object_rep * copy (void) const { return new cdef_class_rep (*this); } bool is_class (void) const { return true; } @@ -842,12 +842,12 @@ { get_rep ()->delete_object (obj); } static cdef_class make_meta_class (octave::tree_evaluator *tw, - octave::tree_classdef* t, + octave::tree_classdef *t, bool is_at_folder = false); - octave_function* get_method_function (const std::string& nm); + octave_function * get_method_function (const std::string& nm); - octave_function* get_constructor_function (void) + octave_function * get_constructor_function (void) { return get_method_function (get_name ()); } octave_value construct (const octave_value_list& args) @@ -890,10 +890,10 @@ }; private: - cdef_class_rep* get_rep (void) + cdef_class_rep * get_rep (void) { return dynamic_cast<cdef_class_rep *> (cdef_object::get_rep ()); } - const cdef_class_rep* get_rep (void) const + const cdef_class_rep * get_rep (void) const { return dynamic_cast<const cdef_class_rep *> (cdef_object::get_rep ()); } octave::tree_evaluator * evaluator (void) const @@ -940,7 +940,7 @@ cdef_property_rep (void) : cdef_meta_object_rep () { } - cdef_object_rep* copy (void) const { return new cdef_property_rep (*this); } + cdef_object_rep * copy (void) const { return new cdef_property_rep (*this); } bool is_property (void) const { return true; } @@ -1028,10 +1028,10 @@ bool is_constant (void) const { return get_rep ()->is_constant (); } private: - cdef_property_rep* get_rep (void) + cdef_property_rep * get_rep (void) { return dynamic_cast<cdef_property_rep *> (cdef_object::get_rep ()); } - const cdef_property_rep* get_rep (void) const + const cdef_property_rep * get_rep (void) const { return dynamic_cast<const cdef_property_rep *> (cdef_object::get_rep ()); } }; @@ -1050,7 +1050,7 @@ : cdef_meta_object_rep (), function (), dispatch_type () { } - cdef_object_rep* copy (void) const { return new cdef_method_rep(*this); } + cdef_object_rep * copy (void) const { return new cdef_method_rep(*this); } bool is_method (void) const { return true; } @@ -1171,10 +1171,10 @@ { get_rep ()->mark_as_external (dtype); } private: - cdef_method_rep* get_rep (void) + cdef_method_rep * get_rep (void) { return dynamic_cast<cdef_method_rep *> (cdef_object::get_rep ()); } - const cdef_method_rep* get_rep (void) const + const cdef_method_rep * get_rep (void) const { return dynamic_cast<const cdef_method_rep *> (cdef_object::get_rep ()); } }; @@ -1236,7 +1236,7 @@ inline cdef_object_rep* cdef_object_base::make_array (void) const { - cdef_object_rep* r = new cdef_object_array (); + cdef_object_rep *r = new cdef_object_array (); r->set_class (get_class ()); @@ -1267,7 +1267,7 @@ ~cdef_package_rep (void) = default; - cdef_object_rep* copy (void) const { return new cdef_package_rep (*this); } + cdef_object_rep * copy (void) const { return new cdef_package_rep (*this); } bool is_package (void) const { return true; } @@ -1397,10 +1397,10 @@ static const cdef_package& meta (void) { return _meta; } private: - cdef_package_rep* get_rep (void) + cdef_package_rep * get_rep (void) { return dynamic_cast<cdef_package_rep *> (cdef_object::get_rep ()); } - const cdef_package_rep* get_rep (void) const + const cdef_package_rep * get_rep (void) const { return dynamic_cast<const cdef_package_rep *> (cdef_object::get_rep ()); } private: @@ -1422,10 +1422,10 @@ octave_classdef (const octave_classdef& obj) : octave_base_value (obj), object (obj.object) { } - octave_base_value* clone (void) const + octave_base_value * clone (void) const { return new octave_classdef (object.clone ()); } - octave_base_value* empty_clone (void) const + octave_base_value * empty_clone (void) const { return new octave_classdef (object.empty_clone ()); } cdef_object get_object (void) const { return object; } @@ -1555,7 +1555,7 @@ return cdef_class (); } - static octave_function* find_method_symbol (const std::string& method_name, + static octave_function * find_method_symbol (const std::string& method_name, const std::string& class_name) { if (instance_ok ()) @@ -1575,7 +1575,7 @@ return cdef_package (); } - static octave_function* find_package_symbol (const std::string& pack_name) + static octave_function * find_package_symbol (const std::string& pack_name) { if (instance_ok ()) return instance->do_find_package_symbol (pack_name); @@ -1642,14 +1642,14 @@ cdef_class do_find_class (const std::string& name, bool error_if_not_found, bool load_if_not_found); - octave_function* do_find_method_symbol (const std::string& method_name, - const std::string& class_name); + octave_function * do_find_method_symbol (const std::string& method_name, + const std::string& class_name); cdef_package do_find_package (const std::string& name, bool error_if_not_found, bool load_if_not_found); - octave_function* do_find_package_symbol (const std::string& pack_name); + octave_function * do_find_package_symbol (const std::string& pack_name); void do_register_class (const cdef_class& cls) { all_classes[cls.get_name ()] = cls; }
--- a/libinterp/octave-value/ov-dld-fcn.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/octave-value/ov-dld-fcn.h Thu Apr 27 15:18:20 2017 -0700 @@ -74,10 +74,10 @@ bool is_dld_function (void) const { return true; } - static octave_dld_function* create (octave_builtin::fcn ff, - const octave::dynamic_library& shl, - const std::string& nm = "", - const std::string& ds = ""); + static octave_dld_function * create (octave_builtin::fcn ff, + const octave::dynamic_library& shl, + const std::string& nm = "", + const std::string& ds = ""); octave::dynamic_library get_shlib (void) const { return sh_lib; }
--- a/libinterp/octave-value/ov-fcn-inline.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/octave-value/ov-fcn-inline.cc Thu Apr 27 15:18:20 2017 -0700 @@ -853,7 +853,7 @@ if (args.length () != 1) print_usage (); - octave_fcn_inline* fn = args(0).fcn_inline_value (true); + octave_fcn_inline *fn = args(0).fcn_inline_value (true); if (! fn) error ("formula: FUN must be an inline function"); @@ -932,7 +932,7 @@ print_usage (); std::string old_func; - octave_fcn_inline* old = 0; + octave_fcn_inline *old = 0; bool func_is_string = true; if (args(0).is_string ())
--- a/libinterp/octave-value/ov-java.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/octave-value/ov-java.cc Thu Apr 27 15:18:20 2017 -0700 @@ -130,23 +130,23 @@ typedef java_local_ref<jthrowable> jthrowable_ref; static std::string -jstring_to_string (JNIEnv* jni_env, jstring s); +jstring_to_string (JNIEnv *jni_env, jstring s); static std::string -jstring_to_string (JNIEnv* jni_env, jobject obj); +jstring_to_string (JNIEnv *jni_env, jobject obj); static octave_value -box (JNIEnv* jni_env, void *jobj, void *jcls_arg = 0); +box (JNIEnv *jni_env, void *jobj, void *jcls_arg = 0); static octave_value -box_more (JNIEnv* jni_env, void *jobj_arg, void *jcls_arg = 0); +box_more (JNIEnv *jni_env, void *jobj_arg, void *jcls_arg = 0); static bool -unbox (JNIEnv* jni_env, const octave_value& val, jobject_ref& jobj, +unbox (JNIEnv *jni_env, const octave_value& val, jobject_ref& jobj, jclass_ref& jcls); static bool -unbox (JNIEnv* jni_env, const octave_value_list& args, +unbox (JNIEnv *jni_env, const octave_value_list& args, jobjectArray_ref& jobjs, jobjectArray_ref& jclss); extern "C"
--- a/libinterp/octave-value/ov-java.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/octave-value/ov-java.h Thu Apr 27 15:18:20 2017 -0700 @@ -51,8 +51,8 @@ std::string java_class_name (void) const { return java_classname; } - octave_base_value* clone (void) const { return new octave_java (*this); } - octave_base_value* empty_clone (void) const { return new octave_java (); } + octave_base_value * clone (void) const { return new octave_java (*this); } + octave_base_value * empty_clone (void) const { return new octave_java (); } bool is_instance_of (const std::string&) const;
--- a/libinterp/octave-value/ov.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/octave-value/ov.cc Thu Apr 27 15:18:20 2017 -0700 @@ -2989,7 +2989,7 @@ */ static void -decode_subscripts (const char* name, const octave_value& arg, +decode_subscripts (const char *name, const octave_value& arg, std::string& type_string, std::list<octave_value_list>& idx) {
--- a/libinterp/parse-tree/pt-arg-list.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/parse-tree/pt-arg-list.cc Thu Apr 27 15:18:20 2017 -0700 @@ -63,7 +63,7 @@ bool tree_argument_list::has_magic_end (void) const { - for (const tree_expression* elt : *this) + for (const tree_expression *elt : *this) { if (elt && elt->has_magic_end ()) return true; @@ -90,7 +90,7 @@ bool tree_argument_list::all_elements_are_constant (void) const { - for (const tree_expression* elt : *this) + for (const tree_expression *elt : *this) { if (! elt->is_constant ()) return false; @@ -104,7 +104,7 @@ { bool retval = true; - for (const tree_expression* elt : *this) + for (const tree_expression *elt : *this) { // There is no need for a separate check for the magic "~" because it // is represented by tree_black_hole, and that is derived from @@ -267,7 +267,7 @@ { std::list<octave_lvalue> retval; - for (tree_expression* elt : *this) + for (tree_expression *elt : *this) retval.push_back (elt->lvalue (tw)); return retval; @@ -282,7 +282,7 @@ int k = 0; - for (tree_expression* elt : *this) + for (tree_expression *elt : *this) retval(k++) = elt->str_print_code (); return retval; @@ -293,7 +293,7 @@ { std::list<std::string> retval; - for (tree_expression* elt : *this) + for (tree_expression *elt : *this) { if (elt->is_identifier ()) { @@ -322,7 +322,7 @@ new_list->list_includes_magic_end = list_includes_magic_end; new_list->simple_assign_lhs = simple_assign_lhs; - for (const tree_expression* elt : *this) + for (const tree_expression *elt : *this) new_list->append (elt ? elt->dup (scope, context) : 0); return new_list;
--- a/libinterp/parse-tree/pt-array-list.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/parse-tree/pt-array-list.cc Thu Apr 27 15:18:20 2017 -0700 @@ -44,7 +44,7 @@ bool tree_array_list::all_elements_are_constant (void) const { - for (const tree_argument_list* elt : *this) + for (const tree_argument_list *elt : *this) { octave_quit (); @@ -58,7 +58,7 @@ bool tree_array_list::has_magic_end (void) const { - for (const tree_argument_list* elt : *this) + for (const tree_argument_list *elt : *this) { octave_quit (); @@ -80,7 +80,7 @@ symbol_table::scope_id scope, symbol_table::context_id context) { - for (const tree_argument_list* elt : array_list) + for (const tree_argument_list *elt : array_list) append (elt ? elt->dup (scope, context) : 0); copy_base (*this);
--- a/libinterp/parse-tree/pt-bp.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/parse-tree/pt-bp.cc Thu Apr 27 15:18:20 2017 -0700 @@ -225,7 +225,7 @@ void tree_breakpoint::visit_if_command_list (tree_if_command_list& lst) { - for (tree_if_clause* t : lst) + for (tree_if_clause *t : lst) { if (t->line () >= line) take_action (*t); @@ -357,7 +357,7 @@ void tree_breakpoint::visit_statement_list (tree_statement_list& lst) { - for (tree_statement* elt : lst) + for (tree_statement *elt : lst) { if (elt) { @@ -378,7 +378,7 @@ void tree_breakpoint::visit_switch_case_list (tree_switch_case_list& lst) { - for (tree_switch_case* t : lst) + for (tree_switch_case *t : lst) { if (t->line () >= line) take_action (*t);
--- a/libinterp/parse-tree/pt-check.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/parse-tree/pt-check.cc Thu Apr 27 15:18:20 2017 -0700 @@ -441,7 +441,7 @@ void tree_checker::visit_statement_list (tree_statement_list& lst) { - for (tree_statement* elt : lst) + for (tree_statement *elt : lst) { if (elt) elt->accept (*this);
--- a/libinterp/parse-tree/pt-classdef.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/parse-tree/pt-classdef.h Thu Apr 27 15:18:20 2017 -0700 @@ -250,7 +250,7 @@ tree_classdef_property_list (void) { } - tree_classdef_property_list (tree_classdef_property* p) { append (p); } + tree_classdef_property_list (tree_classdef_property *p) { append (p); } tree_classdef_property_list (const octave::base_list<tree_classdef_property *>& a) : octave::base_list<tree_classdef_property *> (a) { } @@ -668,8 +668,8 @@ const std::string& package_name (void) const { return pack_name; } - octave_function* make_meta_class (tree_evaluator *tw, - bool is_at_folder = false); + octave_function * make_meta_class (tree_evaluator *tw, + bool is_at_folder = false); tree_classdef * dup (symbol_table::scope_id scope, symbol_table::context_id context) const;
--- a/libinterp/parse-tree/pt-decl.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/parse-tree/pt-decl.cc Thu Apr 27 15:18:20 2017 -0700 @@ -63,7 +63,7 @@ { tree_decl_init_list *new_dil = new tree_decl_init_list (); - for (const tree_decl_elt* elt : *this) + for (const tree_decl_elt *elt : *this) new_dil->append (elt ? elt->dup (scope, context) : 0); return new_dil;
--- a/libinterp/parse-tree/pt-eval.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/parse-tree/pt-eval.cc Thu Apr 27 15:18:20 2017 -0700 @@ -432,7 +432,7 @@ octave_idx_type k = 0; - for (tree_decl_elt* elt : *param_list) + for (tree_decl_elt *elt : *param_list) { if (++count > nargout) break; @@ -479,7 +479,7 @@ { int i = -1; - for (tree_decl_elt* elt : *param_list) + for (tree_decl_elt *elt : *param_list) { i++; @@ -503,7 +503,7 @@ void tree_evaluator::undefine_parameter_list (tree_parameter_list *param_list) { - for (tree_decl_elt* elt : *param_list) + for (tree_decl_elt *elt : *param_list) { octave_lvalue ref = elt->lvalue (this); @@ -527,7 +527,7 @@ int i = 0; - for (tree_decl_elt* elt : *param_list) + for (tree_decl_elt *elt : *param_list) { if (elt->is_defined ()) retval(i++) = evaluate (elt); @@ -543,7 +543,7 @@ int i = 0; - for (tree_decl_elt* elt : *param_list) + for (tree_decl_elt *elt : *param_list) retval(i++) = evaluate (elt); for (octave_idx_type j = 0; j < vlen; j++) @@ -675,7 +675,7 @@ // to tell tree_evaluator::visit_decl_init_list that we are // evaluating a global init list. - for (tree_decl_elt* elt : *init_list) + for (tree_decl_elt *elt : *init_list) do_global_init (*elt); } } @@ -694,7 +694,7 @@ // to tell tree_evaluator::visit_decl_init_list that we are // evaluating a static init list. - for (tree_decl_elt* elt : *init_list) + for (tree_decl_elt *elt : *init_list) do_static_init (*elt); } } @@ -1043,7 +1043,7 @@ void tree_evaluator::visit_if_command_list (tree_if_command_list& lst) { - for (tree_if_clause* tic : lst) + for (tree_if_clause *tic : lst) { tree_expression *expr = tic->condition (); @@ -1524,7 +1524,7 @@ octave_idx_type i = 0; - for (tree_argument_list* elt : expr) + for (tree_argument_list *elt : expr) { octave_value_list row = elt->convert_to_const_vector (this); @@ -2123,7 +2123,7 @@ if (lst) { - for (tree_switch_case* t : *lst) + for (tree_switch_case *t : *lst) { if (t->is_default_case () || switch_case_label_matches (t, val)) {
--- a/libinterp/parse-tree/pt-idx.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/parse-tree/pt-idx.cc Thu Apr 27 15:18:20 2017 -0700 @@ -128,7 +128,7 @@ bool tree_index_expression::has_magic_end (void) const { - for (const tree_argument_list* elt : args) + for (const tree_argument_list *elt : args) { if (elt && elt->has_magic_end ()) return true; @@ -396,7 +396,7 @@ std::list<tree_argument_list *> new_args; - for (const tree_argument_list* elt : args) + for (const tree_argument_list *elt : args) new_args.push_back (elt ? elt->dup (scope, context) : 0); new_idx_expr->args = new_args; @@ -407,7 +407,7 @@ std::list<tree_expression *> new_dyn_field; - for (const tree_expression* elt : dyn_field) + for (const tree_expression *elt : dyn_field) new_dyn_field.push_back (elt ? elt->dup (scope, context) : 0); new_idx_expr->dyn_field = new_dyn_field;
--- a/libinterp/parse-tree/pt-idx.h Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/parse-tree/pt-idx.h Thu Apr 27 15:18:20 2017 -0700 @@ -55,7 +55,7 @@ tree_index_expression (tree_expression *e, const std::string& n, int l = -1, int c = -1); - tree_index_expression (tree_expression *e, tree_expression* df, + tree_index_expression (tree_expression *e, tree_expression *df, int l = -1, int c = -1); // No copying!
--- a/libinterp/parse-tree/pt-jit.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/parse-tree/pt-jit.cc Thu Apr 27 15:18:20 2017 -0700 @@ -2297,7 +2297,7 @@ llvm::verifyFunction (*llvm_function); } - llvm::ExecutionEngine* engine = tjit.get_engine (); + llvm::ExecutionEngine *engine = tjit.get_engine (); void *void_fn = engine->getPointerToFunction (llvm_function); function = reinterpret_cast<jited_function> (void_fn); }
--- a/libinterp/parse-tree/pt-misc.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/parse-tree/pt-misc.cc Thu Apr 27 15:18:20 2017 -0700 @@ -53,7 +53,7 @@ void tree_parameter_list::mark_as_formal_parameters (void) { - for (tree_decl_elt* elt : *this) + for (tree_decl_elt *elt : *this) elt->mark_as_formal_parameter (); } @@ -64,7 +64,7 @@ std::set<std::string> dict; - for (tree_decl_elt* elt : *this) + for (tree_decl_elt *elt : *this) { tree_identifier *id = elt->ident (); @@ -117,7 +117,7 @@ { std::list<std::string> retval; - for (tree_decl_elt* elt : *this) + for (tree_decl_elt *elt : *this) retval.push_back (elt->name ()); return retval; @@ -128,7 +128,7 @@ { bool status = true; - for (tree_decl_elt* elt : *this) + for (tree_decl_elt *elt : *this) { if (! elt->is_variable ()) { @@ -149,7 +149,7 @@ if (takes_varargs ()) new_list->mark_varargs (); - for (const tree_decl_elt* elt : *this) + for (const tree_decl_elt *elt : *this) new_list->append (elt->dup (scope, context)); return new_list; @@ -173,7 +173,7 @@ { tree_return_list *new_list = new tree_return_list (); - for (const tree_index_expression* elt : *this) + for (const tree_index_expression *elt : *this) new_list->append (elt->dup (scope, context)); return new_list;
--- a/libinterp/parse-tree/pt-pr-code.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/parse-tree/pt-pr-code.cc Thu Apr 27 15:18:20 2017 -0700 @@ -902,7 +902,7 @@ void tree_print_code::visit_statement_list (tree_statement_list& lst) { - for (tree_statement* elt : lst) + for (tree_statement *elt : lst) { if (elt) elt->accept (*this);
--- a/libinterp/parse-tree/pt-select.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/parse-tree/pt-select.cc Thu Apr 27 15:18:20 2017 -0700 @@ -63,7 +63,7 @@ { tree_if_command_list *new_icl = new tree_if_command_list (); - for (const tree_if_clause* elt : *this) + for (const tree_if_clause *elt : *this) new_icl->append (elt ? elt->dup (scope, context) : 0); return new_icl; @@ -114,7 +114,7 @@ { tree_switch_case_list *new_scl = new tree_switch_case_list (); - for (const tree_switch_case* elt : *this) + for (const tree_switch_case *elt : *this) new_scl->append (elt ? elt->dup (scope, context) : 0); return new_scl;
--- a/libinterp/parse-tree/pt-stmt.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/libinterp/parse-tree/pt-stmt.cc Thu Apr 27 15:18:20 2017 -0700 @@ -305,7 +305,7 @@ new_list->function_body = function_body; - for (const tree_statement* elt : *this) + for (const tree_statement *elt : *this) new_list->append (elt ? elt->dup (scope, context) : 0); return new_list;
--- a/liboctave/array/Array.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/array/Array.cc Thu Apr 27 15:18:20 2017 -0700 @@ -679,7 +679,7 @@ // recursive resizing template <typename T> - void do_resize_fill (const T* src, T *dest, const T& rfv, int lev) const + void do_resize_fill (const T *src, T *dest, const T& rfv, int lev) const { if (lev == 0) { @@ -701,7 +701,7 @@ public: template <typename T> - void resize_fill (const T* src, T *dest, const T& rfv) const + void resize_fill (const T *src, T *dest, const T& rfv) const { do_resize_fill (src, dest, rfv, n-1); } }; @@ -819,7 +819,7 @@ // Don't use resize to avoid useless initialization for POD types. retval = Array<T> (dim_vector (il, jl)); - const T* src = data (); + const T *src = data (); T *dest = retval.fortran_vec (); for (octave_idx_type k = 0; k < jl; k++) @@ -1242,7 +1242,7 @@ octave_idx_type c = dv(1); idx_vector ii (i); - const T* src = rhs.data (); + const T *src = rhs.data (); T *dest = fortran_vec (); // Try reduction first.
--- a/liboctave/array/Array.h Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/array/Array.h Thu Apr 27 15:18:20 2017 -0700 @@ -226,7 +226,7 @@ // contiguous subranges. Every time rep is directly manipulated, slice_data // and slice_len need to be properly updated. - T* slice_data; + T *slice_data; octave_idx_type slice_len; //! slice constructor
--- a/liboctave/array/CMatrix.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/array/CMatrix.cc Thu Apr 27 15:18:20 2017 -0700 @@ -2505,7 +2505,7 @@ if (liwork < 1) liwork = 1; Array<F77_INT> iwork (dim_vector (liwork, 1)); - F77_INT* piwork = iwork.fortran_vec (); + F77_INT *piwork = iwork.fortran_vec (); F77_INT tmp_info = 0; F77_INT tmp_rank = 0; @@ -2717,7 +2717,7 @@ if (liwork < 1) liwork = 1; Array<F77_INT> iwork (dim_vector (liwork, 1)); - F77_INT* piwork = iwork.fortran_vec (); + F77_INT *piwork = iwork.fortran_vec (); F77_INT tmp_info = 0; F77_INT tmp_rank = 0;
--- a/liboctave/array/MSparse.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/array/MSparse.cc Thu Apr 27 15:18:20 2017 -0700 @@ -27,7 +27,7 @@ template <typename T, typename OP> MSparse<T>& -plus_or_minus (MSparse<T>& a, const MSparse<T>& b, OP op, const char* op_name) +plus_or_minus (MSparse<T>& a, const MSparse<T>& b, OP op, const char *op_name) { MSparse<T> r; @@ -246,7 +246,7 @@ template <typename T, typename OP> MSparse<T> plus_or_minus (const MSparse<T>& a, const MSparse<T>& b, OP op, - const char* op_name, bool negate) + const char *op_name, bool negate) { MSparse<T> r;
--- a/liboctave/array/Sparse.h Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/array/Sparse.h Thu Apr 27 15:18:20 2017 -0700 @@ -505,40 +505,40 @@ Sparse<T> transpose (void) const; - T* data (void) { make_unique (); return rep->d; } + T * data (void) { make_unique (); return rep->d; } T& data (octave_idx_type i) { make_unique (); return rep->data (i); } - T* xdata (void) { return rep->d; } + T * xdata (void) { return rep->d; } T& xdata (octave_idx_type i) { return rep->data (i); } T data (octave_idx_type i) const { return rep->data (i); } // FIXME: shouldn't this be returning const T*? - T* data (void) const { return rep->d; } + T * data (void) const { return rep->d; } - octave_idx_type* ridx (void) { make_unique (); return rep->r; } + octave_idx_type * ridx (void) { make_unique (); return rep->r; } octave_idx_type& ridx (octave_idx_type i) { make_unique (); return rep->ridx (i); } - octave_idx_type* xridx (void) { return rep->r; } + octave_idx_type * xridx (void) { return rep->r; } octave_idx_type& xridx (octave_idx_type i) { return rep->ridx (i); } octave_idx_type ridx (octave_idx_type i) const { return rep->cridx (i); } // FIXME: shouldn't this be returning const octave_idx_type*? - octave_idx_type* ridx (void) const { return rep->r; } + octave_idx_type * ridx (void) const { return rep->r; } - octave_idx_type* cidx (void) { make_unique (); return rep->c; } + octave_idx_type * cidx (void) { make_unique (); return rep->c; } octave_idx_type& cidx (octave_idx_type i) { make_unique (); return rep->cidx (i); } - octave_idx_type* xcidx (void) { return rep->c; } + octave_idx_type * xcidx (void) { return rep->c; } octave_idx_type& xcidx (octave_idx_type i) { return rep->cidx (i); } octave_idx_type cidx (octave_idx_type i) const { return rep->ccidx (i); } // FIXME: shouldn't this be returning const octave_idx_type*? - octave_idx_type* cidx (void) const { return rep->c; } + octave_idx_type * cidx (void) const { return rep->c; } octave_idx_type ndims (void) const { return dimensions.ndims (); }
--- a/liboctave/array/dMatrix.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/array/dMatrix.cc Thu Apr 27 15:18:20 2017 -0700 @@ -2150,7 +2150,7 @@ if (liwork < 1) liwork = 1; Array<F77_INT> iwork (dim_vector (liwork, 1)); - F77_INT* piwork = iwork.fortran_vec (); + F77_INT *piwork = iwork.fortran_vec (); F77_INT tmp_info = 0; F77_INT tmp_rank = 0; @@ -2361,7 +2361,7 @@ if (liwork < 1) liwork = 1; Array<F77_INT> iwork (dim_vector (liwork, 1)); - F77_INT* piwork = iwork.fortran_vec (); + F77_INT *piwork = iwork.fortran_vec (); F77_INT tmp_info = 0; F77_INT tmp_rank = 0;
--- a/liboctave/array/dim-vector.h Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/array/dim-vector.h Thu Apr 27 15:18:20 2017 -0700 @@ -111,7 +111,7 @@ { int nd = ndims (); - octave_idx_type* r = newrep (nd); + octave_idx_type *r = newrep (nd); std::copy_n (rep, nd, r); @@ -127,7 +127,7 @@ if (n < 2) n = 2; - octave_idx_type* r = newrep (n); + octave_idx_type *r = newrep (n); if (nd > n) nd = n; @@ -493,7 +493,7 @@ } //! Linear index from an index tuple. - octave_idx_type compute_index (const octave_idx_type* idx) const + octave_idx_type compute_index (const octave_idx_type *idx) const { return compute_index (idx, ndims ()); } //! Linear index from an incomplete index tuple (nidx < length ()).
--- a/liboctave/array/fCMatrix.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/array/fCMatrix.cc Thu Apr 27 15:18:20 2017 -0700 @@ -2526,7 +2526,7 @@ if (liwork < 1) liwork = 1; Array<F77_INT> iwork (dim_vector (liwork, 1)); - F77_INT* piwork = iwork.fortran_vec (); + F77_INT *piwork = iwork.fortran_vec (); F77_INT tmp_info = 0; F77_INT tmp_rank = 0; @@ -2741,7 +2741,7 @@ if (liwork < 1) liwork = 1; Array<F77_INT> iwork (dim_vector (liwork, 1)); - F77_INT* piwork = iwork.fortran_vec (); + F77_INT *piwork = iwork.fortran_vec (); F77_INT tmp_info = 0; F77_INT tmp_rank = 0;
--- a/liboctave/array/fMatrix.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/array/fMatrix.cc Thu Apr 27 15:18:20 2017 -0700 @@ -2174,7 +2174,7 @@ if (liwork < 1) liwork = 1; Array<F77_INT> iwork (dim_vector (liwork, 1)); - F77_INT* piwork = iwork.fortran_vec (); + F77_INT *piwork = iwork.fortran_vec (); F77_INT tmp_info = 0; F77_INT tmp_rank = 0; @@ -2383,7 +2383,7 @@ if (liwork < 1) liwork = 1; Array<F77_INT> iwork (dim_vector (liwork, 1)); - F77_INT* piwork = iwork.fortran_vec (); + F77_INT *piwork = iwork.fortran_vec (); F77_INT tmp_info = 0; F77_INT tmp_rank = 0;
--- a/liboctave/numeric/CollocWt.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/numeric/CollocWt.cc Thu Apr 27 15:18:20 2017 -0700 @@ -372,7 +372,7 @@ // Error handling. void -CollocWt::error (const char* msg) +CollocWt::error (const char *msg) { (*current_liboctave_error_handler) ("CollocWt: fatal error '%s'", msg); }
--- a/liboctave/numeric/bsxfun-defs.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/numeric/bsxfun-defs.cc Thu Apr 27 15:18:20 2017 -0700 @@ -149,8 +149,8 @@ octave_idx_type nd = r.ndims (); dvx.redim (nd); - const X* xvec = x.fortran_vec (); - R* rvec = r.fortran_vec (); + const X *xvec = x.fortran_vec (); + R *rvec = r.fortran_vec (); // Fold the common leading dimensions. octave_idx_type start, ldr = 1;
--- a/liboctave/numeric/eigs-base.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/numeric/eigs-base.cc Thu Apr 27 15:18:20 2017 -0700 @@ -83,7 +83,7 @@ double rcond; MatrixType ltyp (MatrixType::Lower); M retval (n, b_nc); - const double* qv = Q.fortran_vec (); + const double *qv = Q.fortran_vec (); for (octave_idx_type j = 0; j < b_nc; j++) { for (octave_idx_type i = 0; i < n; i++) @@ -104,7 +104,7 @@ MatrixType utyp (MatrixType::Upper); M tmp = U.solve (utyp, m, err, rcond, 0); M retval; - const double* qv = Q.fortran_vec (); + const double *qv = Q.fortran_vec (); if (! err) { @@ -121,7 +121,7 @@ } static bool -vector_product (const SparseMatrix& m, const double* x, double* y) +vector_product (const SparseMatrix& m, const double *x, double *y) { octave_idx_type nc = m.cols (); @@ -153,8 +153,8 @@ } static bool -vector_product (const SparseComplexMatrix& m, const Complex* x, - Complex* y) +vector_product (const SparseComplexMatrix& m, const Complex *x, + Complex *y) { octave_idx_type nc = m.cols ();
--- a/liboctave/numeric/gsvd.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/numeric/gsvd.cc Thu Apr 27 15:18:20 2017 -0700 @@ -50,7 +50,7 @@ double *tmp_dataA, F77_INT m1, double *tmp_dataB, F77_INT p1, Matrix& alpha, Matrix& beta, double *u, F77_INT nrow_u, double *v, F77_INT nrow_v, double *q, - F77_INT nrow_q, Matrix& work, F77_INT* iwork, + F77_INT nrow_q, Matrix& work, F77_INT *iwork, F77_INT& info) { F77_XFCN (dggsvd, DGGSVD, (F77_CONST_CHAR_ARG2 (&jobu, 1), @@ -75,7 +75,7 @@ FloatMatrix& beta, float *u, F77_INT nrow_u, float *v, F77_INT nrow_v, float *q, F77_INT nrow_q, FloatMatrix& work, - F77_INT* iwork, F77_INT& info) + F77_INT *iwork, F77_INT& info) { F77_XFCN (sggsvd, SGGSVD, (F77_CONST_CHAR_ARG2 (&jobu, 1), F77_CONST_CHAR_ARG2 (&jobv, 1), @@ -99,7 +99,7 @@ Matrix& beta, Complex *u, F77_INT nrow_u, Complex *v, F77_INT nrow_v, Complex *q, F77_INT nrow_q, ComplexMatrix& work, - F77_INT* iwork, F77_INT& info) + F77_INT *iwork, F77_INT& info) { Matrix rwork(2*n, 1); F77_XFCN (zggsvd, ZGGSVD, (F77_CONST_CHAR_ARG2 (&jobu, 1), @@ -130,7 +130,7 @@ FloatComplex *v, F77_INT nrow_v, FloatComplex *q, F77_INT nrow_q, FloatComplexMatrix& work, - F77_INT* iwork, F77_INT& info) + F77_INT *iwork, F77_INT& info) { FloatMatrix rwork(2*n, 1); F77_XFCN (cggsvd, CGGSVD, (F77_CONST_CHAR_ARG2 (&jobu, 1),
--- a/liboctave/numeric/gsvd.h Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/numeric/gsvd.h Thu Apr 27 15:18:20 2017 -0700 @@ -104,7 +104,7 @@ P *u, octave_f77_int_type nrow_u, P *v, octave_f77_int_type nrow_v, P *q, octave_f77_int_type nrow_q, - T& work, octave_f77_int_type* iwork, + T& work, octave_f77_int_type *iwork, octave_f77_int_type& info); }; }
--- a/liboctave/numeric/lo-lapack-proto.h Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/numeric/lo-lapack-proto.h Thu Apr 27 15:18:20 2017 -0700 @@ -651,40 +651,40 @@ F77_RET_T F77_FUNC (cggbal, CGGBAL) (F77_CONST_CHAR_ARG_DECL, const F77_INT& N, - F77_CMPLX* A, const F77_INT& LDA, - F77_CMPLX* B, const F77_INT& LDB, + F77_CMPLX *A, const F77_INT& LDA, + F77_CMPLX *B, const F77_INT& LDB, F77_INT& ILO, F77_INT& IHI, - F77_REAL* LSCALE, F77_REAL* RSCALE, - F77_REAL* WORK, F77_INT& INFO + F77_REAL *LSCALE, F77_REAL *RSCALE, + F77_REAL *WORK, F77_INT& INFO F77_CHAR_ARG_LEN_DECL); F77_RET_T F77_FUNC (dggbal, DGGBAL) (F77_CONST_CHAR_ARG_DECL, - const F77_INT& N, F77_DBLE* A, - const F77_INT& LDA, F77_DBLE* B, + const F77_INT& N, F77_DBLE *A, + const F77_INT& LDA, F77_DBLE *B, const F77_INT& LDB, F77_INT& ILO, - F77_INT& IHI, F77_DBLE* LSCALE, - F77_DBLE* RSCALE, F77_DBLE* WORK, + F77_INT& IHI, F77_DBLE *LSCALE, + F77_DBLE *RSCALE, F77_DBLE *WORK, F77_INT& INFO F77_CHAR_ARG_LEN_DECL); F77_RET_T F77_FUNC (sggbal, SGGBAL) (F77_CONST_CHAR_ARG_DECL, - const F77_INT& N, F77_REAL* A, - const F77_INT& LDA, F77_REAL* B, + const F77_INT& N, F77_REAL *A, + const F77_INT& LDA, F77_REAL *B, const F77_INT& LDB, F77_INT& ILO, F77_INT& IHI, - F77_REAL* LSCALE, F77_REAL* RSCALE, - F77_REAL* WORK, F77_INT& INFO + F77_REAL *LSCALE, F77_REAL *RSCALE, + F77_REAL *WORK, F77_INT& INFO F77_CHAR_ARG_LEN_DECL); F77_RET_T F77_FUNC (zggbal, ZGGBAL) (F77_CONST_CHAR_ARG_DECL, - const F77_INT& N, F77_DBLE_CMPLX* A, - const F77_INT& LDA, F77_DBLE_CMPLX* B, + const F77_INT& N, F77_DBLE_CMPLX *A, + const F77_INT& LDA, F77_DBLE_CMPLX *B, const F77_INT& LDB, F77_INT& ILO, - F77_INT& IHI, F77_DBLE* LSCALE, - F77_DBLE* RSCALE, F77_DBLE* WORK, + F77_INT& IHI, F77_DBLE *LSCALE, + F77_DBLE *RSCALE, F77_DBLE *WORK, F77_INT& INFO F77_CHAR_ARG_LEN_DECL); @@ -696,8 +696,8 @@ const F77_INT& N, const F77_INT& ILO, const F77_INT& IHI, - const F77_DBLE* LSCALE, const F77_DBLE* RSCALE, - F77_INT& M, F77_DBLE* V, + const F77_DBLE *LSCALE, const F77_DBLE *RSCALE, + F77_INT& M, F77_DBLE *V, const F77_INT& LDV, F77_INT& INFO F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL); @@ -708,8 +708,8 @@ const F77_INT& N, const F77_INT& ILO, const F77_INT& IHI, - const F77_REAL* LSCALE, const F77_REAL* RSCALE, - F77_INT& M, F77_REAL* V, + const F77_REAL *LSCALE, const F77_REAL *RSCALE, + F77_INT& M, F77_REAL *V, const F77_INT& LDV, F77_INT& INFO F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL); @@ -720,8 +720,8 @@ const F77_INT& N, const F77_INT& ILO, const F77_INT& IHI, - const F77_DBLE* LSCALE, const F77_DBLE* RSCALE, - F77_INT& M, F77_DBLE_CMPLX* V, + const F77_DBLE *LSCALE, const F77_DBLE *RSCALE, + F77_INT& M, F77_DBLE_CMPLX *V, const F77_INT& LDV, F77_INT& INFO F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL); @@ -786,10 +786,10 @@ F77_CONST_CHAR_ARG_DECL, const F77_INT& N, const F77_INT& ILO, - const F77_INT& IHI, F77_DBLE* A, - const F77_INT& LDA, F77_DBLE* B, - const F77_INT& LDB, F77_DBLE* Q, - const F77_INT& LDQ, F77_DBLE* Z, + const F77_INT& IHI, F77_DBLE *A, + const F77_INT& LDA, F77_DBLE *B, + const F77_INT& LDB, F77_DBLE *Q, + const F77_INT& LDQ, F77_DBLE *Z, const F77_INT& LDZ, F77_INT& INFO F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL); @@ -799,10 +799,10 @@ F77_CONST_CHAR_ARG_DECL, const F77_INT& N, const F77_INT& ILO, - const F77_INT& IHI, F77_DBLE_CMPLX* A, - const F77_INT& LDA, F77_DBLE_CMPLX* B, - const F77_INT& LDB, F77_DBLE_CMPLX* Q, - const F77_INT& LDQ, F77_DBLE_CMPLX* Z, + const F77_INT& IHI, F77_DBLE_CMPLX *A, + const F77_INT& LDA, F77_DBLE_CMPLX *B, + const F77_INT& LDB, F77_DBLE_CMPLX *Q, + const F77_INT& LDQ, F77_DBLE_CMPLX *Z, const F77_INT& LDZ, F77_INT& INFO F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL); @@ -1048,11 +1048,11 @@ const F77_INT& N, const F77_INT& ILO, const F77_INT& IHI, - F77_DBLE* A, const F77_INT& LDA, F77_DBLE* B, - const F77_INT& LDB, F77_DBLE* ALPHAR, - F77_DBLE* ALPHAI, F77_DBLE* BETA, F77_DBLE* Q, - const F77_INT& LDQ, F77_DBLE* Z, - const F77_INT& LDZ, F77_DBLE* WORK, + F77_DBLE *A, const F77_INT& LDA, F77_DBLE *B, + const F77_INT& LDB, F77_DBLE *ALPHAR, + F77_DBLE *ALPHAI, F77_DBLE *BETA, F77_DBLE *Q, + const F77_INT& LDQ, F77_DBLE *Z, + const F77_INT& LDZ, F77_DBLE *WORK, const F77_INT& LWORK, F77_INT& INFO F77_CHAR_ARG_LEN_DECL @@ -1066,13 +1066,13 @@ const F77_INT& N, const F77_INT& ILO, const F77_INT& IHI, - F77_DBLE_CMPLX* A, const F77_INT& LDA, - F77_DBLE_CMPLX* B, const F77_INT& LDB, - F77_DBLE_CMPLX* ALPHA, F77_DBLE_CMPLX* BETA, - F77_DBLE_CMPLX* CQ, const F77_INT& LDQ, - F77_DBLE_CMPLX* CZ, const F77_INT& LDZ, - F77_DBLE_CMPLX* WORK, const F77_INT& LWORK, - F77_DBLE* RWORK, F77_INT& INFO + F77_DBLE_CMPLX *A, const F77_INT& LDA, + F77_DBLE_CMPLX *B, const F77_INT& LDB, + F77_DBLE_CMPLX *ALPHA, F77_DBLE_CMPLX *BETA, + F77_DBLE_CMPLX *CQ, const F77_INT& LDQ, + F77_DBLE_CMPLX *CZ, const F77_INT& LDZ, + F77_DBLE_CMPLX *WORK, const F77_INT& LWORK, + F77_DBLE *RWORK, F77_INT& INFO F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL); @@ -1092,8 +1092,8 @@ // LAG2 F77_RET_T - F77_FUNC (dlag2, DLAG2) (const F77_DBLE* A, const F77_INT& LDA, - const F77_DBLE* B, const F77_INT& LDB, + F77_FUNC (dlag2, DLAG2) (const F77_DBLE *A, const F77_INT& LDA, + const F77_DBLE *B, const F77_INT& LDB, const F77_DBLE& SAFMIN, F77_DBLE& SCALE1, F77_DBLE& SCALE2, F77_DBLE& WR1, F77_DBLE& WR2, F77_DBLE& WI); @@ -1459,28 +1459,28 @@ F77_RET_T F77_FUNC (dtgevc, DTGEVC) (F77_CONST_CHAR_ARG_DECL, F77_CONST_CHAR_ARG_DECL, - F77_INT* SELECT, - const F77_INT& N, F77_DBLE* A, - const F77_INT& LDA, F77_DBLE* B, - const F77_INT& LDB, F77_DBLE* VL, - const F77_INT& LDVL, F77_DBLE* VR, + F77_INT *SELECT, + const F77_INT& N, F77_DBLE *A, + const F77_INT& LDA, F77_DBLE *B, + const F77_INT& LDB, F77_DBLE *VL, + const F77_INT& LDVL, F77_DBLE *VR, const F77_INT& LDVR, const F77_INT& MM, F77_INT& M, - F77_DBLE* WORK, F77_INT& INFO + F77_DBLE *WORK, F77_INT& INFO F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL); F77_RET_T F77_FUNC (ztgevc, ZTGEVC) (F77_CONST_CHAR_ARG_DECL, F77_CONST_CHAR_ARG_DECL, - F77_INT* SELECT, - const F77_INT& N, const F77_DBLE_CMPLX* A, - const F77_INT& LDA,const F77_DBLE_CMPLX* B, - const F77_INT& LDB, F77_DBLE_CMPLX* xVL, - const F77_INT& LDVL, F77_DBLE_CMPLX* xVR, + F77_INT *SELECT, + const F77_INT& N, const F77_DBLE_CMPLX *A, + const F77_INT& LDA,const F77_DBLE_CMPLX *B, + const F77_INT& LDB, F77_DBLE_CMPLX *xVL, + const F77_INT& LDVL, F77_DBLE_CMPLX *xVR, const F77_INT& LDVR, const F77_INT& MM, F77_INT& M, - F77_DBLE_CMPLX* CWORK, F77_DBLE* RWORK, + F77_DBLE_CMPLX *CWORK, F77_DBLE* RWORK, F77_INT& INFO F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL);
--- a/liboctave/numeric/oct-norm.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/numeric/oct-norm.cc Thu Apr 27 15:18:20 2017 -0700 @@ -551,7 +551,7 @@ // this is needed to avoid copying the sparse matrix for xfrobnorm template <typename T, typename R> -inline void array_norm_2 (const T* v, octave_idx_type n, R& res) +inline void array_norm_2 (const T *v, octave_idx_type n, R& res) { norm_accumulator_2<R> acc; for (octave_idx_type i = 0; i < n; i++)
--- a/liboctave/numeric/randmtzig.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/numeric/randmtzig.cc Thu Apr 27 15:18:20 2017 -0700 @@ -257,7 +257,7 @@ int n = 0; /* Look for entropy in /dev/urandom */ - FILE* urandom = std::fopen ("/dev/urandom", "rb"); + FILE *urandom = std::fopen ("/dev/urandom", "rb"); if (urandom) { while (n < MT_N)
--- a/liboctave/numeric/svd.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/numeric/svd.cc Thu Apr 27 15:18:20 2017 -0700 @@ -92,8 +92,8 @@ template<> void svd<Matrix>::gesvd (char& jobu, char& jobv, F77_INT m, F77_INT n, - double* tmp_data, F77_INT m1, double* s_vec, - double* u, double* vt, F77_INT nrow_vt1, + double *tmp_data, F77_INT m1, double *s_vec, + double *u, double *vt, F77_INT nrow_vt1, std::vector<double>& work, F77_INT& lwork, F77_INT& info) { @@ -109,8 +109,8 @@ template<> void svd<FloatMatrix>::gesvd (char& jobu, char& jobv, F77_INT m, F77_INT n, - float* tmp_data, F77_INT m1, float* s_vec, - float* u, float* vt, F77_INT nrow_vt1, + float *tmp_data, F77_INT m1, float *s_vec, + float *u, float *vt, F77_INT nrow_vt1, std::vector<float>& work, F77_INT& lwork, F77_INT& info) { @@ -126,8 +126,8 @@ template<> void svd<ComplexMatrix>::gesvd (char& jobu, char& jobv, F77_INT m, F77_INT n, - Complex* tmp_data, F77_INT m1, double* s_vec, - Complex* u, Complex* vt, F77_INT nrow_vt1, + Complex *tmp_data, F77_INT m1, double *s_vec, + Complex *u, Complex *vt, F77_INT nrow_vt1, std::vector<Complex>& work, F77_INT& lwork, F77_INT& info) { @@ -145,9 +145,9 @@ template<> void svd<FloatComplexMatrix>::gesvd (char& jobu, char& jobv, F77_INT m, - F77_INT n, FloatComplex* tmp_data, - F77_INT m1, float* s_vec, FloatComplex* u, - FloatComplex* vt, F77_INT nrow_vt1, + F77_INT n, FloatComplex *tmp_data, + F77_INT m1, float *s_vec, FloatComplex *u, + FloatComplex *vt, F77_INT nrow_vt1, std::vector<FloatComplex>& work, F77_INT& lwork, F77_INT& info) { @@ -185,10 +185,10 @@ // DGESDD template<> void - svd<Matrix>::gesdd (char& jobz, F77_INT m, F77_INT n, double* tmp_data, - F77_INT m1, double* s_vec, double* u, double* vt, + svd<Matrix>::gesdd (char& jobz, F77_INT m, F77_INT n, double *tmp_data, + F77_INT m1, double *s_vec, double *u, double *vt, F77_INT nrow_vt1, std::vector<double>& work, - F77_INT& lwork, F77_INT* iwork, F77_INT& info) + F77_INT& lwork, F77_INT *iwork, F77_INT& info) { GESDD_REAL_STEP (dgesdd, DGESDD); @@ -201,8 +201,8 @@ // SGESDD template<> void - svd<FloatMatrix>::gesdd (char& jobz, F77_INT m, F77_INT n, float* tmp_data, - F77_INT m1, float* s_vec, float* u, float* vt, + svd<FloatMatrix>::gesdd (char& jobz, F77_INT m, F77_INT n, float *tmp_data, + F77_INT m1, float *s_vec, float *u, float *vt, F77_INT nrow_vt1, std::vector<float>& work, F77_INT& lwork, F77_INT* iwork, F77_INT& info) { @@ -218,10 +218,10 @@ template<> void svd<ComplexMatrix>::gesdd (char& jobz, F77_INT m, F77_INT n, - Complex* tmp_data, F77_INT m1, double* s_vec, - Complex* u, Complex* vt, F77_INT nrow_vt1, + Complex *tmp_data, F77_INT m1, double *s_vec, + Complex *u, Complex *vt, F77_INT nrow_vt1, std::vector<Complex>& work, F77_INT& lwork, - F77_INT* iwork, F77_INT& info) + F77_INT *iwork, F77_INT& info) { F77_INT min_mn = std::min (m, n); @@ -246,11 +246,11 @@ template<> void svd<FloatComplexMatrix>::gesdd (char& jobz, F77_INT m, F77_INT n, - FloatComplex* tmp_data, F77_INT m1, - float* s_vec, FloatComplex* u, - FloatComplex* vt, F77_INT nrow_vt1, + FloatComplex *tmp_data, F77_INT m1, + float *s_vec, FloatComplex *u, + FloatComplex *vt, F77_INT nrow_vt1, std::vector<FloatComplex>& work, - F77_INT& lwork, F77_INT* iwork, + F77_INT& lwork, F77_INT *iwork, F77_INT& info) { F77_INT min_mn = std::min (m, n); @@ -314,7 +314,7 @@ } T atmp = a; - P* tmp_data = atmp.fortran_vec (); + P *tmp_data = atmp.fortran_vec (); F77_INT min_mn = m < n ? m : n; @@ -354,15 +354,15 @@ if (! (jobu == 'N' || jobu == 'O')) left_sm.resize (m, ncol_u); - P* u = left_sm.fortran_vec (); + P *u = left_sm.fortran_vec (); sigma.resize (nrow_s, ncol_s); - DM_P* s_vec = sigma.fortran_vec (); + DM_P *s_vec = sigma.fortran_vec (); if (! (jobv == 'N' || jobv == 'O')) right_sm.resize (nrow_vt, n); - P* vt = right_sm.fortran_vec (); + P *vt = right_sm.fortran_vec (); // Query _GESVD for the correct dimension of WORK.
--- a/liboctave/numeric/svd.h Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/numeric/svd.h Thu Apr 27 15:18:20 2017 -0700 @@ -100,15 +100,15 @@ T right_sm; void gesvd (char& jobu, char& jobv, octave_f77_int_type m, - octave_f77_int_type n, P* tmp_data, octave_f77_int_type m1, - DM_P* s_vec, P* u, P* vt, octave_f77_int_type nrow_vt1, + octave_f77_int_type n, P *tmp_data, octave_f77_int_type m1, + DM_P *s_vec, P *u, P *vt, octave_f77_int_type nrow_vt1, std::vector<P>& work, octave_f77_int_type& lwork, octave_f77_int_type& info); void gesdd (char& jobz, octave_f77_int_type m, octave_f77_int_type n, - P* tmp_data, octave_f77_int_type m1, DM_P* s_vec, P* u, - P* vt, octave_f77_int_type nrow_vt1, std::vector<P>& work, - octave_f77_int_type& lwork, octave_f77_int_type* iwork, + P *tmp_data, octave_f77_int_type m1, DM_P *s_vec, P *u, + P *vt, octave_f77_int_type nrow_vt1, std::vector<P>& work, + octave_f77_int_type& lwork, octave_f77_int_type *iwork, octave_f77_int_type& info); }; }
--- a/liboctave/operators/mx-inlines.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/operators/mx-inlines.cc Thu Apr 27 15:18:20 2017 -0700 @@ -181,7 +181,7 @@ } template <typename X> -void mx_inline_not (size_t n, bool *r, const X* x) throw () +void mx_inline_not (size_t n, bool *r, const X *x) throw () { for (size_t i = 0; i < n; i++) r[i] = ! logical_value (x[i]); @@ -257,7 +257,7 @@ template <typename T> inline bool -mx_inline_any_nan (size_t n, const T* x) throw () +mx_inline_any_nan (size_t n, const T *x) throw () { for (size_t i = 0; i < n; i++) { @@ -270,7 +270,7 @@ template <typename T> inline bool -mx_inline_all_finite (size_t n, const T* x) throw () +mx_inline_all_finite (size_t n, const T *x) throw () { for (size_t i = 0; i < n; i++) { @@ -283,7 +283,7 @@ template <typename T> inline bool -mx_inline_any_negative (size_t n, const T* x) throw () +mx_inline_any_negative (size_t n, const T *x) throw () { for (size_t i = 0; i < n; i++) { @@ -296,7 +296,7 @@ template <typename T> inline bool -mx_inline_any_positive (size_t n, const T* x) throw () +mx_inline_any_positive (size_t n, const T *x) throw () { for (size_t i = 0; i < n; i++) { @@ -740,7 +740,7 @@ #define OP_RED_FCN(F, TSRC, TRES, OP, ZERO) \ template <typename T> \ inline TRES \ - F (const TSRC* v, octave_idx_type n) \ + F (const TSRC *v, octave_idx_type n) \ { \ TRES ac = ZERO; \ for (octave_idx_type i = 0; i < n; i++) \ @@ -764,7 +764,7 @@ #define OP_RED_FCN2(F, TSRC, TRES, OP, ZERO) \ template <typename T> \ inline void \ - F (const TSRC* v, TRES *r, octave_idx_type m, octave_idx_type n) \ + F (const TSRC *v, TRES *r, octave_idx_type m, octave_idx_type n) \ { \ for (octave_idx_type i = 0; i < m; i++) \ r[i] = ZERO; \ @@ -798,7 +798,7 @@ #define OP_ROW_SHORT_CIRCUIT(F, PRED, ZERO) \ template <typename T> \ inline void \ - F (const T* v, bool *r, octave_idx_type m, octave_idx_type n) \ + F (const T *v, bool *r, octave_idx_type m, octave_idx_type n) \ { \ if (n <= 8) \ return F ## _r (v, r, m, n); \
--- a/liboctave/util/oct-binmap.h Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/util/oct-binmap.h Thu Apr 27 15:18:20 2017 -0700 @@ -76,21 +76,21 @@ } static void - op_mm (size_t n, R* r, const X* x , const Y* y) + op_mm (size_t n, R *r, const X *x , const Y *y) { for (size_t i = 0; i < n; i++) r[i] = f (x[i], y[i]); } static void - op_sm (size_t n, R* r, X x, const Y* y) + op_sm (size_t n, R *r, X x, const Y *y) { for (size_t i = 0; i < n; i++) r[i] = f (x, y[i]); } static void - op_ms (size_t n , R* r, const X* x, Y y) + op_ms (size_t n , R *r, const X *x, Y y) { for (size_t i = 0; i < n; i++) r[i] = f (x[i], y);
--- a/liboctave/util/oct-sort.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/util/oct-sort.cc Thu Apr 27 15:18:20 2017 -0700 @@ -1808,7 +1808,7 @@ template <typename T> void octave_sort<T>::lookup (const T *data, octave_idx_type nel, - const T* values, octave_idx_type nvalues, + const T *values, octave_idx_type nvalues, octave_idx_type *idx) { #if defined (INLINE_ASCENDING_SORT) @@ -1883,7 +1883,7 @@ template <typename T> void octave_sort<T>::lookup_sorted (const T *data, octave_idx_type nel, - const T* values, octave_idx_type nvalues, + const T *values, octave_idx_type nvalues, octave_idx_type *idx, bool rev) { #if defined (INLINE_ASCENDING_SORT)
--- a/liboctave/util/oct-sort.h Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/util/oct-sort.h Thu Apr 27 15:18:20 2017 -0700 @@ -153,13 +153,13 @@ // Ditto, but for an array. void lookup (const T *data, octave_idx_type nel, - const T* values, octave_idx_type nvalues, + const T *values, octave_idx_type nvalues, octave_idx_type *idx); // A linear merge of two sorted tables. rev indicates the second table is // in reverse order. void lookup_sorted (const T *data, octave_idx_type nel, - const T* values, octave_idx_type nvalues, + const T *values, octave_idx_type nvalues, octave_idx_type *idx, bool rev = false); // Rearranges the array so that the elements with indices @@ -322,12 +322,12 @@ template <typename Comp> void lookup (const T *data, octave_idx_type nel, - const T* values, octave_idx_type nvalues, + const T *values, octave_idx_type nvalues, octave_idx_type *idx, Comp comp); template <typename Comp> void lookup_sorted (const T *data, octave_idx_type nel, - const T* values, octave_idx_type nvalues, + const T *values, octave_idx_type nvalues, octave_idx_type *idx, bool rev, Comp comp); template <typename Comp>
--- a/liboctave/util/oct-string.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/util/oct-string.cc Thu Apr 27 15:18:20 2017 -0700 @@ -34,7 +34,7 @@ template <typename T> static bool -str_data_cmp (const typename T::value_type* a, const typename T::value_type* b, +str_data_cmp (const typename T::value_type *a, const typename T::value_type *b, const typename T::size_type n) { for (typename T::size_type i = 0; i < n; ++i) @@ -45,7 +45,7 @@ template <typename T> static bool -str_data_cmpi (const typename T::value_type* a, const typename T::value_type* b, +str_data_cmpi (const typename T::value_type *a, const typename T::value_type *b, const typename T::size_type n) { for (typename T::size_type i = 0; i < n; ++i) @@ -72,7 +72,7 @@ template <typename T> typename T::size_type -strlen (const typename T::value_type* str) +strlen (const typename T::value_type *str) { return std::strlen (str); } @@ -93,14 +93,14 @@ template <typename T> bool -sizes_cmp (const T& str_a, const typename T::value_type* str_b) +sizes_cmp (const T& str_a, const typename T::value_type *str_b) { return str_a.size () == strlen<T> (str_b); } template <> bool -sizes_cmp (const Array<char>& str_a, const char* str_b) +sizes_cmp (const Array<char>& str_a, const char *str_b) { return (str_a.is_vector () && str_a.rows () == 1 && str_a.numel () == strlen<Array<char>> (str_b)); @@ -117,7 +117,7 @@ template<typename T> bool -octave::string::strcmp (const T& str_a, const typename T::value_type* str_b) +octave::string::strcmp (const T& str_a, const typename T::value_type *str_b) { return (sizes_cmp (str_a, str_b) && str_data_cmp<T> (str_a.data (), str_b, numel (str_a))); @@ -134,7 +134,7 @@ template<typename T> bool -octave::string::strcmpi (const T& str_a, const typename T::value_type* str_b) +octave::string::strcmpi (const T& str_a, const typename T::value_type *str_b) { return (sizes_cmp (str_a, str_b) && str_data_cmpi<T> (str_a.data (), str_b, numel (str_a))); @@ -152,7 +152,7 @@ template<typename T> bool -octave::string::strncmp (const T& str_a, const typename T::value_type* str_b, +octave::string::strncmp (const T& str_a, const typename T::value_type *str_b, const typename T::size_type n) { return (numel (str_a) >= n && strlen<T> (str_b) >= n @@ -171,7 +171,7 @@ template<typename T> bool -octave::string::strncmpi (const T& str_a, const typename T::value_type* str_b, +octave::string::strncmpi (const T& str_a, const typename T::value_type *str_b, const typename T::size_type n) { return (numel (str_a) >= n && strlen<T> (str_b) >= n
--- a/liboctave/util/oct-string.h Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/util/oct-string.h Thu Apr 27 15:18:20 2017 -0700 @@ -64,7 +64,7 @@ is considered to be a row vector. */ template <typename T> - bool strcmp (const T& str_a, const typename T::value_type* str_b); + bool strcmp (const T& str_a, const typename T::value_type *str_b); //! True if strings are the same, ignoring case. /*! @@ -85,7 +85,7 @@ is considered to be a row vector. */ template <typename T> - bool strcmpi (const T& str_a, const typename T::value_type* str_b); + bool strcmpi (const T& str_a, const typename T::value_type *str_b); //! True if the first N characters are the same. /*! @@ -101,7 +101,7 @@ //! True if the first N characters are the same. template <typename T> - bool strncmp (const T& str_a, const typename T::value_type* str_b, + bool strncmp (const T& str_a, const typename T::value_type *str_b, const typename T::size_type n); //! True if the first N characters are the same, ignoring case. @@ -118,7 +118,7 @@ //! True if the first N characters are the same, ignoring case. template <typename T> - bool strncmpi (const T& str_a, const typename T::value_type* str_b, + bool strncmpi (const T& str_a, const typename T::value_type *str_b, const typename T::size_type n); } }
--- a/liboctave/util/sparse-sort.cc Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/util/sparse-sort.cc Thu Apr 27 15:18:20 2017 -0700 @@ -38,8 +38,8 @@ // faster than using octave_qsort. bool -octave_sparse_sidxl_comp (octave_sparse_sort_idxl* i, - octave_sparse_sort_idxl* j) +octave_sparse_sidxl_comp (octave_sparse_sort_idxl *i, + octave_sparse_sort_idxl *j) { octave_idx_type tmp = i->c - j->c; if (tmp < 0) @@ -54,8 +54,8 @@ // Need to know the original order of the sorted indexes in // sparse assignments, and this class does that bool -octave_idx_vector_comp (octave_idx_vector_sort* i, - octave_idx_vector_sort* j) +octave_idx_vector_comp (octave_idx_vector_sort *i, + octave_idx_vector_sort *j) { return (i->i < j->i); }
--- a/liboctave/util/sparse-sort.h Thu Apr 27 15:26:32 2017 -0400 +++ b/liboctave/util/sparse-sort.h Thu Apr 27 15:18:20 2017 -0700 @@ -37,8 +37,8 @@ octave_idx_type idx; }; -bool octave_sparse_sidxl_comp (octave_sparse_sort_idxl* i, - octave_sparse_sort_idxl* j); +bool octave_sparse_sidxl_comp (octave_sparse_sort_idxl *i, + octave_sparse_sort_idxl *j); class octave_idx_vector_sort @@ -48,7 +48,7 @@ octave_idx_type idx; }; -bool octave_idx_vector_comp (octave_idx_vector_sort* i, - octave_idx_vector_sort* j); +bool octave_idx_vector_comp (octave_idx_vector_sort *i, + octave_idx_vector_sort *j); #endif