diff libgui/src/main-window.h @ 20278:3b25741a9927

Avoid HAVE_ macro in header file. * main-window.cc (main_window::dock_widget_list): Define here. * main-window.h: Not here.
author John W. Eaton <jwe@octave.org>
date Wed, 24 Jun 2015 11:56:32 -0400
parents ac3746f39fab
children f7084eae3318
line wrap: on
line diff
--- 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;