move octave-link and octave-event-listener classes to libinterp * libinterp/interp-core/octave-event-listener.h: Rename from libgui/src/octave-adapter/octave-event-listener.h. * libinterp/interp-core/octave-link.cc: Rename from libgui/src/octave-adapter/octave-link.cc. * libinterp/interp-core/octave-link.h: Rename from libgui/src/octave-adapter/octave-link.h. * octave-link.h, octave-link.cc: (octave_link::connect): New function. (octave_link::instance_ok): Don't create octave_link instance. (octave_link::launch_octave, octave_link::do_launch_octave): Delete. (octave_link::pre_input_event): Rename from octave_link::pre_input_event_hook_fcn. Change all callers. (octave_link::post_input_event): Rename from octave_link::post_input_event_hook_fcn. Change all callers. (octave_link::enter_debugger_event): Rename from octave_link::enter_debugger_event_hook_fcn. Change all callers. (octave_link::exit_debugger_event): Rename from octave_link::exit_debugger_event_hook_fcn. Change all callers. (octave_link::update_breakpoint): Rename from octave_link::update_breakpoint_hook_fcn. Change all callers. (octave_link::do_pre_input_event): Rename from octave_link::do_pre_input_event_hook_fcn. Change all callers. (octave_link::do_post_input_event): Rename from octave_link::do_post_input_event_hook_fcn. Change all callers. (octave_link::do_enter_debugger_event): Rename from octave_link::do_enter_debugger_event_hook_fcn. Change all callers. (octave_link::do_exit_debugger_event): Rename from octave_link::do_exit_debugger_event_hook_fcn. Change all callers. (octave_link::do_update_breakpoint): Rename from octave_link::do_update_breakpoint_hook_fcn. Change all callers. (octave_link::do_update_workspace, octave_link::do_update_history, octave_link::do_insert_debugger_pointer, octave_link::do_delete_debugger_pointer, octave_link::do_pre_input_event, octave_link::do_post_input_event, octave_link::do_enter_debugger_event, octave_link::do_exit_debugger_event, octave_link::do_update_breakpoint, octave_link::do_edit_file): Now pure virtual functions. (octave_link::main_thread): Delete. * libinterp/interp-core/module.mk (INTERP_CORE_INC): Include interp-core/octave-event-listener.h and interp-core/octave-link.h in the list. (INTERP_CORE_SRC): Include interp-core/octave-link.cc in the list. * octave-qt-link.h, octave-qt-link.cc: New files. * main-window.cc (main_window::construct): Call octave_link::connect and octave_link::register_event_listener after everything else is initialized. (main_window::main_window): Don't call octave_link::launch_octave. * libgui/src/octave-main-thread.h: Rename from libgui/src/octave-adapter/octave-main-thread.h. * libgui/src/module.mk (octave_gui_MOC): Update for new location of octave-main-thread.cc. (noinst_HEADERS): Update for new locations of octave-event-listener.h, octave-link.h, and octave-main-thread.h. Include src/octave-qt-link.h in the list. (src_libgui_src_la_SOURCES): Update for new locations of octave-link.cc and octave-main-thread.cc. Include src/octave-qt-link.cc in the list. (src_libgui_src_la_CPPFLAGS): Delete -I$(srcdir)/src/octave-adapter from the list.

--- a/libgui/src/main-window.cc	Wed Aug 08 20:51:24 2012 -0700
+++ b/libgui/src/main-window.cc	Wed Apr 03 18:11:55 2013 -0400
@@ -42,7 +42,7 @@
 #include "file-editor.h"
 #endif
 #include "main-window.h"
-#include "octave-link.h"
+#include "octave-qt-link.h"
 #include "settings-dialog.h"
 
 #include "builtins.h"
@@ -60,7 +60,6 @@
 {
   // We have to set up all our windows, before we finally launch octave.
   construct ();
-  octave_link::launch_octave ();
 }
 
 main_window::~main_window ()
@@ -1165,7 +1164,6 @@
   setStatusBar (_status_bar);
 
   _octave_qt_event_listener = new octave_qt_event_listener ();
-  octave_link::register_event_listener (_octave_qt_event_listener);
 
   connect (_octave_qt_event_listener,
            SIGNAL (current_directory_has_changed_signal (QString)),
@@ -1209,6 +1207,12 @@
            SIGNAL (edit_file_signal (const QString&)),
            this,
            SLOT (handle_edit_file_request(const QString&)));
+
+  // FIXME -- is it possible to eliminate the event_listenter?
+
+  octave_link::connect (new octave_qt_link ());
+
+  octave_link::register_event_listener (_octave_qt_event_listener);
 }
 
 void