Mercurial > octave
diff libinterp/dldfcn/__init_fltk__.cc @ 23449:c763214a8260
maint: Use convention 'int *x' for naming pointers.
* mycell.c, myfeval.c, mypow2.c, myprop.c, myset.c, mystruct.c, Backend.cc,
Backend.h, BaseControl.cc, BaseControl.h, ButtonControl.cc, ButtonControl.h,
ButtonGroup.cc, ButtonGroup.h, Canvas.cc, Canvas.h, CheckBoxControl.cc,
CheckBoxControl.h, Container.cc, Container.h, ContextMenu.cc, ContextMenu.h,
EditControl.cc, EditControl.h, Figure.cc, Figure.h, FigureWindow.cc,
FigureWindow.h, GLCanvas.cc, GLCanvas.h, GenericEventNotify.h,
ListBoxControl.cc, ListBoxControl.h, Logger.cc, Logger.h, Menu.cc, Menu.h,
MenuContainer.h, MouseModeActionGroup.cc, MouseModeActionGroup.h, Object.cc,
Object.h, ObjectFactory.cc, ObjectFactory.h, ObjectProxy.cc, ObjectProxy.h,
Panel.cc, Panel.h, PopupMenuControl.cc, PopupMenuControl.h,
PushButtonControl.cc, PushButtonControl.h, PushTool.cc, PushTool.h,
QtHandlesUtils.cc, QtHandlesUtils.h, RadioButtonControl.cc,
RadioButtonControl.h, SliderControl.cc, SliderControl.h, TextControl.cc,
TextControl.h, TextEdit.cc, TextEdit.h, ToggleButtonControl.cc,
ToggleButtonControl.h, ToggleTool.cc, ToggleTool.h, ToolBar.cc, ToolBar.h,
ToolBarButton.cc, ToolBarButton.h, color-picker.cc, file-editor-tab.cc,
file-editor.cc, file-editor.h, find-dialog.cc, find-dialog.h,
octave-qscintilla.cc, main-window.cc, main-window.h, octave-cmd.cc,
octave-dock-widget.cc, parser.cc, shortcut-manager.cc, workspace-view.cc,
__ichol__.cc, __ilu__.cc, __magick_read__.cc, c-file-ptr-stream.cc,
c-file-ptr-stream.h, cellfun.cc, data.cc, gl2ps-print.cc, graphics.cc,
graphics.in.h, ls-hdf5.cc, ls-hdf5.h, ls-mat5.cc, mex.h, oct-map.cc, oct-map.h,
oct-stream.cc, octave-link.cc, profiler.cc, profiler.h, psi.cc, qz.cc,
sighandlers.cc, symtab.h, txt-eng.h, zfstream.cc, zfstream.h, __init_fltk__.cc,
audiodevinfo.cc, gzip.cc, ov-class.cc, ov-classdef.cc, ov-classdef.h,
ov-dld-fcn.h, ov-fcn-inline.cc, ov-java.cc, ov-java.h, ov.cc, pt-arg-list.cc,
pt-array-list.cc, pt-bp.cc, pt-check.cc, pt-classdef.h, pt-decl.cc, pt-eval.cc,
pt-idx.cc, pt-idx.h, pt-jit.cc, pt-misc.cc, pt-pr-code.cc, pt-select.cc,
pt-stmt.cc, Array.cc, Array.h, CMatrix.cc, MSparse.cc, Sparse.h, dMatrix.cc,
dim-vector.h, fCMatrix.cc, fMatrix.cc, CollocWt.cc, bsxfun-defs.cc,
eigs-base.cc, gsvd.cc, gsvd.h, lo-lapack-proto.h, oct-norm.cc, randmtzig.cc,
svd.cc, svd.h, mx-inlines.cc, oct-binmap.h, oct-sort.cc, oct-sort.h,
oct-string.cc, oct-string.h, sparse-sort.cc, sparse-sort.h:
Use convention 'int *x' for naming pointers.
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 27 Apr 2017 15:18:20 -0700 |
| parents | db1fdf4384dd |
| children | 21baad6b35c4 |
line wrap: on
line diff
--- 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;