# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1435161392 14400
# Node ID 3b25741a992774581b639a00325aa028482cf0de
# Parent  48d9001bdee3c0719a81a7a6bb81f434e74ab6fb
Avoid HAVE_ macro in header file.

* main-window.cc (main_window::dock_widget_list): Define here.
* main-window.h: Not here.

diff -r 48d9001bdee3 -r 3b25741a9927 libgui/src/main-window.cc
--- a/libgui/src/main-window.cc	Wed Jun 24 11:53:33 2015 -0400
+++ b/libgui/src/main-window.cc	Wed Jun 24 11:56:32 2015 -0400
@@ -2407,6 +2407,21 @@
     }
 }
 
+QList<octave_dock_widget *>
+main_window::dock_widget_list ()
+{
+  QList<octave_dock_widget *> list = QList<octave_dock_widget *> ();
+  list.append (static_cast<octave_dock_widget *> (command_window));
+  list.append (static_cast<octave_dock_widget *> (history_window));
+  list.append (static_cast<octave_dock_widget *> (file_browser_window));
+  list.append (static_cast<octave_dock_widget *> (doc_browser_window));
+#ifdef HAVE_QSCINTILLA
+  list.append (static_cast<octave_dock_widget *> (editor_window));
+#endif
+  list.append (static_cast<octave_dock_widget *> (workspace_window));
+  return list;
+}
+
 void
 main_window::set_screen_size (int ht, int wd)
 {
diff -r 48d9001bdee3 -r 3b25741a9927 libgui/src/main-window.h
--- a/libgui/src/main-window.h	Wed Jun 24 11:53:33 2015 -0400
+++ b/libgui/src/main-window.h	Wed Jun 24 11:56:32 2015 -0400
@@ -306,19 +306,9 @@
   documentation_dock_widget *doc_browser_window;
   file_editor_interface *editor_window;
   workspace_view *workspace_window;
-  QList<octave_dock_widget *> dock_widget_list ()
-  {
-    QList<octave_dock_widget *> list = QList<octave_dock_widget *> ();
-    list.append (static_cast<octave_dock_widget *> (command_window));
-    list.append (static_cast<octave_dock_widget *> (history_window));
-    list.append (static_cast<octave_dock_widget *> (file_browser_window));
-    list.append (static_cast<octave_dock_widget *> (doc_browser_window));
-#ifdef HAVE_QSCINTILLA
-    list.append (static_cast<octave_dock_widget *> (editor_window));
-#endif
-    list.append (static_cast<octave_dock_widget *> (workspace_window));
-    return list;
-  }
+
+  QList<octave_dock_widget *> dock_widget_list ();
+
   octave_dock_widget *_active_dock;
 
   QString _release_notes_icon;