diff libgui/src/m-editor/octave-qscintilla.cc @ 18460:f959c63934e6 gui-release

Backed out changeset f01ac1bb8a5d which broke some editor short cuts
author Torsten <ttl@justmail.de>
date Thu, 13 Feb 2014 22:17:44 +0100
parents f01ac1bb8a5d
children 26d15a57f45b
line wrap: on
line diff
--- a/libgui/src/m-editor/octave-qscintilla.cc	Thu Feb 13 20:39:09 2014 +0100
+++ b/libgui/src/m-editor/octave-qscintilla.cc	Thu Feb 13 22:17:44 2014 +0100
@@ -29,16 +29,13 @@
 #ifdef HAVE_QSCINTILLA
 
 #include <Qsci/qscilexer.h>
-#include <QShortcut>
 
 #include "octave-qscintilla.h"
 #include "file-editor-tab.h"
 
 octave_qscintilla::octave_qscintilla (QWidget *p)
   : QsciScintilla (p)
-{
-  installEventFilter (this);
-}
+{ }
 
 octave_qscintilla::~octave_qscintilla ()
 { }
@@ -189,13 +186,4 @@
     emit execute_command_in_terminal_signal (commands.at (i));
 }
 
-bool
-octave_qscintilla::eventFilter(QObject *obj, QEvent *e)
- {
-  if (e->type() == QEvent::ShortcutOverride)
-    return true;
-  else
-    return QObject::eventFilter(obj, e);
- }
-
 #endif