From 2d161ffae845278f0e0431db323a750e4d4028b6 Mon Sep 17 00:00:00 2001
From: Rene Brun <Rene.Brun@cern.ch>
Date: Wed, 7 Feb 2007 06:05:20 +0000
Subject: [PATCH] From Valeri Fine: -Remove obsolete code
git-svn-id: http://root.cern.ch/svn/root/trunk@17739 27541ba8-7e3a-0410-8455-c3a389f83636
---
qt/src/TQtClientFilter.cxx | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/qt/src/TQtClientFilter.cxx b/qt/src/TQtClientFilter.cxx
index 67143cfa9b2..ff437e99a05 100644
--- a/qt/src/TQtClientFilter.cxx
+++ b/qt/src/TQtClientFilter.cxx
@@ -1,4 +1,4 @@
-// @(#)root/qt:$Name: $:$Id: TQtClientFilter.cxx,v 1.18 2006/07/05 07:04:16 brun Exp $
+// @(#)root/qt:$Name: $:$Id: TQtClientFilter.cxx,v 1.19 2006/12/12 15:03:05 brun Exp $
// Author: Valeri Fine 21/01/2002
/*************************************************************************
@@ -437,6 +437,9 @@ bool TQtClientFilter::eventFilter( QObject *qWidget, QEvent *e ){
case QEvent::MouseButtonPress: // mouse button pressed
event.fType = kButtonPress;
+ case QEvent::MouseButtonDblClick:
+ if (e->type()== QEvent::MouseButtonDblClick)
+ event.fType = kButtonDoubleClick;
mouseEvent = (QMouseEvent *)e;
MapEvent(*mouseEvent,event);
selectEventMask |= kButtonPressMask;
@@ -445,14 +448,10 @@ bool TQtClientFilter::eventFilter( QObject *qWidget, QEvent *e ){
&& fButtonGrabList.findRef(frame) >=0
&& frame->IsGrabbed(event) )
{
- // mouseEvent->accept();
GrabPointer(frame, frame->ButtonEventMask(),0,frame->GrabButtonCursor(), kTRUE,kFALSE);
-
- // fprintf(stderr," 1. -- QEvent::MouseButtonPress -- Check the redundant grabbing %p frame %p \n", QWidget::mouseGrabber(), frame);
// Make sure fgButtonGrabber is Ok. GrabPointer zeros fgButtonGrabber!!!
fgButtonGrabber = frame;
grabSelectEvent = kTRUE;
- // fprintf(stderr," 2. -- QEvent::MouseButtonPress -- turn grabbing on id = %x widget = %p, event=%p\n", TGQt::rootwid(frame), frame,e);
}
else {
grabSelectEvent = SelectGrab(event,selectEventMask,*mouseEvent);
@@ -481,17 +480,6 @@ bool TQtClientFilter::eventFilter( QObject *qWidget, QEvent *e ){
}
break;
- case QEvent::MouseButtonDblClick:
-#if ROOT_VERSION_CODE >= ROOT_VERSION(4,00,1)
- event.fType = kButtonDoubleClick;
- // the rest code is taken from kButtonPress
- mouseEvent = (QMouseEvent *)e;
- MapEvent(*mouseEvent,event);
- selectEventMask |= kButtonPressMask;
- grabSelectEvent = SelectGrab(event,selectEventMask,*mouseEvent);
-#endif
- break;
-
case QEvent::MouseMove: // mouse move
event.fType = kMotionNotify;
mouseEvent = (QMouseEvent *)e;
--
GitLab