changeset 17921:2a4acd6548c6

include config.h in more files in libgui * color-picker.cc, find-files-dialog.cc, find-files-model.cc: Include config.h. * libgui/src/module.mk (src_libgui_src_la_CPPFLAGS): Include -I$(top_builddir)/libgnu in the list.
author John W. Eaton <jwe@octave.org>
date Wed, 13 Nov 2013 02:28:34 -0500
parents 5c3f22dd0bbb
children b5bf26a054bd
files libgui/src/color-picker.cc libgui/src/find-files-dialog.cc libgui/src/find-files-model.cc libgui/src/module.mk libgui/src/octave-interpreter.cc libgui/src/octave-interpreter.h
diffstat 4 files changed, 20 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/color-picker.cc	Tue Nov 12 15:46:59 2013 -0500
+++ b/libgui/src/color-picker.cc	Wed Nov 13 02:28:34 2013 -0500
@@ -24,6 +24,10 @@
 
 // Author: Torsten <ttl@justmail.de>
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "color-picker.h"
 
 // constuctor with initial color as parameter
--- a/libgui/src/find-files-dialog.cc	Tue Nov 12 15:46:59 2013 -0500
+++ b/libgui/src/find-files-dialog.cc	Wed Nov 13 02:28:34 2013 -0500
@@ -20,9 +20,10 @@
 
 */
 
-#include "find-files-dialog.h"
-#include "find-files-model.h"
-#include "resource-manager.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <QPushButton>
 #include <QDialogButtonBox>
 #include <QGridLayout>
@@ -41,6 +42,10 @@
 #include <QTextStream>
 #include <QGroupBox>
 
+#include "find-files-dialog.h"
+#include "find-files-model.h"
+#include "resource-manager.h"
+
 find_files_dialog::find_files_dialog (QWidget * p)
   : QDialog (p)
 {
--- a/libgui/src/find-files-model.cc	Tue Nov 12 15:46:59 2013 -0500
+++ b/libgui/src/find-files-model.cc	Wed Nov 13 02:28:34 2013 -0500
@@ -20,10 +20,15 @@
 
 */
 
-#include "find-files-model.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <QFileIconProvider>
 #include <QtAlgorithms>
 
+#include "find-files-model.h"
+
 class find_file_less_than
 {
 public:
--- a/libgui/src/module.mk	Tue Nov 12 15:46:59 2013 -0500
+++ b/libgui/src/module.mk	Wed Nov 13 02:28:34 2013 -0500
@@ -188,7 +188,8 @@
   -I$(top_builddir)/libinterp -I$(top_srcdir)/libinterp \
   -I$(top_builddir)/libinterp/parse-tree -I$(top_srcdir)/libinterp/parse-tree \
   -I$(top_builddir)/libinterp/corefcn -I$(top_srcdir)/libinterp/corefcn \
-  -I$(top_srcdir)/libinterp/octave-value
+  -I$(top_srcdir)/libinterp/octave-value \
+  -I$(top_builddir)/libgnu
 
 src_libgui_src_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS)