# HG changeset patch
# User Torsten <ttl@justmail.de>
# Date 1421959092 -3600
# Node ID 4b980842edba8f0f2af3ef043c64d0bb2186a07f
# Parent  18c213fa9b20f502484bd620ab2556830e9b0683
clean up some signal-slot combinations in the editor

* file-editor-tab.cc (contructor): remove connections of signals for command
  execution and for creating the context menu;
  (execute_command_in_terminal, create_context_menu): related slots removed

* file-editor-tab.h: removed slots and signals that were emitted therein

* file-editor.cc (add_file_editor_tab): connect edit area signals directly
  to the related slots without involving the editor tab

diff -r 18c213fa9b20 -r 4b980842edba libgui/src/m-editor/file-editor-tab.cc
--- a/libgui/src/m-editor/file-editor-tab.cc	Thu Jan 22 14:46:30 2015 -0500
+++ b/libgui/src/m-editor/file-editor-tab.cc	Thu Jan 22 21:38:12 2015 +0100
@@ -82,21 +82,10 @@
   _file_system_watcher.setObjectName ("_qt_autotest_force_engine_poller");
 
   _edit_area = new octave_qscintilla (this);
-  // Connect signal for command execution to a slot of this tab which in turn
-  // emits a signal connected to the main window.
-  // Direct connection is not possible because tab's parent is null.
-  connect (_edit_area,
-           SIGNAL (execute_command_in_terminal_signal (const QString&)),
-           this,
-           SLOT (execute_command_in_terminal (const QString&)));
 
-  connect (_edit_area,
-           SIGNAL (cursorPositionChanged (int, int)),
-           this,
-           SLOT (handle_cursor_moved (int,int)));
+  connect (_edit_area, SIGNAL (cursorPositionChanged (int, int)),
+           this, SLOT (handle_cursor_moved (int,int)));
 
-  connect (_edit_area, SIGNAL (create_context_menu_signal (QMenu*)),
-           this, SLOT (create_context_menu (QMenu*)));
   connect (_edit_area, SIGNAL (context_menu_edit_signal (const QString&)),
            this, SLOT (handle_context_menu_edit (const QString&)));
 
@@ -208,12 +197,6 @@
 }
 
 void
-file_editor_tab::execute_command_in_terminal (const QString& command)
-{
-  emit execute_command_in_terminal_signal (command); // connected to main window
-}
-
-void
 file_editor_tab::handle_context_menu_edit (const QString& word_at_cursor)
 {
   // search for a subfunction in actual file (this is done at first because
@@ -2089,12 +2072,6 @@
   _col_indicator->setNum (col+1);
 }
 
-void
-file_editor_tab::create_context_menu (QMenu *menu)
-{
-  emit create_context_menu_tab_signal (menu);
-}
-
 QString
 file_editor_tab::get_function_name ()
 {
diff -r 18c213fa9b20 -r 4b980842edba libgui/src/m-editor/file-editor-tab.h
--- a/libgui/src/m-editor/file-editor-tab.h	Thu Jan 22 14:46:30 2015 -0500
+++ b/libgui/src/m-editor/file-editor-tab.h	Thu Jan 22 21:38:12 2015 +0100
@@ -120,8 +120,6 @@
 
   void file_has_changed (const QString& fileName);
 
-  void execute_command_in_terminal (const QString& command);
-  void create_context_menu (QMenu *);
   void handle_context_menu_edit (const QString&);
 
 signals:
@@ -135,9 +133,7 @@
   void editor_check_conflict_save (const QString& saveFileName,
                                    bool remove_on_success);
   void run_file_signal (const QFileInfo& info);
-  void execute_command_in_terminal_signal (const QString&);
   void set_global_edit_shortcuts_signal (bool);
-  void create_context_menu_tab_signal (QMenu *);
   void request_open_file (const QString&);
 
 protected:
diff -r 18c213fa9b20 -r 4b980842edba libgui/src/m-editor/file-editor.cc
--- a/libgui/src/m-editor/file-editor.cc	Thu Jan 22 14:46:30 2015 -0500
+++ b/libgui/src/m-editor/file-editor.cc	Thu Jan 22 21:38:12 2015 +0100
@@ -1589,6 +1589,12 @@
   connect (f->qsci_edit_area (), SIGNAL (show_doc_signal (const QString&)),
            main_win (), SLOT (handle_show_doc (const QString&)));
 
+  connect (f->qsci_edit_area (), SIGNAL (create_context_menu_signal (QMenu *)),
+           this, SLOT (create_context_menu (QMenu *)));
+
+  connect (f->qsci_edit_area (), SIGNAL (execute_command_in_terminal_signal (const QString&)),
+           main_win (), SLOT (execute_command_in_terminal (const QString&)));
+
   // Signals from the file editor_tab
   connect (f, SIGNAL (file_name_changed (const QString&, const QString&)),
            this, SLOT (handle_file_name_changed (const QString&,
@@ -1609,15 +1615,9 @@
   connect (f, SIGNAL (mru_add_file (const QString&)),
            this, SLOT (handle_mru_add_file (const QString&)));
 
-  connect (f, SIGNAL (create_context_menu_tab_signal (QMenu *)),
-           this, SLOT (create_context_menu (QMenu *)));
-
   connect (f, SIGNAL (run_file_signal (const QFileInfo&)),
            main_win (), SLOT (run_file_in_terminal (const QFileInfo&)));
 
-  connect (f, SIGNAL (execute_command_in_terminal_signal (const QString&)),
-           main_win (), SLOT (execute_command_in_terminal (const QString&)));
-
   connect (f, SIGNAL (request_open_file (const QString&)),
            this, SLOT (request_open_file (const QString&)));