Commit da39162e authored by Jan Möbius's avatar Jan Möbius

Reverted key changes from mike which kills all key handling

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@7016 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 6fe89f58
......@@ -608,7 +608,7 @@ void CoreWidget::slotSetViewingDirection(QAction* _action) {
}
void CoreWidget::moveBack() {
// examiner_widgets_[PluginFunctions::activeExaminer()]->
// examiner_widgets_[PluginFunctions::activeExaminer()]->
std::cerr << "move Back" << std::endl;
}
......
......@@ -1581,30 +1581,6 @@ void glViewer::mouseMoveEvent(QGraphicsSceneMouseEvent* _e)
}
}
//----------------------------------------------------------------------------------
void glViewer::keyPressEvent ( QKeyEvent* _event ) {
_event->accept();
switch (properties_.actionMode()) {
case Viewer::ExamineMode:
viewKeyEvent(_event);
break;
default: // avoid warning
break;
}
}
//----------------------------------------------------------------------------------
bool glViewer::viewKeyPressEvent(QKeyEvent* _event) {
_event->accept();
return true;
}
//-----------------------------------------------------------------------------
......@@ -1916,15 +1892,6 @@ void glViewer::treatNormalNavigation( QMouseEvent* _event ) {
//-----------------------------------------------------------------------------
void glViewer::viewKeyEvent( QKeyEvent* _event) {
// Only react if in ego-shooter mode
if (navigationMode_ == EGOSHOOTER_NAVIGATION) {
}
}
//-----------------------------------------------------------------------------
void
glViewer::lightMouseEvent(QMouseEvent* _event)
{
......
......@@ -65,7 +65,6 @@
#include <QBoxLayout>
#include <QtNetwork/QUdpSocket>
#include <QWheelEvent>
#include <QKeyEvent>
#include <QDropEvent>
#include <QContextMenuEvent>
#include <QDragEnterEvent>
......@@ -667,7 +666,7 @@ private:
*
* This function is called by the internal gl widget when receiving a key press event.
*/
virtual void keyPressEvent(QKeyEvent* _event);
virtual void keyPressEvent(QKeyEvent* _event) { _event->ignore(); };
/** \brief Get keyRelease events from the glArea
*
......@@ -684,7 +683,7 @@ private:
*
* @return If the derived class handled the event it has to return true otherwise false
*/
virtual bool viewKeyPressEvent(QKeyEvent* _event);
virtual bool viewKeyPressEvent(QKeyEvent* /* _event */ ) { return false; }
/** @} */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment