# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1463163776 14400
# Node ID de138ebaa7a946f76712730f5ae16875b1607b5b
# Parent  263d18409fdfae0832057ecf9c5ca922db3d16b7
avoid including config.h multiple times

* file-editor-tab.h: Don't include config.h.
* GLCanvas.cc: Don't include config.h twice.
* ToolBarButton.cc: Don't include config.h.

diff -r 263d18409fdf -r de138ebaa7a9 libgui/graphics/GLCanvas.cc
--- a/libgui/graphics/GLCanvas.cc	Fri May 13 09:36:14 2016 -0400
+++ b/libgui/graphics/GLCanvas.cc	Fri May 13 14:22:56 2016 -0400
@@ -24,10 +24,6 @@
 #  include "config.h"
 #endif
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include "gl-render.h"
 #include "graphics.h"
 
diff -r 263d18409fdf -r de138ebaa7a9 libgui/graphics/ToolBarButton.cc
--- a/libgui/graphics/ToolBarButton.cc	Fri May 13 09:36:14 2016 -0400
+++ b/libgui/graphics/ToolBarButton.cc	Fri May 13 14:22:56 2016 -0400
@@ -20,9 +20,9 @@
 
 */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
+// This file should not include config.h.  It is only included in other
+// C++ source files that should have included config.h before including
+// this file.
 
 #include <QAction>
 #include <QWidget>
diff -r 263d18409fdf -r de138ebaa7a9 libgui/src/m-editor/file-editor-tab.h
--- a/libgui/src/m-editor/file-editor-tab.h	Fri May 13 09:36:14 2016 -0400
+++ b/libgui/src/m-editor/file-editor-tab.h	Fri May 13 14:22:56 2016 -0400
@@ -33,13 +33,6 @@
 #include <QLabel>
 #include <QComboBox>
 
-// FIXME: We should not be including config.h in header files.
-// Only needed for octave_value_list type.
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#  include "ovl.h"
-#endif
-
 #include "find-dialog.h"
 #include "octave-qscintilla.h"
 #include "builtin-defun-decls.h"
@@ -48,6 +41,8 @@
                        typedefed elsewhere.  Could use common location. */
 
 
+class octave_value_list;
+
 class file_editor;
 
 class file_editor_tab : public QWidget