Mercurial > octave

diff libgui/src/gui-settings.cc @ 33636:3ec6fcce7715 default tip @

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gui: Avoid using HAVE_QSCINTILLA in more header files. * gui-settings.h, settings-dialog.h: Don't include QScintilla header. Forward-declare QSciLexer class instead if necessary. Declare all member functions unconditionally. * gui-settings.cc (gui_settings::get_valid_lexer_styles, gui_settings::read_lexer_settings), settings-dialog.cc (settings_dialog::update_lexer, settings_dialog::get_lexer_settings, settings_dialog::write_lexer_settings): Define functions unconditionally. * gui-preferences-ed.h: Don't include QScintilla header. Remove definition of local variable os_eol_mode from header. * gui-preferences-ed.cc (os_eol_mode): Move definition of local variable here.
author Markus Mützel <markus.muetzel@gmx.de>
date Tue, 28 May 2024 14:54:58 +0200
parents d3effbb99fa3
children
line wrap: on
line diff
--- a/libgui/src/gui-settings.cc	Mon May 27 19:20:49 2024 -0600
+++ b/libgui/src/gui-settings.cc	Tue May 28 14:54:58 2024 +0200
@@ -52,6 +52,10 @@
 #include <QStringList>
 #include <QTranslator>
 
+#if defined (HAVE_QSCINTILLA)
+#  include <Qsci/qscilexer.h>
+#endif
+
 #include "gui-preferences-cs.h"
 #include "gui-preferences-ed.h"
 #include "gui-preferences-sc.h"
@@ -459,10 +463,10 @@
     }
 }
 
-#if defined (HAVE_QSCINTILLA)
 int
 gui_settings::get_valid_lexer_styles (QsciLexer *lexer, int *styles)
 {
+#if defined (HAVE_QSCINTILLA)
   int max_style = 0;
   int actual_style = 0;
   while (actual_style < ed_max_style_number && max_style < ed_max_lexer_styles)
@@ -471,9 +475,17 @@
         styles[max_style++] = actual_style;
       actual_style++;
     }
+
   return max_style;
+#else
+  octave_unused_parameter (lexer);
+  octave_unused_parameter (styles);
+
+  return 0;
+#endif
 }
 
+#if defined (HAVE_QSCINTILLA)
 /*!
  * Copys the attributes bold, italic and underline from QFont
  * @p attr to the font @p base and returns the result without
@@ -492,10 +504,12 @@
 
   return dest;
 }
+#endif
 
 void
 gui_settings::read_lexer_settings (QsciLexer *lexer, int mode, int def)
 {
+#if defined (HAVE_QSCINTILLA)
   // Test whether the settings for lexer is already contained in the
   // given gui settings file. If yes, load them, if not copy them from the
   // default settings file.
@@ -560,8 +574,14 @@
       const std::string group_str = group.toStdString ();
       lexer->readSettings (*this, group_str.c_str ());
     }
+#else
+  octave_unused_parameter (lexer);
+  octave_unused_parameter (mode);
+  octave_unused_parameter (dev);
+
+  return;
+#endif
 }
-#endif
 
 bool
 gui_settings::update_settings_key (const QString& old_key,