changeset:   17813:5eadc0ae51b1
bookmark:    @
tag:         qbase
tag:         qsci_2_6_mac_p10
tag:         qtip
tag:         tip
user:        Torsten <address@hidden>
date:        Thu Oct 31 08:03:25 2013 +0100
summary:     [mq]: qsci_2_6_mac_p10

diff -r fffd0c0ca2dc -r 5eadc0ae51b1 libgui/src/m-editor/file-editor-tab.cc
--- a/libgui/src/m-editor/file-editor-tab.cc	Wed Oct 30 21:55:14 2013 -0700
+++ b/libgui/src/m-editor/file-editor-tab.cc	Thu Oct 31 08:03:25 2013 +0100
@@ -71,14 +71,7 @@
   _file_name = directory;
   _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&)));
+  _edit_area = new QsciScintilla (this);
 
   // Leave the find dialog box out of memory until requested.
   _find_dialog = 0;
@@ -420,7 +413,6 @@
   if (ID != this)
     return;
 
-  _edit_area->context_help_doc (doc);
 }
 
 void
@@ -429,7 +421,6 @@
   if (ID != this)
     return;
 
-  _edit_area->context_edit ();
 }
 
 void
@@ -495,7 +486,6 @@
   if (ID != this)
     return;
 
-  _edit_area->context_run ();
 }
 
 void
diff -r fffd0c0ca2dc -r 5eadc0ae51b1 libgui/src/m-editor/file-editor-tab.h
--- a/libgui/src/m-editor/file-editor-tab.h	Wed Oct 30 21:55:14 2013 -0700
+++ b/libgui/src/m-editor/file-editor-tab.h	Thu Oct 31 08:03:25 2013 +0100
@@ -189,7 +189,7 @@
   void remove_all_breakpoints_callback (const bp_info& info);
   void center_current_line ();
 
-  octave_qscintilla *_edit_area;
+  QsciScintilla *_edit_area;
 
   QString _file_name;
   QString _file_name_short;