Mercurial > octave
changeset 27671:61883a1a80a1
don't include gui-preferences-global.h in gui-preferences.h
* gui-preferences.h: Don't include gui-preferences-global.h.
* files-dock-widget.cc, m-editor/file-editor-tab.cc, main-window.cc,
octave-dock-widget.cc: Include individual gui-preferences-*.h files
as needed but not gui-preferences.h.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 12 Nov 2019 11:15:40 -0500 |
| parents | a780677b845c |
| children | a36443e94f8a |
| files | libgui/src/files-dock-widget.cc libgui/src/gui-preferences.h libgui/src/m-editor/file-editor-tab.cc libgui/src/main-window.cc libgui/src/octave-dock-widget.cc |
| diffstat | 5 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/files-dock-widget.cc Tue Nov 12 17:32:39 2019 +0100 +++ b/libgui/src/files-dock-widget.cc Tue Nov 12 11:15:40 2019 -0500 @@ -43,6 +43,7 @@ #include "files-dock-widget.h" #include "gui-preferences-fb.h" +#include "gui-preferences-global.h" #include "octave-qobject.h" #include "qt-interpreter-events.h"
--- a/libgui/src/gui-preferences.h Tue Nov 12 17:32:39 2019 +0100 +++ b/libgui/src/gui-preferences.h Tue Nov 12 11:15:40 2019 -0500 @@ -49,6 +49,4 @@ const QVariant def; // the default value }; -#include "gui-preferences-global.h" - #endif
--- a/libgui/src/m-editor/file-editor-tab.cc Tue Nov 12 17:32:39 2019 +0100 +++ b/libgui/src/m-editor/file-editor-tab.cc Tue Nov 12 11:15:40 2019 -0500 @@ -64,6 +64,7 @@ #include "file-editor.h" #include "gui-preferences-cs.h" #include "gui-preferences-ed.h" +#include "gui-preferences-global.h" #include "marker.h" #include "octave-qobject.h" #include "octave-txt-lexer.h"
--- a/libgui/src/main-window.cc Tue Nov 12 17:32:39 2019 +0100 +++ b/libgui/src/main-window.cc Tue Nov 12 11:15:40 2019 -0500 @@ -55,10 +55,10 @@ #if defined (HAVE_QSCINTILLA) # include "file-editor.h" #endif -#include "gui-preferences.h" #include "gui-preferences-cs.h" #include "gui-preferences-dw.h" #include "gui-preferences-ed.h" +#include "gui-preferences-global.h" #include "gui-preferences-mw.h" #include "gui-preferences-nr.h" #include "gui-settings.h"
--- a/libgui/src/octave-dock-widget.cc Tue Nov 12 17:32:39 2019 +0100 +++ b/libgui/src/octave-dock-widget.cc Tue Nov 12 11:15:40 2019 -0500 @@ -34,8 +34,8 @@ #include <QToolBar> #include <QMenuBar> -#include "gui-preferences.h" #include "gui-preferences-dw.h" +#include "gui-preferences-global.h" #include "gui-preferences-mw.h" #include "gui-settings.h" #include "octave-dock-widget.h"