Mercurial > octave
changeset 31838:45f8b601c992
maint: Use "m_" prefix on all private member variables in classes.
* annotation-dialog.cc, annotation-dialog.h, gl-select.cc, gl-select.h,
dialog.cc, dialog.h, documentation-bookmarks.cc, documentation-bookmarks.h,
variable-editor-model.cc, variable-editor-model.h, gzfstream.h, load-path.cc,
load-path.h, oct-stream.cc, __init_fltk__.cc, audiodevinfo.cc, ov-class.cc,
ov-class.h, pt-decl.cc, pt-decl.h, cmd-edit.cc, cmd-hist.cc:
Use "m_" prefix on all private member variables in classes.
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 16 Feb 2023 15:13:35 -0800 |
| parents | febd82d1a8de |
| children | 3291f49ae696 |
| files | libgui/graphics/annotation-dialog.cc libgui/graphics/annotation-dialog.h libgui/graphics/gl-select.cc libgui/graphics/gl-select.h libgui/src/dialog.cc libgui/src/dialog.h libgui/src/documentation-bookmarks.cc libgui/src/documentation-bookmarks.h libgui/src/variable-editor-model.cc libgui/src/variable-editor-model.h libinterp/corefcn/gzfstream.h libinterp/corefcn/load-path.cc libinterp/corefcn/load-path.h libinterp/corefcn/oct-stream.cc libinterp/dldfcn/__init_fltk__.cc libinterp/dldfcn/audiodevinfo.cc libinterp/octave-value/ov-class.cc libinterp/octave-value/ov-class.h libinterp/parse-tree/pt-decl.cc libinterp/parse-tree/pt-decl.h liboctave/util/cmd-edit.cc liboctave/util/cmd-hist.cc |
| diffstat | 22 files changed, 479 insertions(+), 478 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/graphics/annotation-dialog.cc Thu Feb 16 14:43:18 2023 -0500 +++ b/libgui/graphics/annotation-dialog.cc Thu Feb 16 15:13:35 2023 -0800 @@ -40,9 +40,9 @@ #include "ui-annotation-dialog.h" annotation_dialog::annotation_dialog (QWidget *p, const octave_value_list& pr): - QDialog (p), ui (new Ui::annotation_dialog) + QDialog (p), m_ui (new Ui::annotation_dialog) { - props = pr; + m_props = pr; init (); } @@ -50,7 +50,7 @@ void annotation_dialog::init () { - ui->setupUi (this); + m_ui->setupUi (this); octave::gui_settings settings; @@ -59,25 +59,25 @@ restoreGeometry (settings.byte_array_value (gp_annotation_geometry)); // connect signals - connect (ui->button_box, &QDialogButtonBox::clicked, + connect (m_ui->button_box, &QDialogButtonBox::clicked, this, &annotation_dialog::button_clicked); - connect (ui->edit_string, &QLineEdit::textChanged, + connect (m_ui->edit_string, &QLineEdit::textChanged, this, &annotation_dialog::edit_string_changed); - connect (ui->btn_color, &QPushButton::clicked, + connect (m_ui->btn_color, &QPushButton::clicked, this, &annotation_dialog::prompt_for_color); - connect (ui->btn_background_color, &QPushButton::clicked, + connect (m_ui->btn_background_color, &QPushButton::clicked, this, &annotation_dialog::prompt_for_color); - connect (ui->btn_edge_color, &QPushButton::clicked, + connect (m_ui->btn_edge_color, &QPushButton::clicked, this, &annotation_dialog::prompt_for_color); // set gui element to default values - ui->cb_fit_box_to_text->setChecked (true); - ui->cb_horz_align->setCurrentIndex (ui->cb_horz_align->findText ("left")); - ui->cb_vert_align->setCurrentIndex (ui->cb_vert_align->findText ("middle")); + m_ui->cb_fit_box_to_text->setChecked (true); + m_ui->cb_horz_align->setCurrentIndex (m_ui->cb_horz_align->findText ("left")); + m_ui->cb_vert_align->setCurrentIndex (m_ui->cb_vert_align->findText ("middle")); // set gui elements to any values from input properties set_gui_props (); @@ -85,7 +85,7 @@ annotation_dialog::~annotation_dialog () { - delete ui; + delete m_ui; } // internal slots @@ -94,7 +94,7 @@ annotation_dialog::button_clicked (QAbstractButton *button) { QDialogButtonBox::ButtonRole button_role - = ui->button_box->buttonRole (button); + = m_ui->button_box->buttonRole (button); octave::gui_settings settings; @@ -115,83 +115,83 @@ octave_value_list annotation_dialog::get_properties () const { - return props; + return m_props; } void annotation_dialog::get_gui_props () { // set props to the values of the gui - props = octave_value_list (); + m_props = octave_value_list (); Matrix position(1, 4); - position(0) = ui->sb_x->value (); - position(1) = ui->sb_y->value (); - position(2) = ui->sb_width->value (); - position(3) = ui->sb_height->value (); - props.append (ovl ("textbox", position)); + position(0) = m_ui->sb_x->value (); + position(1) = m_ui->sb_y->value (); + position(2) = m_ui->sb_width->value (); + position(3) = m_ui->sb_height->value (); + m_props.append (ovl ("textbox", position)); - props.append (ovl ("string", ui->edit_string->text ().toStdString ())); - props.append (ovl ("fitboxtotext", - ui->cb_fit_box_to_text->isChecked () ? "on" : "off")); + m_props.append (ovl ("string", m_ui->edit_string->text ().toStdString ())); + m_props.append (ovl ("fitboxtotext", + m_ui->cb_fit_box_to_text->isChecked () ? "on" : "off")); // FIXME: only "normalized" units is selectable, change the code below // once more units are added in the UI. std::string tmpstr; - props.append (ovl ("units", "normalized")); + m_props.append (ovl ("units", "normalized")); - tmpstr = (ui->cb_horz_align->currentIndex () == 0 ? "left" : - (ui->cb_horz_align->currentIndex () == 1 ? "center" : "right")); - props.append (ovl ("horizontalalignment", tmpstr)); + tmpstr = (m_ui->cb_horz_align->currentIndex () == 0 ? "left" : + (m_ui->cb_horz_align->currentIndex () == 1 ? "center" : "right")); + m_props.append (ovl ("horizontalalignment", tmpstr)); - tmpstr = (ui->cb_vert_align->currentIndex () == 0 ? "top" : - (ui->cb_horz_align->currentIndex () == 1 ? "middle" : "bottom")); - props.append (ovl ("verticalalignment", tmpstr)); + tmpstr = (m_ui->cb_vert_align->currentIndex () == 0 ? "top" : + (m_ui->cb_horz_align->currentIndex () == 1 ? "middle" : "bottom")); + m_props.append (ovl ("verticalalignment", tmpstr)); - tmpstr = ui->cb_font_name->currentText ().toStdString (); - props.append (ovl ("fontname", tmpstr)); + tmpstr = m_ui->cb_font_name->currentText ().toStdString (); + m_props.append (ovl ("fontname", tmpstr)); - props.append (ovl ("fontsize", ui->sb_font_size->value ())); - props.append (ovl ("fontweight", - ui->cb_font_bold->isChecked () ? "bold" : "normal")); - props.append (ovl ("fontangle", - ui->cb_font_italic->isChecked () ? "italic" : "normal")); - props.append (ovl ("color", octave::Utils::toRgb (ui->btn_color->palette (). + m_props.append (ovl ("fontsize", m_ui->sb_font_size->value ())); + m_props.append (ovl ("fontweight", + m_ui->cb_font_bold->isChecked () ? "bold" : "normal")); + m_props.append (ovl ("fontangle", + m_ui->cb_font_italic->isChecked () ? "italic" : "normal")); + m_props.append (ovl ("color", octave::Utils::toRgb (m_ui->btn_color->palette (). color (QPalette::Button)))); // FIXME: only "none" linestyle is selectable, change the code bellow // once more linestyles are added in the UI. - props.append (ovl ("linestyle", "none")); + m_props.append (ovl ("linestyle", "none")); } void annotation_dialog::set_gui_props () { // set the gui to the values from the props - octave_idx_type len = props.length (); + octave_idx_type len = m_props.length (); for (int i=0; i<len/2; i++) { - std::string name = props(i*2).string_value (); + std::string name = m_props(i*2).string_value (); if (name == "textbox") { - Matrix position = props(2*i +1).matrix_value (); + Matrix position = m_props(2*i +1).matrix_value (); int nels = position.numel (); if (nels >= 2) { - ui->sb_x->setValue (position(0)); - ui->sb_y->setValue (position(1)); + m_ui->sb_x->setValue (position(0)); + m_ui->sb_y->setValue (position(1)); } else { - ui->sb_x->setValue (0); - ui->sb_y->setValue (0); + m_ui->sb_x->setValue (0); + m_ui->sb_y->setValue (0); } if (nels >= 4) { - ui->sb_width->setValue (position(2)); - ui->sb_height->setValue (position(3)); + m_ui->sb_width->setValue (position(2)); + m_ui->sb_height->setValue (position(3)); } // FIXME: Should there be an else branch here? // In annotation.m "textbox" is forced to have a 4-elem vector. @@ -199,65 +199,65 @@ else if (name == "string") { // FIXME: handle if is array of strings ? - ui->edit_string->setText (props(2*i +1).string_value ().c_str ()); + m_ui->edit_string->setText (m_props(2*i +1).string_value ().c_str ()); } else if (name == "fitboxtotext") { - ui->cb_fit_box_to_text->setChecked (props(1*i +1).string_value () == "on"); + m_ui->cb_fit_box_to_text->setChecked (m_props(1*i +1).string_value () == "on"); } else if (name == "units") { - ui->cb_units->setCurrentIndex - (ui->cb_units->findText (props(1*i +1).string_value ().c_str ())); + m_ui->cb_units->setCurrentIndex + (m_ui->cb_units->findText (m_props(1*i +1).string_value ().c_str ())); } else if (name == "horizontalalignment") { - ui->cb_horz_align->setCurrentIndex - (ui->cb_horz_align->findText (props(1*i +1).string_value ().c_str ())); + m_ui->cb_horz_align->setCurrentIndex + (m_ui->cb_horz_align->findText (m_props(1*i +1).string_value ().c_str ())); } else if (name == "verticalalignment") { - ui->cb_vert_align->setCurrentIndex - (ui->cb_vert_align->findText (props(1*i +1).string_value ().c_str ())); + m_ui->cb_vert_align->setCurrentIndex + (m_ui->cb_vert_align->findText (m_props(1*i +1).string_value ().c_str ())); } else if (name == "fontname") { - ui->cb_vert_align->setCurrentIndex - (ui->cb_font_name->findText (props(1*i +1).string_value ().c_str ())); + m_ui->cb_vert_align->setCurrentIndex + (m_ui->cb_font_name->findText (m_props(1*i +1).string_value ().c_str ())); } else if (name == "fontsize") { - ui->sb_font_size->setValue (props(1*i +1).float_value ()); + m_ui->sb_font_size->setValue (m_props(1*i +1).float_value ()); } else if (name == "fontweight") { - ui->cb_font_bold->setChecked (props(1*i +1).string_value () == "bold"); + m_ui->cb_font_bold->setChecked (m_props(1*i +1).string_value () == "bold"); } else if (name == "fontangle") { - ui->cb_font_italic->setChecked (props(1*i +1).string_value () == "italic"); + m_ui->cb_font_italic->setChecked (m_props(1*i +1).string_value () == "italic"); } else if (name == "color") { QColor color; - if (props(1*i +1).is_matrix_type ()) - color = octave::Utils::fromRgb (props(2*i +1).matrix_value ()); + if (m_props(1*i +1).is_matrix_type ()) + color = octave::Utils::fromRgb (m_props(2*i +1).matrix_value ()); else - color.setNamedColor (props(2*i +1).string_value ().c_str ()); + color.setNamedColor (m_props(2*i +1).string_value ().c_str ()); if (color.isValid ()) - ui->btn_color->setPalette (QPalette (color)); + m_ui->btn_color->setPalette (QPalette (color)); } } - edit_string_changed (ui->edit_string->text ()); + edit_string_changed (m_ui->edit_string->text ()); } void annotation_dialog::edit_string_changed (const QString& str) { - ui->button_box->button (QDialogButtonBox::Ok)->setEnabled (str.length () > 0); + m_ui->button_box->button (QDialogButtonBox::Ok)->setEnabled (str.length () > 0); } void
--- a/libgui/graphics/annotation-dialog.h Thu Feb 16 14:43:18 2023 -0500 +++ b/libgui/graphics/annotation-dialog.h Thu Feb 16 15:13:35 2023 -0800 @@ -58,8 +58,8 @@ void get_gui_props (); void set_gui_props (); - Ui::annotation_dialog *ui; - octave_value_list props; + Ui::annotation_dialog *m_ui; + octave_value_list m_props; }; #endif
--- a/libgui/graphics/gl-select.cc Thu Feb 16 14:43:18 2023 -0500 +++ b/libgui/graphics/gl-select.cc Thu Feb 16 15:13:35 2023 -0800 @@ -47,12 +47,12 @@ Matrix viewport = get_viewport_scaled (); - if (size > 0) + if (m_size > 0) { - m_glfcns.glTranslatef ((viewport(2) - 2 * (xp - viewport(0))) / size, - (viewport(3) - 2 * (yp - viewport(1))) / size, 0); + m_glfcns.glTranslatef ((viewport(2) - 2 * (m_xp - viewport(0))) / m_size, + (viewport(3) - 2 * (m_yp - viewport(1))) / m_size, 0); - m_glfcns.glScalef (viewport(2) / size, viewport(3) / size, 1.0); + m_glfcns.glScalef (viewport(2) / m_size, viewport(3) / m_size, 1.0); } m_glfcns.glMultMatrixd (p_matrix); @@ -81,8 +81,8 @@ m_glfcns.glEnable (GL_DEPTH_TEST); m_glfcns.glDepthFunc (GL_LEQUAL); - xp = x; - yp = y; + m_xp = x; + m_yp = y; GLuint select_buffer[BUFFER_SIZE]; @@ -90,7 +90,7 @@ m_glfcns.glRenderMode (GL_SELECT); m_glfcns.glInitNames (); - object_map.clear (); + m_object_map.clear (); draw (ax); @@ -117,7 +117,7 @@ if ((flags & select_ignore_hittest) == 0) { - graphics_object go = object_map[name]; + graphics_object go = m_object_map[name]; if (! go.get_properties ().is_hittest ()) candidate = false; @@ -136,12 +136,12 @@ } if (current_name != 0xffffffff) - obj = object_map[current_name]; + obj = m_object_map[current_name]; } else if (hits < 0) warning ("opengl_selector::select: selection buffer overflow"); - object_map.clear (); + m_object_map.clear (); return obj; } @@ -149,9 +149,9 @@ void opengl_selector::draw (const graphics_object& go, bool toplevel) { - GLuint name = object_map.size (); + GLuint name = m_object_map.size (); - object_map[name] = go; + m_object_map[name] = go; m_glfcns.glPushName (name); set_selecting (true); opengl_renderer::draw (go, toplevel);
--- a/libgui/graphics/gl-select.h Thu Feb 16 14:43:18 2023 -0500 +++ b/libgui/graphics/gl-select.h Thu Feb 16 15:13:35 2023 -0800 @@ -44,7 +44,7 @@ { public: opengl_selector (opengl_functions& glfcns) - : opengl_renderer (glfcns), size (5) + : opengl_renderer (glfcns), m_size (5) { } virtual ~opengl_selector () = default; @@ -61,7 +61,7 @@ virtual void setup_opengl_transformation (const axes::properties& props); - virtual void init_marker (const std::string& m, double size, float width); + virtual void init_marker (const std::string& m, double m_size, float width); virtual Matrix render_text (const std::string& txt, double x, double y, double z, @@ -75,13 +75,13 @@ private: // The mouse coordinate of the selection/picking point - int xp, yp; + int m_xp, m_yp; // The size (in pixels) of the picking window - int size; + int m_size; // The OpenGL name mapping - std::map<GLuint, graphics_object> object_map; + std::map<GLuint, graphics_object> m_object_map; }; OCTAVE_END_NAMESPACE(octave)
--- a/libgui/src/dialog.cc Thu Feb 16 14:43:18 2023 -0500 +++ b/libgui/src/dialog.cc Thu Feb 16 15:13:35 2023 -0800 @@ -404,12 +404,12 @@ else view->setSelectionMode (QAbstractItemView::NoSelection); - selector = view->selectionModel (); + m_selector = view->selectionModel (); for (int i = 0; i < initial.count(); i++) { QModelIndex idx = m_model->index (initial.value (i) - 1, 0, QModelIndex ()); - selector->select (idx, QItemSelectionModel::Select); + m_selector->select (idx, QItemSelectionModel::Select); } bool fixed_layout = false; @@ -479,7 +479,7 @@ // Store information about what button was pressed so that builtin // functions can retrieve. - QModelIndexList selected_index = selector->selectedIndexes (); + QModelIndexList selected_index = m_selector->selectedIndexes (); QIntList selected_int; for (int i = 0; i < selected_index.size (); i++) @@ -545,7 +545,7 @@ line_edit->setFixedWidth (intval); } } - input_line << line_edit; + m_input_line << line_edit; #if LINE_EDIT_FOLLOWS_PROMPT promptInputLayout->addWidget (label, i + 1, 0); promptInputLayout->addWidget (line_edit, i + 1, 1); @@ -585,8 +585,8 @@ // functions can retrieve. QStringList string_result; - for (int i = 0; i < input_line.size (); i++) - string_result << input_line.at (i)->text (); + for (int i = 0; i < m_input_line.size (); i++) + string_result << m_input_line.at (i)->text (); emit finish_input (string_result, 1); done (QDialog::Accepted); }
--- a/libgui/src/dialog.h Thu Feb 16 14:43:18 2023 -0500 +++ b/libgui/src/dialog.h Thu Feb 16 15:13:35 2023 -0800 @@ -193,8 +193,6 @@ { Q_OBJECT - QItemSelectionModel *selector; - public: ListDialog (const QStringList& list, @@ -222,14 +220,13 @@ private: QAbstractItemModel *m_model; + QItemSelectionModel *m_selector; }; class InputDialog : public QDialog { Q_OBJECT - QList<QLineEdit *> input_line; - public: InputDialog (const QStringList& prompt, @@ -249,6 +246,10 @@ void buttonCancel_clicked (); void reject (); + +private: + + QList<QLineEdit *> m_input_line; }; class FileDialog : public QFileDialog
--- a/libgui/src/documentation-bookmarks.cc Thu Feb 16 14:43:18 2023 -0500 +++ b/libgui/src/documentation-bookmarks.cc Thu Feb 16 15:13:35 2023 -0800 @@ -81,11 +81,11 @@ this, &documentation_bookmarks::handle_double_click); // Define the icons for the tree view - icon_folder.addPixmap (style ()->standardPixmap(QStyle::SP_DirClosedIcon), + m_icon_folder.addPixmap (style ()->standardPixmap(QStyle::SP_DirClosedIcon), QIcon::Normal, QIcon::Off); - icon_folder.addPixmap (style ()->standardPixmap(QStyle::SP_DirOpenIcon), + m_icon_folder.addPixmap (style ()->standardPixmap(QStyle::SP_DirOpenIcon), QIcon::Normal, QIcon::On); - icon_bookmark.addPixmap (style ()->standardPixmap(QStyle::SP_FileIcon)); + m_icon_bookmark.addPixmap (style ()->standardPixmap(QStyle::SP_FileIcon)); // Setup and read the bookmarkfile QFileInfo f (settings.fileName ()); @@ -190,7 +190,7 @@ new_item->setFlags ((new_item->flags () & (~Qt::ItemIsDropEnabled)) | Qt::ItemIsEditable | Qt::ItemIsDragEnabled); - new_item->setIcon (0, icon_bookmark); + new_item->setIcon (0, m_icon_bookmark); // Insert as top level or child item // TODO: Open dialog allowing to select a target folder if this @@ -234,7 +234,7 @@ | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled); new_folder->setChildIndicatorPolicy (QTreeWidgetItem::DontShowIndicatorWhenChildless); - new_folder->setIcon (0, icon_folder); + new_folder->setIcon (0, m_icon_folder); new_folder->setExpanded (expanded); // Insert as top level or child item
--- a/libgui/src/documentation-bookmarks.h Thu Feb 16 14:43:18 2023 -0500 +++ b/libgui/src/documentation-bookmarks.h Thu Feb 16 15:13:35 2023 -0800 @@ -107,8 +107,8 @@ QTreeWidgetItem *m_ctx_menu_item; - QIcon icon_folder; - QIcon icon_bookmark; + QIcon m_icon_folder; + QIcon m_icon_bookmark; QWidget *m_filter_widget; QCheckBox *m_filter_checkbox;
--- a/libgui/src/variable-editor-model.cc Thu Feb 16 14:43:18 2023 -0500 +++ b/libgui/src/variable-editor-model.cc Thu Feb 16 15:13:35 2023 -0800 @@ -923,7 +923,7 @@ variable_editor_model::variable_editor_model (const QString& expr, const octave_value& val, QObject *parent) - : QAbstractTableModel (parent), rep (create (expr, val)) + : QAbstractTableModel (parent), m_rep (create (expr, val)) { update_description (); @@ -1308,7 +1308,7 @@ int old_rows = display_rows (); int old_cols = display_columns (); - rep->maybe_resize_rows (rows); + m_rep->maybe_resize_rows (rows); int new_rows = display_rows (); int new_cols = display_columns (); @@ -1323,7 +1323,7 @@ int old_rows = display_rows (); int old_cols = display_columns (); - rep->maybe_resize_columns (cols); + m_rep->maybe_resize_columns (cols); int new_rows = display_rows (); int new_cols = display_columns (); @@ -1343,9 +1343,9 @@ void variable_editor_model::reset (const octave_value& val) { - base_ve_model *old_rep = rep; + base_ve_model *old_rep = m_rep; - rep = create (QString::fromStdString (name ()), val); + m_rep = create (QString::fromStdString (name ()), val); delete old_rep; @@ -1376,7 +1376,7 @@ { if (requires_sub_editor (idx)) { - QString name = QString::fromStdString(rep->name ()); + QString name = QString::fromStdString(m_rep->name ()); emit edit_variable_signal (name + subscript_expression (idx), value_at (idx)); }
--- a/libgui/src/variable-editor-model.h Thu Feb 16 14:43:18 2023 -0500 +++ b/libgui/src/variable-editor-model.h Thu Feb 16 15:13:35 2023 -0800 @@ -145,45 +145,45 @@ ~variable_editor_model () { - delete rep; + delete m_rep; } OCTAVE_DISABLE_COPY_MOVE (variable_editor_model) std::string name () const { - return rep->name (); + return m_rep->name (); } bool is_editable () const { - return rep->is_editable (); + return m_rep->is_editable (); } octave_value value_at (const QModelIndex& idx) const { - return rep->value_at (idx); + return m_rep->value_at (idx); } int column_width () const { - return rep->column_width (); + return m_rep->column_width (); } int rowCount (const QModelIndex& idx = QModelIndex ()) const { - return rep->rowCount (idx); + return m_rep->rowCount (idx); } int columnCount (const QModelIndex& idx = QModelIndex ()) const { - return rep->columnCount (idx); + return m_rep->columnCount (idx); } QVariant data (const QModelIndex& idx = QModelIndex (), int role = Qt::DisplayRole) const { - return rep->data (idx, role); + return m_rep->data (idx, role); } bool setData (const QModelIndex& idx, const QVariant& v, @@ -209,38 +209,38 @@ bool requires_sub_editor (const QModelIndex& idx) const { - return rep->requires_sub_editor (idx); + return m_rep->requires_sub_editor (idx); } void set_update_pending (const QModelIndex& idx, const QString& str) { - rep->set_update_pending (idx, str); + m_rep->set_update_pending (idx, str); } bool update_pending (const QModelIndex& idx) const { - return rep->update_pending (idx); + return m_rep->update_pending (idx); } QString update_pending_data (const QModelIndex& idx) const { - return rep->update_pending_data (idx); + return m_rep->update_pending_data (idx); } void clear_update_pending () { - rep->clear_update_pending (); + m_rep->clear_update_pending (); } char quote_char (const QModelIndex& idx) const { - return rep->quote_char (idx); + return m_rep->quote_char (idx); } QVariant headerData (int section, Qt::Orientation orientation, int role) const { - return rep->header_data (section, orientation, role); + return m_rep->header_data (section, orientation, role); } // Return a subscript expression as a string that can be used to @@ -249,27 +249,27 @@ QString subscript_expression (const QModelIndex& idx) const { - return rep->subscript_expression (idx); + return m_rep->subscript_expression (idx); } int display_rows () const { - return rep->display_rows (); + return m_rep->display_rows (); } octave_idx_type data_rows () const { - return rep->data_rows (); + return m_rep->data_rows (); } int display_columns () const { - return rep->display_columns (); + return m_rep->display_columns (); } octave_idx_type data_columns () const { - return rep->data_columns (); + return m_rep->data_columns (); } void maybe_resize_rows (int rows); @@ -309,7 +309,7 @@ private: - base_ve_model *rep; + base_ve_model *m_rep; void init_from_oct (interpreter& interp); @@ -319,7 +319,7 @@ bool is_valid () const { - return rep->is_valid (); + return m_rep->is_valid (); } void change_display_size (int old_rows, int old_cols, @@ -327,7 +327,7 @@ QString make_description_text () const { - return rep->make_description_text (); + return m_rep->make_description_text (); } void reset (const octave_value& val);
--- a/libinterp/corefcn/gzfstream.h Thu Feb 16 14:43:18 2023 -0500 +++ b/libinterp/corefcn/gzfstream.h Thu Feb 16 15:13:35 2023 -0800 @@ -465,11 +465,11 @@ private: // Underlying manipulator function gzofstream& - (*fcn)(gzofstream&, T1, T2); + (*m_fcn)(gzofstream&, T1, T2); // Arguments for manipulator function - T1 val1; - T2 val2; + T1 m_val1; + T2 m_val2; }; // Manipulator function thunks through to stream buffer @@ -486,14 +486,14 @@ gzomanip2<T1, T2>::gzomanip2 (gzofstream &(*f)(gzofstream&, T1, T2), T1 v1, T2 v2) - : fcn(f), val1(v1), val2(v2) + : m_fcn(f), m_val1(v1), m_val2(v2) { } // Insertor applies underlying manipulator function to stream template <typename T1, typename T2> inline gzofstream& operator<<(gzofstream& s, const gzomanip2<T1, T2>& m) -{ return (*m.fcn)(s, m.val1, m.val2); } +{ return (*m.m_fcn)(s, m.m_val1, m.m_val2); } // Insert this onto stream to simplify setting of compression level inline gzomanip2<int, int>
--- a/libinterp/corefcn/load-path.cc Thu Feb 16 14:43:18 2023 -0500 +++ b/libinterp/corefcn/load-path.cc Thu Feb 16 15:13:35 2023 -0800 @@ -233,8 +233,8 @@ load_path::abs_dir_cache_type load_path::s_abs_dir_cache; load_path::load_path (interpreter& interp) - : add_hook ([=] (const std::string& dir) { this->execute_pkg_add (dir); }), -remove_hook ([=] (const std::string& dir) { this->execute_pkg_del (dir); }), + : m_add_hook ([=] (const std::string& dir) { this->execute_pkg_add (dir); }), +m_remove_hook ([=] (const std::string& dir) { this->execute_pkg_del (dir); }), m_interpreter (interp), m_package_map (), m_top_level_package (), m_dir_info_list (), m_init_dirs (), m_command_line_path () { } @@ -317,9 +317,9 @@ // Temporarily disable add hook. unwind_protect frame; - frame.protect_var (add_hook); - - add_hook = nullptr; + frame.protect_var (m_add_hook); + + m_add_hook = nullptr; clear (); @@ -333,8 +333,8 @@ // Why not use const here? Does add_hook change dir_info_list? for (auto& di : m_dir_info_list) { - if (add_hook) - add_hook (di.dir_name); + if (m_add_hook) + m_add_hook (di.dir_name); } // Always prepend current directory. @@ -381,8 +381,8 @@ { retval = true; - if (remove_hook) - remove_hook (dir); + if (m_remove_hook) + m_remove_hook (dir); dir_info& di = *i; @@ -1120,8 +1120,8 @@ add (di, at_end); - if (add_hook) - add_hook (dir); + if (m_add_hook) + m_add_hook (dir); } else if (warn) warning ("addpath: %s: not a directory", dir_arg.c_str ());
--- a/libinterp/corefcn/load-path.h Thu Feb 16 14:43:18 2023 -0500 +++ b/libinterp/corefcn/load-path.h Thu Feb 16 15:13:35 2023 -0800 @@ -171,22 +171,22 @@ std::function<void (const std::string&)> get_add_hook () { - return add_hook; + return m_add_hook; } std::function<void (const std::string&)> get_remove_hook () { - return remove_hook; + return m_remove_hook; } void set_add_hook (const std::function<void (const std::string&)>& f) { - add_hook = f; + m_add_hook = f; } void set_remove_hook (const std::function<void (const std::string&)>& f) { - remove_hook = f; + m_remove_hook = f; } void read_dir_config (const std::string& dir) const; @@ -515,9 +515,9 @@ typedef package_map_type::const_iterator const_package_map_iterator; typedef package_map_type::iterator package_map_iterator; - std::function<void (const std::string&)> add_hook; + std::function<void (const std::string&)> m_add_hook; - std::function<void (const std::string&)> remove_hook; + std::function<void (const std::string&)> m_remove_hook; void execute_pkg_add_or_del (const std::string& dir, const std::string& script_file);
--- a/libinterp/corefcn/oct-stream.cc Thu Feb 16 14:43:18 2023 -0500 +++ b/libinterp/corefcn/oct-stream.cc Thu Feb 16 15:13:35 2023 -0800 @@ -1962,7 +1962,7 @@ short m_return_on_error; bool m_collect_output; - bool multiple_delims_as_one; + bool m_multiple_delims_as_one; bool m_default_exp; octave_idx_type m_lines; @@ -2570,7 +2570,7 @@ m_exp_chars ("edED"), m_header_lines (0), m_treat_as_empty (), m_treat_as_empty_len (0), m_whitespace (" \b\t"), m_eol1 ('\r'), m_eol2 ('\n'), m_return_on_error (1), m_collect_output (false), - multiple_delims_as_one (false), m_default_exp (true), m_lines (0) + m_multiple_delims_as_one (false), m_default_exp (true), m_lines (0) { } octave_value @@ -2644,7 +2644,7 @@ int err = 0; octave_idx_type row = 0; - if (multiple_delims_as_one) // bug #44750? + if (m_multiple_delims_as_one) // bug #44750? skip_delim (is); int done_after; // Number of columns read when EOF seen. @@ -3728,7 +3728,7 @@ } else if (param == "multipledelimsasone") { - multiple_delims_as_one = args(i + m_multiple_delims_as_one = args(i +1).xbool_value ("%s: MultipleDelimsAsOne must be logical or numeric", m_who.c_str ()); } else if (param == "returnonerror") @@ -3963,7 +3963,7 @@ if (c1 == m_eol1 && is.peek_undelim () == m_eol2) is.get (); // if \r\n, skip the \n too. - if (multiple_delims_as_one) + if (m_multiple_delims_as_one) { int prev = -1; // skip multiple delims. @@ -4001,7 +4001,7 @@ is.get_undelim (); } - if (multiple_delims_as_one) + if (m_multiple_delims_as_one) { int prev = -1; // skip multiple delims.
--- a/libinterp/dldfcn/__init_fltk__.cc Thu Feb 16 14:43:18 2023 -0500 +++ b/libinterp/dldfcn/__init_fltk__.cc Thu Feb 16 15:13:35 2023 -0800 @@ -2021,24 +2021,24 @@ typedef std::map<int, plot_window *> window_map; - typedef window_map::iterator wm_iterator;; - - window_map windows; + typedef window_map::iterator wm_iterator; + + window_map m_windows; static std::string fltk_idx_header; void do_close_all () { - for (auto& win : windows) + for (auto& win : m_windows) delete win.second; - windows.clear (); + m_windows.clear (); } void do_new_window (figure::properties& fp) { int idx = figprops2idx (fp); - if (idx >= 0 && windows.find (idx) == windows.end ()) + if (idx >= 0 && m_windows.find (idx) == m_windows.end ()) { Matrix pos = fp.get_outerposition ().matrix_value (); bool internal = false; @@ -2056,35 +2056,35 @@ idx2figprops (curr_index, fp); - windows[curr_index++] = new plot_window (pos(0), pos(1), pos(2), pos(3), + m_windows[curr_index++] = new plot_window (pos(0), pos(1), pos(2), pos(3), fp, internal); } } void do_delete_window (int idx) { - wm_iterator win = windows.find (idx); - - if (win != windows.end ()) + wm_iterator win = m_windows.find (idx); + + if (win != m_windows.end ()) { delete win->second; - windows.erase (win); + m_windows.erase (win); } } void do_renumber_figure (int idx, double new_number) { - wm_iterator win = windows.find (idx); - - if (win != windows.end ()) + wm_iterator win = m_windows.find (idx); + + if (win != m_windows.end ()) win->second->renumber (new_number); } void do_toggle_window_visibility (int idx, bool is_visible) { - wm_iterator win = windows.find (idx); - - if (win != windows.end ()) + wm_iterator win = m_windows.find (idx); + + if (win != m_windows.end ()) { if (is_visible) { @@ -2099,9 +2099,9 @@ void do_toggle_menubar_visibility (int fig_idx, bool menubar_is_figure) { - wm_iterator win = windows.find (fig_idx); - - if (win != windows.end ()) + wm_iterator win = m_windows.find (fig_idx); + + if (win != m_windows.end ()) { if (menubar_is_figure) win->second->show_menubar (); @@ -2114,9 +2114,9 @@ void do_mark_modified (int idx) { - wm_iterator win = windows.find (idx); - - if (win != windows.end ()) + wm_iterator win = m_windows.find (idx); + + if (win != m_windows.end ()) { win->second->mark_modified (); } @@ -2124,9 +2124,9 @@ void do_set_name (int idx) { - wm_iterator win = windows.find (idx); - - if (win != windows.end ()) + wm_iterator win = m_windows.find (idx); + + if (win != m_windows.end ()) win->second->set_name (); } @@ -2134,9 +2134,9 @@ { Matrix sz (1, 2, 0.0); - wm_iterator win = windows.find (idx); - - if (win != windows.end ()) + wm_iterator win = m_windows.find (idx); + + if (win != m_windows.end ()) { sz(0) = win->second->w (); sz(1) = win->second->h (); @@ -2147,18 +2147,18 @@ void do_print (int idx, const std::string& cmd, const std::string& term) { - wm_iterator win = windows.find (idx); - - if (win != windows.end ()) + wm_iterator win = m_windows.find (idx); + + if (win != m_windows.end ()) win->second->print (cmd, term); } uint8NDArray do_get_pixels (int idx) { uint8NDArray retval; - wm_iterator win = windows.find (idx); - - if (win != windows.end ()) + wm_iterator win = m_windows.find (idx); + + if (win != m_windows.end ()) retval = win->second->get_pixels (); return retval; @@ -2166,17 +2166,17 @@ void do_uimenu_update (int idx, const graphics_handle& gh, int id) { - wm_iterator win = windows.find (idx); - - if (win != windows.end ()) + wm_iterator win = m_windows.find (idx); + + if (win != m_windows.end ()) win->second->uimenu_update (gh, id); } void do_update_canvas (int idx, const graphics_handle& ca) { - wm_iterator win = windows.find (idx); - - if (win != windows.end ()) + wm_iterator win = m_windows.find (idx); + + if (win != m_windows.end ()) { if (ca.ok ()) win->second->show_canvas (); @@ -2187,9 +2187,9 @@ void do_update_boundingbox (int idx, bool internal) { - wm_iterator win = windows.find (idx); - - if (win != windows.end ()) + wm_iterator win = m_windows.find (idx); + + if (win != m_windows.end ()) win->second->update_boundingbox (internal); } @@ -2262,7 +2262,7 @@ fltk_graphics_toolkit (octave::interpreter& interp) : octave::base_graphics_toolkit (FLTK_GRAPHICS_TOOLKIT_NAME), - m_interpreter (interp), input_event_hook_fcn_id () + m_interpreter (interp), m_input_event_hook_fcn_id () { Fl::visual (FL_RGB); } @@ -2460,10 +2460,10 @@ { m_interpreter.munlock ("__init_fltk__"); - octave_value_list args = input_event_hook_fcn_id; + octave_value_list args = m_input_event_hook_fcn_id; args.append (false); Fremove_input_event_hook (m_interpreter, args); - input_event_hook_fcn_id = octave_value_list (); + m_input_event_hook_fcn_id = octave_value_list (); figure_manager::close_all (); } @@ -2471,14 +2471,14 @@ void set_input_event_hook_id (const octave_value_list& id) { - input_event_hook_fcn_id = id; + m_input_event_hook_fcn_id = id; } private: octave::interpreter& m_interpreter; - octave_value_list input_event_hook_fcn_id; + octave_value_list m_input_event_hook_fcn_id; }; #endif
--- a/libinterp/dldfcn/audiodevinfo.cc Thu Feb 16 14:43:18 2023 -0500 +++ b/libinterp/dldfcn/audiodevinfo.cc Thu Feb 16 15:13:35 2023 -0800 @@ -303,7 +303,7 @@ { bool found = false; int outin = args(0).int_value (); - int id = args(1).int_value (); + int m_id = args(1).int_value (); std::string arg3 = args(2).string_value (); std::transform (arg3.begin (), arg3.end (), arg3.begin (), tolower); @@ -314,7 +314,7 @@ { for (int i = 0; i < numoutput; i++) { - if (output_id(i).int_value () == id) + if (output_id(i).int_value () == m_id) { found = true; retval = output_driver_version(i); @@ -326,7 +326,7 @@ { for (int i = 0; i < numinput; i++) { - if (input_id(i).int_value () == id) + if (input_id(i).int_value () == m_id) { found = true; retval = input_driver_version(i); @@ -406,12 +406,12 @@ else if (nargin == 5) { int io = args(0).int_value (); - int id = args(1).int_value (); + int m_id = args(1).int_value (); int rate = args(2).int_value (); int bits = args(3).int_value (); int chans = args(4).int_value (); PaStreamParameters stream_parameters; - stream_parameters.device = id; + stream_parameters.device = m_id; stream_parameters.channelCount = chans; PaSampleFormat format = bits_to_format (bits); if (format != 0) @@ -419,10 +419,10 @@ else error ("audiodevinfo: invalid bits per sample format"); - const PaDeviceInfo *device_info = Pa_GetDeviceInfo (id); + const PaDeviceInfo *device_info = Pa_GetDeviceInfo (m_id); if (! device_info) - error ("audiodevinfo: invalid audio device ID = %d", id); + error ("audiodevinfo: invalid audio device ID = %d", m_id); stream_parameters.suggestedLatency = device_info->defaultLowInputLatency; @@ -538,17 +538,17 @@ void init (); void init_fn (); - void set_y (const octave_value& y); + void set_y (const octave_value& m_y); void set_y (octave_function *fcn); void set_y (std::string fcn); Matrix& get_y (); RowVector get_left () const; RowVector get_right () const; - void set_fs (int fs); + void set_fs (int m_fs); int get_fs (); - void set_nbits (int nbits); + void set_nbits (int m_nbits); int get_nbits (); - void set_id (int id); + void set_id (int m_id); int get_id (); int get_channels (); audio_type get_type (); @@ -559,9 +559,9 @@ void set_end_sample (unsigned int sample); unsigned int get_end_sample (); void reset_end_sample (); - void set_tag (const charMatrix& tag); + void set_tag (const charMatrix& m_tag); charMatrix get_tag (); - void set_userdata (const octave_value& userdata); + void set_userdata (const octave_value& m_userdata); octave_value get_userdata (); PaStream * get_stream (); @@ -575,20 +575,20 @@ octave_function *octave_callback_function; private: - int id; - int fs; - int nbits; - int channels; - unsigned int sample_number; - unsigned int end_sample; - charMatrix tag; - Matrix y; - octave_value userdata; - RowVector left; - RowVector right; - PaStream *stream; - PaStreamParameters output_parameters; - audio_type type; + int m_id; + int m_fs; + int m_nbits; + int m_channels; + unsigned int m_sample_number; + unsigned int m_end_sample; + charMatrix m_tag; + Matrix m_y; + octave_value m_userdata; + RowVector m_left; + RowVector m_right; + PaStream *m_stream; + PaStreamParameters m_output_parameters; + audio_type m_type; DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; @@ -734,17 +734,17 @@ for (unsigned long j = 0; j < frames; j++) { - unsigned int sample_number = player->get_sample_number (); - - if (sample_number >= player->get_end_sample ()) + unsigned int m_sample_number = player->get_sample_number (); + + if (m_sample_number >= player->get_end_sample ()) return paComplete; unsigned long offset = j * 2; - buffer[offset+0] = pl[sample_number] * scale_factor; - buffer[offset+1] = pr[sample_number] * scale_factor; - - player->set_sample_number (sample_number + 1); + buffer[offset+0] = pl[m_sample_number] * scale_factor; + buffer[offset+1] = pr[m_sample_number] * scale_factor; + + player->set_sample_number (m_sample_number + 1); } } break; @@ -757,17 +757,17 @@ for (unsigned long j = 0; j < frames; j++) { - unsigned int sample_number = player->get_sample_number (); - - if (sample_number >= player->get_end_sample ()) + unsigned int m_sample_number = player->get_sample_number (); + + if (m_sample_number >= player->get_end_sample ()) return paComplete; unsigned long offset = j * 2; - buffer[offset+0] = pl[sample_number] * scale_factor; - buffer[offset+1] = pr[sample_number] * scale_factor; - - player->set_sample_number (sample_number + 1); + buffer[offset+0] = pl[m_sample_number] * scale_factor; + buffer[offset+1] = pr[m_sample_number] * scale_factor; + + player->set_sample_number (m_sample_number + 1); } } break; @@ -782,13 +782,13 @@ for (unsigned long j = 0; j < frames; j++) { - unsigned int sample_number = player->get_sample_number (); - - if (sample_number >= player->get_end_sample ()) + unsigned int m_sample_number = player->get_sample_number (); + + if (m_sample_number >= player->get_end_sample ()) return paComplete; - int32_t sample_l = pl[sample_number] * scale_factor; - int32_t sample_r = pr[sample_number] * scale_factor; + int32_t sample_l = pl[m_sample_number] * scale_factor; + int32_t sample_r = pr[m_sample_number] * scale_factor; sample_l &= 0x00ffffff; sample_r &= 0x00ffffff; @@ -806,7 +806,7 @@ buffer[offset+4] = _sample_r[1+big_endian]; buffer[offset+5] = _sample_r[2+big_endian]; - player->set_sample_number (sample_number + 1); + player->set_sample_number (m_sample_number + 1); } } break; @@ -821,17 +821,17 @@ for (unsigned long j = 0; j < frames; j++) { - unsigned int sample_number = player->get_sample_number (); - - if (sample_number >= player->get_end_sample ()) + unsigned int m_sample_number = player->get_sample_number (); + + if (m_sample_number >= player->get_end_sample ()) return paComplete; unsigned long offset = j * 2; - buffer[offset+0] = pl[sample_number]; - buffer[offset+1] = pr[sample_number]; - - player->set_sample_number (sample_number + 1); + buffer[offset+0] = pl[m_sample_number]; + buffer[offset+1] = pr[m_sample_number]; + + player->set_sample_number (m_sample_number + 1); } } else if (player->get_type () == TYPE_UINT8) @@ -840,17 +840,17 @@ for (unsigned long j = 0; j < frames; j++) { - unsigned int sample_number = player->get_sample_number (); - - if (sample_number >= player->get_end_sample ()) + unsigned int m_sample_number = player->get_sample_number (); + + if (m_sample_number >= player->get_end_sample ()) return paComplete; unsigned long offset = j * 2; - buffer[offset+0] = pl[sample_number]; - buffer[offset+1] = pr[sample_number]; - - player->set_sample_number (sample_number + 1); + buffer[offset+0] = pl[m_sample_number]; + buffer[offset+1] = pr[m_sample_number]; + + player->set_sample_number (m_sample_number + 1); } } else if (player->get_type () == TYPE_UINT16) @@ -859,17 +859,17 @@ for (unsigned long j = 0; j < frames; j++) { - unsigned int sample_number = player->get_sample_number (); - - if (sample_number >= player->get_end_sample ()) + unsigned int m_sample_number = player->get_sample_number (); + + if (m_sample_number >= player->get_end_sample ()) return paComplete; unsigned long offset = j * 2; - buffer[offset+0] = pl[sample_number]; - buffer[offset+1] = pr[sample_number]; - - player->set_sample_number (sample_number + 1); + buffer[offset+0] = pl[m_sample_number]; + buffer[offset+1] = pr[m_sample_number]; + + player->set_sample_number (m_sample_number + 1); } } @@ -878,9 +878,9 @@ audioplayer::audioplayer () : octave_callback_function (nullptr), - id (-1), fs (0), nbits (16), channels (0), sample_number (0), - end_sample (-1), tag (""), y (), userdata (Matrix ()), - left (), right (), stream (nullptr), output_parameters (), type () + m_id (-1), m_fs (0), m_nbits (16), m_channels (0), m_sample_number (0), + m_end_sample (-1), m_tag (""), m_y (), m_userdata (Matrix ()), + m_left (), m_right (), m_stream (nullptr), m_output_parameters (), m_type () { } audioplayer::~audioplayer () @@ -920,9 +920,9 @@ if (device == -1) device = Pa_GetDefaultOutputDevice (); - output_parameters.device = device; - output_parameters.channelCount = 2; - output_parameters.sampleFormat = bits_to_format (get_nbits ()); + m_output_parameters.device = device; + m_output_parameters.channelCount = 2; + m_output_parameters.sampleFormat = bits_to_format (get_nbits ()); const PaDeviceInfo *device_info = Pa_GetDeviceInfo (device); @@ -930,10 +930,10 @@ warning_with_id ("Octave:invalid-default-audio-device", "invalid default audio device ID = %d", device); - output_parameters.suggestedLatency + m_output_parameters.suggestedLatency = (device_info ? device_info->defaultHighOutputLatency : -1); - output_parameters.hostApiSpecificStreamInfo = nullptr; + m_output_parameters.hostApiSpecificStreamInfo = nullptr; } void @@ -956,17 +956,17 @@ if (device == -1) device = Pa_GetDefaultOutputDevice (); - output_parameters.device = device; - output_parameters.channelCount = 2; - - if (type == TYPE_DOUBLE) - output_parameters.sampleFormat = bits_to_format (get_nbits ()); - else if (type == TYPE_INT8) - output_parameters.sampleFormat = paInt8; - else if (type == TYPE_UINT8) - output_parameters.sampleFormat = paUInt8; - else if (type == TYPE_UINT16) - output_parameters.sampleFormat = paInt16; + m_output_parameters.device = device; + m_output_parameters.channelCount = 2; + + if (m_type == TYPE_DOUBLE) + m_output_parameters.sampleFormat = bits_to_format (get_nbits ()); + else if (m_type == TYPE_INT8) + m_output_parameters.sampleFormat = paInt8; + else if (m_type == TYPE_UINT8) + m_output_parameters.sampleFormat = paUInt8; + else if (m_type == TYPE_UINT16) + m_output_parameters.sampleFormat = paInt16; const PaDeviceInfo *device_info = Pa_GetDeviceInfo (device); @@ -974,34 +974,34 @@ warning_with_id ("Octave:invalid-default-audio-device", "invalid default audio device ID = %d", device); - output_parameters.suggestedLatency + m_output_parameters.suggestedLatency = (device_info ? device_info->defaultHighOutputLatency : -1); - output_parameters.hostApiSpecificStreamInfo = nullptr; + m_output_parameters.hostApiSpecificStreamInfo = nullptr; } void audioplayer::set_y (const octave_value& y_arg) { if (y_arg.is_int8_type ()) - type = TYPE_INT8; + m_type = TYPE_INT8; else if (y_arg.is_uint8_type ()) - type = TYPE_UINT8; + m_type = TYPE_UINT8; else if (y_arg.is_int16_type ()) - type = TYPE_UINT16; + m_type = TYPE_UINT16; else - type = TYPE_DOUBLE; - - y = y_arg.matrix_value (); - - if (y.rows () > 2) - y = y.transpose (); - - channels = y.rows (); - left = y.row (0); - - if (channels == 2) - right = y.row (1); + m_type = TYPE_DOUBLE; + + m_y = y_arg.matrix_value (); + + if (m_y.rows () > 2) + m_y = m_y.transpose (); + + m_channels = m_y.rows (); + m_left = m_y.row (0); + + if (m_channels == 2) + m_right = m_y.row (1); reset_end_sample (); } @@ -1010,134 +1010,134 @@ audioplayer::set_y (octave_function *fcn) { octave_callback_function = fcn; - channels = 2; + m_channels = 2; reset_end_sample (); } Matrix& audioplayer::get_y () { - return y; + return m_y; } RowVector audioplayer::get_left () const { - return left; + return m_left; } RowVector audioplayer::get_right () const { - return channels == 1 ? left : right; + return m_channels == 1 ? m_left : m_right; } void audioplayer::set_fs (int fs_arg) { - fs = fs_arg; + m_fs = fs_arg; } int audioplayer::get_fs () { - return fs; + return m_fs; } void audioplayer::set_nbits (int nbits_arg) { - nbits = nbits_arg; + m_nbits = nbits_arg; } int audioplayer::get_nbits () { - return nbits; + return m_nbits; } void audioplayer::set_id (int id_arg) { - id = id_arg; + m_id = id_arg; } int audioplayer::get_id () { - return id; + return m_id; } int audioplayer::get_channels () { - return channels; + return m_channels; } audio_type audioplayer::get_type () { - return type; + return m_type; } void audioplayer::set_sample_number (unsigned int sample_number_arg) { - sample_number = sample_number_arg; + m_sample_number = sample_number_arg; } unsigned int audioplayer::get_sample_number () { - return sample_number; + return m_sample_number; } unsigned int audioplayer::get_total_samples () { - return left.numel (); + return m_left.numel (); } void audioplayer::set_end_sample (unsigned int end_sample_arg) { - end_sample = end_sample_arg; + m_end_sample = end_sample_arg; } unsigned int audioplayer::get_end_sample () { - return end_sample; + return m_end_sample; } void audioplayer::reset_end_sample () { - set_end_sample (left.numel ()); + set_end_sample (m_left.numel ()); } void audioplayer::set_tag (const charMatrix& tag_arg) { - tag = tag_arg; + m_tag = tag_arg; } charMatrix audioplayer::get_tag () { - return tag; + return m_tag; } void audioplayer::set_userdata (const octave_value& userdata_arg) { - userdata = userdata_arg; + m_userdata = userdata_arg; } octave_value audioplayer::get_userdata () { - return userdata; + return m_userdata; } void @@ -1150,12 +1150,12 @@ OCTAVE_LOCAL_BUFFER (uint32_t, buffer, buffer_size * 2); PaError err; - err = Pa_OpenStream (&stream, nullptr, &(output_parameters), get_fs (), + err = Pa_OpenStream (&m_stream, nullptr, &(m_output_parameters), get_fs (), buffer_size, paClipOff, nullptr, nullptr); if (err != paNoError) error ("audioplayer: unable to open audio playback stream"); - err = Pa_StartStream (stream); + err = Pa_StartStream (m_stream); if (err != paNoError) error ("audioplayer: unable to start audio playback stream"); @@ -1174,7 +1174,7 @@ else portaudio_play_callback (nullptr, buffer, buffer_size, nullptr, 0, this); - err = Pa_WriteStream (stream, buffer, buffer_size); + err = Pa_WriteStream (m_stream, buffer, buffer_size); } } @@ -1188,18 +1188,18 @@ PaError err; if (octave_callback_function != nullptr) - err = Pa_OpenStream (&stream, nullptr, &(output_parameters), + err = Pa_OpenStream (&m_stream, nullptr, &(m_output_parameters), get_fs (), buffer_size, paClipOff, octave_play_callback, this); else - err = Pa_OpenStream (&stream, nullptr, &(output_parameters), + err = Pa_OpenStream (&m_stream, nullptr, &(m_output_parameters), get_fs (), buffer_size, paClipOff, portaudio_play_callback, this); if (err != paNoError) error ("audioplayer: failed to open audio playback stream"); - err = Pa_StartStream (stream); + err = Pa_StartStream (m_stream); if (err != paNoError) error ("audioplayer: failed to start audio playback stream"); } @@ -1211,7 +1211,7 @@ return; PaError err; - err = Pa_StopStream (stream); + err = Pa_StopStream (m_stream); if (err != paNoError) error ("audioplayer: failed to stop audio playback stream"); } @@ -1223,7 +1223,7 @@ return; PaError err; - err = Pa_StartStream (stream); + err = Pa_StartStream (m_stream); if (err != paNoError) error ("audioplayer: failed to start audio playback stream"); } @@ -1231,7 +1231,7 @@ PaStream * audioplayer::get_stream () { - return stream; + return m_stream; } void @@ -1254,7 +1254,7 @@ if (err != paNoError) error ("audioplayer: failed to close audio playback stream"); - stream = nullptr; + m_stream = nullptr; } bool @@ -1264,7 +1264,7 @@ return false; PaError err; - err = Pa_IsStreamActive (stream); + err = Pa_IsStreamActive (m_stream); if (err != 0 && err != 1) error ("audioplayer: checking stream activity status failed"); @@ -1289,14 +1289,14 @@ bool print_as_scalar () const { return true; } void init (); - void set_fs (int fs); + void set_fs (int m_fs); int get_fs (); - void set_nbits (int nbits); + void set_nbits (int m_nbits); int get_nbits (); PaSampleFormat get_sampleFormat (); - void set_id (int id); + void set_id (int m_id); int get_id (); - void set_channels (int channels); + void set_channels (int m_channels); int get_channels (); audio_type get_type (); @@ -1306,9 +1306,9 @@ void set_end_sample (unsigned int sample); unsigned int get_end_sample (); void reset_end_sample (); - void set_tag (const charMatrix& tag); + void set_tag (const charMatrix& m_tag); charMatrix get_tag (); - void set_userdata (const octave_value& userdata); + void set_userdata (const octave_value& m_userdata); octave_value get_userdata (); PaStream * get_stream (); @@ -1326,20 +1326,20 @@ octave_function *octave_callback_function; private: - int id; - int fs; - int nbits; - int channels; - unsigned int sample_number; - unsigned int end_sample; - charMatrix tag; - Matrix y; - octave_value userdata; - std::vector<float> left; - std::vector<float> right; - PaStream *stream; - PaStreamParameters input_parameters; - audio_type type; + int m_id; + int m_fs; + int m_nbits; + int m_channels; + unsigned int m_sample_number; + unsigned int m_end_sample; + charMatrix m_tag; + Matrix m_y; + octave_value m_userdata; + std::vector<float> m_left; + std::vector<float> m_right; + PaStream *m_stream; + PaStreamParameters m_input_parameters; + audio_type m_type; DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; @@ -1356,7 +1356,7 @@ if (! recorder) error ("audiorecorder callback function called without recorder"); - int channels = recorder->get_channels (); + int m_channels = recorder->get_channels (); Matrix sound (frames, 2); sound.resize (frames, 2); @@ -1369,8 +1369,8 @@ for (unsigned long i = 0; i < frames; i++) { - float sample_l = input8[i*channels] / scale_factor; - float sample_r = input8[i*channels + (channels - 1)] / scale_factor; + float sample_l = input8[i*m_channels] / scale_factor; + float sample_r = input8[i*m_channels + (m_channels - 1)] / scale_factor; sound(i, 0) = sample_l; sound(i, 1) = sample_r; @@ -1388,8 +1388,8 @@ for (unsigned long i = 0; i < frames; i++) { - float sample_l = (input16[i*channels] >> 8) / scale_factor; - float sample_r = (input16[i*channels + (channels - 1)] >> 8) + float sample_l = (input16[i*m_channels] >> 8) / scale_factor; + float sample_r = (input16[i*m_channels + (m_channels - 1)] >> 8) / scale_factor; sound(i, 0) = sample_l; @@ -1404,8 +1404,8 @@ for (unsigned long i = 0; i < frames; i++) { - float sample_l = input16[i*channels] / scale_factor; - float sample_r = input16[i*channels + (channels - 1)] / scale_factor; + float sample_l = input16[i*m_channels] / scale_factor; + float sample_r = input16[i*m_channels + (m_channels - 1)] / scale_factor; sound(i, 0) = sample_l; sound(i, 1) = sample_r; @@ -1429,8 +1429,8 @@ sample_l32 = sample_r32 = 0; for (int j = 0; j < 3; j++) { - sample_l[j] = input24[i*channels*3 + j]; - sample_r[j] = input24[i*channels*3 + (channels - 1)*3 + j]; + sample_l[j] = input24[i*m_channels*3 + j]; + sample_r[j] = input24[i*m_channels*3 + (m_channels - 1)*3 + j]; } if (sample_l32 & 0x00800000) @@ -1462,7 +1462,7 @@ if (! recorder) error ("audiorecorder callback function called without recorder"); - int channels = recorder->get_channels (); + int m_channels = recorder->get_channels (); if (recorder->get_sampleFormat () == bits_to_format (8)) { @@ -1472,8 +1472,8 @@ for (unsigned long i = 0; i < frames; i++) { - float sample_l = input8[i*channels] / scale_factor; - float sample_r = input8[i*channels + (channels - 1)] / scale_factor; + float sample_l = input8[i*m_channels] / scale_factor; + float sample_r = input8[i*m_channels + (m_channels - 1)] / scale_factor; recorder->append (sample_l, sample_r); } @@ -1490,8 +1490,8 @@ for (unsigned long i = 0; i < frames; i++) { - float sample_l = (input16[i*channels] >> 8) / scale_factor; - float sample_r = (input16[i*channels + (channels - 1)] >> 8) + float sample_l = (input16[i*m_channels] >> 8) / scale_factor; + float sample_r = (input16[i*m_channels + (m_channels - 1)] >> 8) / scale_factor; recorder->append (sample_l, sample_r); @@ -1505,8 +1505,8 @@ for (unsigned long i = 0; i < frames; i++) { - float sample_l = input16[i*channels] / scale_factor; - float sample_r = input16[i*channels + (channels - 1)] / scale_factor; + float sample_l = input16[i*m_channels] / scale_factor; + float sample_r = input16[i*m_channels + (m_channels - 1)] / scale_factor; recorder->append (sample_l, sample_r); } @@ -1529,8 +1529,8 @@ sample_l32 = sample_r32 = 0; for (int j = 0; j < 3; j++) { - sample_l[j] = input24[i*channels*3 + j]; - sample_r[j] = input24[i*channels*3 + (channels - 1)*3 + j]; + sample_l[j] = input24[i*m_channels*3 + j]; + sample_r[j] = input24[i*m_channels*3 + (m_channels - 1)*3 + j]; } if (sample_l32 & 0x00800000) @@ -1552,9 +1552,9 @@ audiorecorder::audiorecorder () : octave_callback_function (nullptr), - id (-1), fs (8000), nbits (8), channels (1), sample_number (0), - end_sample (-1), tag (""), y (), userdata (Matrix ()), - left (), right (), stream (nullptr), input_parameters (), type () + m_id (-1), m_fs (8000), m_nbits (8), m_channels (1), m_sample_number (0), + m_end_sample (-1), m_tag (""), m_y (), m_userdata (Matrix ()), + m_left (), m_right (), m_stream (nullptr), m_input_parameters (), m_type () { } audiorecorder::~audiorecorder () @@ -1594,15 +1594,15 @@ if (device == -1) device = Pa_GetDefaultInputDevice (); - input_parameters.device = device; - input_parameters.channelCount = get_channels (); - input_parameters.sampleFormat = bits_to_format (get_nbits ()); + m_input_parameters.device = device; + m_input_parameters.channelCount = get_channels (); + m_input_parameters.sampleFormat = bits_to_format (get_nbits ()); // FIXME: This is a workaround for a bug in PortAudio affecting 8-Bit // recording (see Octave bug #44305). // Remove this clause once the bug in PortAudio has been fixed. if (get_nbits () == 8) - input_parameters.sampleFormat = bits_to_format (16); + m_input_parameters.sampleFormat = bits_to_format (16); const PaDeviceInfo *device_info = Pa_GetDeviceInfo (device); @@ -1610,52 +1610,52 @@ warning_with_id ("Octave:invalid-default-audio-device", "invalid default audio device ID = %d", device); - input_parameters.suggestedLatency + m_input_parameters.suggestedLatency = (device_info ? device_info->defaultHighInputLatency : -1); - input_parameters.hostApiSpecificStreamInfo = nullptr; + m_input_parameters.hostApiSpecificStreamInfo = nullptr; } void audiorecorder::set_fs (int fs_arg) { - fs = fs_arg; + m_fs = fs_arg; } int audiorecorder::get_fs () { - return fs; + return m_fs; } void audiorecorder::set_nbits (int nbits_arg) { - nbits = nbits_arg; + m_nbits = nbits_arg; } int audiorecorder::get_nbits () { - return nbits; + return m_nbits; } PaSampleFormat audiorecorder::get_sampleFormat () { - return input_parameters.sampleFormat; + return m_input_parameters.sampleFormat; } void audiorecorder::set_id (int id_arg) { - id = id_arg; + m_id = id_arg; } int audiorecorder::get_id () { - return id; + return m_id; } void @@ -1664,79 +1664,79 @@ if (channels_arg != 1 && channels_arg != 2) error ("audiorecorder: number of channels must be 1 or 2"); - channels = channels_arg; + m_channels = channels_arg; } int audiorecorder::get_channels () { - return channels; + return m_channels; } audio_type audiorecorder::get_type () { - return type; + return m_type; } void audiorecorder::set_sample_number (unsigned int sample_number_arg) { - sample_number = sample_number_arg; + m_sample_number = sample_number_arg; } unsigned int audiorecorder::get_sample_number () { - return sample_number; + return m_sample_number; } unsigned int audiorecorder::get_total_samples () { - return left.size (); + return m_left.size (); } void audiorecorder::set_end_sample (unsigned int end_sample_arg) { - end_sample = end_sample_arg; + m_end_sample = end_sample_arg; } unsigned int audiorecorder::get_end_sample () { - return end_sample; + return m_end_sample; } void audiorecorder::reset_end_sample () { - set_end_sample (left.size ()); + set_end_sample (m_left.size ()); } void audiorecorder::set_tag (const charMatrix& tag_arg) { - tag = tag_arg; + m_tag = tag_arg; } charMatrix audiorecorder::get_tag () { - return tag; + return m_tag; } void audiorecorder::set_userdata (const octave_value& userdata_arg) { - userdata = userdata_arg; + m_userdata = userdata_arg; } octave_value audiorecorder::get_userdata () { - return userdata; + return m_userdata; } octave_value @@ -1744,13 +1744,13 @@ { // Must get size before entering loop as the value of left.size() may change // during loop with simultaneous recording and playback (bug #50674). - unsigned int ls = left.size (); + unsigned int ls = m_left.size (); Matrix audio (2, ls); for (unsigned int i = 0; i < ls; i++) { - audio(0, i) = left[i]; - audio(1, i) = right[i]; + audio(0, i) = m_left[i]; + audio(1, i) = m_right[i]; } return audio; @@ -1776,7 +1776,7 @@ return false; PaError err; - err = Pa_IsStreamActive (stream); + err = Pa_IsStreamActive (m_stream); if (err != 0 && err != 1) error ("audiorecorder: checking stream activity status failed"); @@ -1789,28 +1789,28 @@ if (get_stream ()) stop (); - left.clear (); - right.clear (); + m_left.clear (); + m_right.clear (); const unsigned int buffer_size = get_fs () / 20; PaError err; if (octave_callback_function != nullptr) { - err = Pa_OpenStream (&stream, &(input_parameters), nullptr, + err = Pa_OpenStream (&m_stream, &(m_input_parameters), nullptr, get_fs (), buffer_size, paClipOff, octave_record_callback, this); } else { - err = Pa_OpenStream (&stream, &(input_parameters), nullptr, + err = Pa_OpenStream (&m_stream, &(m_input_parameters), nullptr, get_fs (), buffer_size, paClipOff, portaudio_record_callback, this); } if (err != paNoError) error ("audiorecorder: unable to open audio recording stream"); - err = Pa_StartStream (stream); + err = Pa_StartStream (m_stream); if (err != paNoError) error ("audiorecorder: unable to start audio recording stream"); } @@ -1821,19 +1821,19 @@ if (get_stream ()) stop (); - left.clear (); - right.clear (); + m_left.clear (); + m_right.clear (); const unsigned int buffer_size = get_fs () / 20; OCTAVE_LOCAL_BUFFER (uint8_t, buffer, buffer_size * 2 * 3); PaError err; - err = Pa_OpenStream (&stream, &(input_parameters), nullptr, + err = Pa_OpenStream (&m_stream, &(m_input_parameters), nullptr, get_fs (), buffer_size, paClipOff, nullptr, this); if (err != paNoError) error ("audiorecorder: unable to open audio recording stream"); - err = Pa_StartStream (stream); + err = Pa_StartStream (m_stream); if (err != paNoError) error ("audiorecorder: unable to start audio recording stream"); @@ -1861,7 +1861,7 @@ return; PaError err; - err = Pa_StopStream (stream); + err = Pa_StopStream (m_stream); if (err != paNoError) error ("audiorecorder: unable to stop audio recording stream"); } @@ -1873,7 +1873,7 @@ return; PaError err; - err = Pa_StartStream (stream); + err = Pa_StartStream (m_stream); if (err != paNoError) error ("audiorecorder: unable to start audio recording stream"); } @@ -1892,27 +1892,27 @@ error ("audioplayer: unable to stop audio playback stream"); } - err = Pa_CloseStream (stream); + err = Pa_CloseStream (m_stream); if (err != paNoError) error ("audiorecorder: unable to close audio recording stream"); set_sample_number (0); reset_end_sample (); - stream = nullptr; + m_stream = nullptr; } void audiorecorder::append (float sample_l, float sample_r) { - left.push_back (sample_l); - right.push_back (sample_r); + m_left.push_back (sample_l); + m_right.push_back (sample_r); set_sample_number (get_sample_number () + 1); } PaStream * audiorecorder::get_stream () { - return stream; + return m_stream; } #endif @@ -2359,18 +2359,18 @@ if (args.length () > 2) { // FIXME: Should be able to support 32-bit streams (bug #57939) - int nbits = args(2).int_value (); - if (nbits != 8 && nbits != 16 && nbits != 24) + int m_nbits = args(2).int_value (); + if (m_nbits != 8 && m_nbits != 16 && m_nbits != 24) error ("audioplayer: NBITS must be 8, 16, or 24"); switch (args.length ()) { case 3: - recorder->set_nbits (nbits); + recorder->set_nbits (m_nbits); break; case 4: - recorder->set_nbits (nbits); + recorder->set_nbits (m_nbits); recorder->set_id (args(3).int_value ()); break; }
--- a/libinterp/octave-value/ov-class.cc Thu Feb 16 14:43:18 2023 -0500 +++ b/libinterp/octave-value/ov-class.cc Thu Feb 16 15:13:35 2023 -0800 @@ -74,7 +74,7 @@ octave_class::octave_class (const octave_map& m, const std::string& id, const octave_value_list& parents) - : octave_base_value (), m_map (m), c_name (id), m_obsolete_copies (0) + : octave_base_value (), m_map (m), m_c_name (id), m_obsolete_copies (0) { octave_idx_type n = parents.length (); @@ -418,7 +418,7 @@ } else retval(0) = octave_value (m_map.index (idx.front ()), - c_name, m_parent_list); + m_c_name, m_parent_list); } break; @@ -495,7 +495,7 @@ else { if (type.length () == 1 && type[0] == '(') - retval(0) = octave_value (m_map.index (idx.front ()), c_name, + retval(0) = octave_value (m_map.index (idx.front ()), m_c_name, m_parent_list); else err_invalid_index1 (); @@ -841,7 +841,7 @@ class_name ().c_str ()); octave_value_list args; - args(0) = octave_value (new octave_class (m_map, c_name, m_parent_list)); + args(0) = octave_value (new octave_class (m_map, m_c_name, m_parent_list)); octave_value_list tmp = interp.feval (meth.function_value (), args, 1); @@ -1010,7 +1010,7 @@ error ("no char method defined for class %s", class_name ().c_str ()); octave_value_list args; - args(0) = octave_value (new octave_class (m_map, c_name, m_parent_list)); + args(0) = octave_value (new octave_class (m_map, m_c_name, m_parent_list)); octave_value_list tmp = interp.feval (meth.function_value (), args, 1); @@ -1048,7 +1048,7 @@ bool retval = false; octave_class::exemplar_const_iterator it - = octave_class::exemplar_map.find (c_name); + = octave_class::exemplar_map.find (m_c_name); if (it != octave_class::exemplar_map.end ()) retval = true; @@ -1058,7 +1058,7 @@ octave::symbol_table& symtab = interp.get_symbol_table (); - octave_value ctor = symtab.find_method (c_name, c_name); + octave_value ctor = symtab.find_method (m_c_name, m_c_name); bool have_ctor = false; @@ -1066,7 +1066,7 @@ { octave_function *fcn = ctor.function_value (); - if (fcn && fcn->is_class_constructor (c_name)) + if (fcn && fcn->is_class_constructor (m_c_name)) have_ctor = true; // Something has gone terribly wrong if @@ -1102,7 +1102,7 @@ retval = true; } else - warning ("no constructor for class %s", c_name.c_str ()); + warning ("no constructor for class %s", m_c_name.c_str ()); } return retval; @@ -1148,7 +1148,7 @@ if (might_have_inheritance) { octave_class::exemplar_const_iterator it - = octave_class::exemplar_map.find (c_name); + = octave_class::exemplar_map.find (m_c_name); if (it == octave_class::exemplar_map.end ()) retval = false; @@ -1247,7 +1247,7 @@ if (! is) error ("load: failed to load class"); - c_name = classname; + m_c_name = classname; reconstruct_exemplar (); m_map = m; @@ -1270,7 +1270,7 @@ else if (len == 0) { m_map = octave_map (dim_vector (1, 1)); - c_name = classname; + m_c_name = classname; } else panic_impossible (); @@ -1340,7 +1340,7 @@ classname[classname_len] = '\0'; if (! is.read (reinterpret_cast<char *> (classname), classname_len)) return false; - c_name = classname; + m_c_name = classname; } reconstruct_exemplar (); @@ -1383,7 +1383,7 @@ octave::load_path& lp = interp.get_load_path (); - if (lp.find_method (c_name, "loadobj") != "") + if (lp.find_method (m_c_name, "loadobj") != "") { octave_value in = new octave_class (*this); octave_value_list tmp = interp.feval ("loadobj", in, 1); @@ -1434,7 +1434,7 @@ goto error_cleanup; // Add the class name to the group - type_hid = H5Tcopy (H5T_C_S1); H5Tset_size (type_hid, c_name.length () + 1); + type_hid = H5Tcopy (H5T_C_S1); H5Tset_size (type_hid, m_c_name.length () + 1); if (type_hid < 0) goto error_cleanup; @@ -1452,7 +1452,7 @@ #endif if (class_hid < 0 || H5Dwrite (class_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT, - c_name.c_str ()) < 0) + m_c_name.c_str ()) < 0) goto error_cleanup; #if defined (HAVE_HDF5_18) @@ -1600,7 +1600,7 @@ H5Dclose (data_hid); data_hid = -1; - c_name = classname; + m_c_name = classname; } while (0); reconstruct_exemplar (); @@ -1636,7 +1636,7 @@ octave::load_path& lp = interp.get_load_path (); - if (lp.find_method (c_name, "loadobj") != "") + if (lp.find_method (m_c_name, "loadobj") != "") { octave_value in = new octave_class (*this); octave_value_list tmp = interp.feval ("loadobj", in, 1);
--- a/libinterp/octave-value/ov-class.h Thu Feb 16 14:43:18 2023 -0500 +++ b/libinterp/octave-value/ov-class.h Thu Feb 16 15:13:35 2023 -0800 @@ -56,18 +56,18 @@ public: octave_class () - : octave_base_value (), m_map (), c_name (), + : octave_base_value (), m_map (), m_c_name (), m_parent_list (), m_obsolete_copies (0) { } octave_class (const octave_map& m, const std::string& id) - : octave_base_value (), m_map (m), c_name (id), + : octave_base_value (), m_map (m), m_c_name (id), m_parent_list (), m_obsolete_copies (0) { } octave_class (const octave_map& m, const std::string& id, const std::list<std::string>& plist) - : octave_base_value (), m_map (m), c_name (id), + : octave_base_value (), m_map (m), m_c_name (id), m_parent_list (plist), m_obsolete_copies (0) { } @@ -75,7 +75,7 @@ const octave_value_list& parents); octave_class (const octave_class& s) - : octave_base_value (s), m_map (s.m_map), c_name (s.c_name), + : octave_base_value (s), m_map (s.m_map), m_c_name (s.m_c_name), m_parent_list (s.m_parent_list), m_obsolete_copies (0) { } ~octave_class () = default; @@ -86,7 +86,7 @@ octave_base_value * empty_clone () const { - return new octave_class (octave_map (m_map.keys ()), c_name, m_parent_list); + return new octave_class (octave_map (m_map.keys ()), m_c_name, m_parent_list); } void break_closure_cycles (const std::shared_ptr<octave::stack_frame>& frame); @@ -222,7 +222,7 @@ public: int type_id () const { return t_id; } std::string type_name () const { return t_name; } - std::string class_name () const { return c_name; } + std::string class_name () const { return m_c_name; } static int static_type_id () { return t_id; } static std::string static_type_name () { return t_name; } @@ -233,7 +233,7 @@ static int t_id; static const std::string t_name; - std::string c_name; + std::string m_c_name; std::list<std::string> m_parent_list; OCTINTERP_API bool in_class_method ();
--- a/libinterp/parse-tree/pt-decl.cc Thu Feb 16 14:43:18 2023 -0500 +++ b/libinterp/parse-tree/pt-decl.cc Thu Feb 16 15:13:35 2023 -0800 @@ -45,7 +45,7 @@ // Declarations (global, static, etc.). tree_decl_elt::tree_decl_elt (tree_identifier *i, tree_expression *e) - : type (unknown), m_id (i), m_expr (e) + : m_type (unknown), m_id (i), m_expr (e) { if (! m_id) error ("tree_decl_elt: invalid ID");
--- a/libinterp/parse-tree/pt-decl.h Thu Feb 16 14:43:18 2023 -0500 +++ b/libinterp/parse-tree/pt-decl.h Thu Feb 16 15:13:35 2023 -0800 @@ -75,11 +75,11 @@ return m_id->lvalue (tw); } - void mark_global () { type = global; } - bool is_global () const { return type == global; } + void mark_global () { m_type = global; } + bool is_global () const { return m_type == global; } - void mark_persistent () { type = persistent; } - bool is_persistent () const { return type == persistent; } + void mark_persistent () { m_type = persistent; } + bool is_persistent () const { return m_type == persistent; } tree_identifier * ident () { return m_id; } @@ -96,7 +96,7 @@ private: - decl_type type; + decl_type m_type; // An identifier to tag with the declared property. tree_identifier *m_id;
--- a/liboctave/util/cmd-edit.cc Thu Feb 16 14:43:18 2023 -0500 +++ b/liboctave/util/cmd-edit.cc Thu Feb 16 15:13:35 2023 -0800 @@ -237,7 +237,7 @@ char_is_quoted_fcn m_char_is_quoted_function; - user_accept_line_fcn user_accept_line_function; + user_accept_line_fcn m_user_accept_line_function; static std::string s_completer_quote_characters; }; @@ -249,7 +249,7 @@ m_previous_pre_input_hook (nullptr), m_previous_event_hook (nullptr), m_completion_function (nullptr), m_quoting_function (nullptr), m_dequoting_function (nullptr), - m_char_is_quoted_function (nullptr), user_accept_line_function (nullptr) + m_char_is_quoted_function (nullptr), m_user_accept_line_function (nullptr) { // FIXME: need interface to rl_add_defun, rl_initialize, and // a function to set rl_terminal_name @@ -479,7 +479,7 @@ void gnu_readline::do_set_user_accept_line_function (user_accept_line_fcn f) { - user_accept_line_function = f; + m_user_accept_line_function = f; if (f) octave_rl_add_defun ("accept-line", gnu_readline::command_accept_line, @@ -516,7 +516,7 @@ gnu_readline::user_accept_line_fcn gnu_readline::do_get_user_accept_line_function () const { - return user_accept_line_function; + return m_user_accept_line_function; } // True if the last "word" of the string line (delimited by delim) is
--- a/liboctave/util/cmd-hist.cc Thu Feb 16 14:43:18 2023 -0500 +++ b/liboctave/util/cmd-hist.cc Thu Feb 16 15:13:35 2023 -0800 @@ -62,7 +62,7 @@ public: gnu_history () - : command_history (), mark (0) { } + : command_history (), m_mark (0) { } ~gnu_history () = default; @@ -116,7 +116,7 @@ private: - int mark; + int m_mark; }; void @@ -273,15 +273,15 @@ void gnu_history::do_set_mark (int n) { - mark = n; + m_mark = n; } int gnu_history::do_goto_mark () { - if (mark) + if (m_mark) { - char *line = ::octave_history_goto_mark (mark); + char *line = ::octave_history_goto_mark (m_mark); if (line) { @@ -291,7 +291,7 @@ } } - mark = 0; + m_mark = 0; // FIXME: for operate_and_get_next. command_editor::remove_startup_hook (command_history::goto_mark);