Mercurial > octave-nkf

changeset 16636:d788ee8b8a99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix GUI includes when built without Qscintilla * settings-dialog.cc: Unconditionally include color-picker.h. Do not include QSettings here. * settings-dialog.h: Include QSettings here.
author Mike Miller <mtmiller@ieee.org>
date Fri, 10 May 2013 18:31:04 -0400
parents 25e418d23a4b
children b3f4bdd7e5f4
files libgui/src/settings-dialog.cc libgui/src/settings-dialog.h
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/settings-dialog.cc	Fri May 10 21:01:02 2013 +0200
+++ b/libgui/src/settings-dialog.cc	Fri May 10 18:31:04 2013 -0400
@@ -24,18 +24,17 @@
 #include <config.h>
 #endif
 
+#include "color-picker.h"
 #include "resource-manager.h"
 #include "workspace-model.h"
 #include "settings-dialog.h"
 #include "ui-settings-dialog.h"
-#include <QSettings>
 #include <QDir>
 #include <QFileInfo>
 #include <QVector>
 
 #ifdef HAVE_QSCINTILLA
 #include <QScrollArea>
-#include "color-picker.h"
 #include <Qsci/qscilexercpp.h>
 #include <Qsci/qscilexerbash.h>
 #include <Qsci/qscilexerperl.h>
--- a/libgui/src/settings-dialog.h	Fri May 10 21:01:02 2013 +0200
+++ b/libgui/src/settings-dialog.h	Fri May 10 18:31:04 2013 -0400
@@ -24,6 +24,7 @@
 #define SETTINGSDIALOG_H
 
 #include <QDialog>
+#include <QSettings>
 #ifdef HAVE_QSCINTILLA
 #include "lexer-octave-gui.h"
 #endif