Actual fix for the HAVE_TOUCH

wonder-sk · wonder-sk · commit f02591a263d7 · 2014-02-23T21:54:28.000+07:00
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -1799,15 +1799,10 @@ void QgsMapCanvas::mapToolDestroyed()
   mMapTool = 0;
 }
 
-#if 0 // TODO[MD]: after merge
 #ifdef HAVE_TOUCH
 bool QgsMapCanvas::event( QEvent * e )
 {
   bool done = false;
-  if ( mDrawing )
-  {
-    return done;
-  }
   if ( e->type() == QEvent::Gesture )
   {
     // call handler of current map tool
@@ -1824,4 +1819,3 @@ bool QgsMapCanvas::event( QEvent * e )
   return done;
 }
 #endif
-#endif

Original file line number	Diff line number	Diff line change
`@@ -1799,15 +1799,10 @@ void QgsMapCanvas::mapToolDestroyed()`
`1799`	`1799`	`mMapTool = 0;`
`1800`	`1800`	`}`
`1801`	`1801`
`1802`		`-#if 0 // TODO[MD]: after merge`
`1803`	`1802`	`#ifdef HAVE_TOUCH`
`1804`	`1803`	`bool QgsMapCanvas::event( QEvent * e )`
`1805`	`1804`	`{`
`1806`	`1805`	`bool done = false;`
`1807`		`- if ( mDrawing )`
`1808`		`- {`
`1809`		`- return done;`
`1810`		`- }`
`1811`	`1806`	`if ( e->type() == QEvent::Gesture )`
`1812`	`1807`	`{`
`1813`	`1808`	`// call handler of current map tool`
`@@ -1824,4 +1819,3 @@ bool QgsMapCanvas::event( QEvent * e )`
`1824`	`1819`	`return done;`
`1825`	`1820`	`}`
`1826`	`1821`	`#endif`
`1827`		`-#endif`