Mercurial > octave

diff libgui/src/settings-dialog.cc @ 27102:84ff9953faa1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
where possible, eliminate octave:: namespace qualifier inside octave namespace Affected files: file-editor-tab.cc, file-editor.cc, main-window.cc, octave-cmd.h, octave-qt-link.cc, settings-dialog.cc, call-stack.cc, environment.cc, ft-text-renderer.cc, gl2ps-print.cc, help.cc, input.cc, interpreter-private.cc, interpreter-private.h, interpreter.cc, load-path.cc, oct-hist.cc, oct-process.cc, oct-stream.cc, pager.cc, syminfo.cc, symtab.h, sysdep.cc, text-renderer.cc, utils.cc, gzip.cc, cdef-manager.cc, ov-fcn-handle.cc, ov-java.cc, jit-typeinfo.cc, oct-parse.yy, pt-eval.cc, pt-tm-const.cc, chol.cc, gsvd.cc, oct-rand.cc, oct-rand.h, randmtzig.cc, randpoisson.cc, file-ops.cc, lo-sysdep.cc, file-info.cc, oct-glob.cc, oct-sparse.cc, and url-transfer.cc.
author John W. Eaton <jwe@octave.org>
date Wed, 22 May 2019 13:57:30 +0000
parents b38807a23fd2
children 7455523fdf01
line wrap: on
line diff
--- a/libgui/src/settings-dialog.cc	Tue May 21 19:50:59 2019 +0000
+++ b/libgui/src/settings-dialog.cc	Wed May 22 13:57:30 2019 +0000
@@ -496,7 +496,7 @@
     read_lexer_settings (lexer, settings);
     delete lexer;
 
-    lexer = new octave::octave_txt_lexer ();
+    lexer = new octave_txt_lexer ();
     read_lexer_settings (lexer, settings);
     delete lexer;
 
@@ -996,7 +996,7 @@
     write_lexer_settings (lexer, settings);
     delete lexer;
 
-    lexer = new octave::octave_txt_lexer ();
+    lexer = new octave_txt_lexer ();
     write_lexer_settings (lexer, settings);
     delete lexer;
 
@@ -1163,8 +1163,8 @@
 
   void settings_dialog::read_varedit_colors (QSettings *settings)
   {
-    QList<QColor> default_colors = octave::variable_editor::default_colors ();
-    QStringList class_names = octave::variable_editor::color_names ();
+    QList<QColor> default_colors = variable_editor::default_colors ();
+    QStringList class_names = variable_editor::color_names ();
     QString class_chars = resource_manager::varedit_color_chars ();
     int nr_of_classes = class_chars.length ();