[QGIS Commit] r14093 - in branches/threading-branch/src/app: . legend

[svn_qgis at osgeo.org]

Author: wonder
Date: 2010-08-16 15:18:13 +0000 (Mon, 16 Aug 2010)
New Revision: 14093

Modified:
   branches/threading-branch/src/app/legend/qgslegend.cpp
   branches/threading-branch/src/app/qgisapp.cpp
Log:
Removed some redundant isDrawing() blockers.


Modified: branches/threading-branch/src/app/legend/qgslegend.cpp
===================================================================
--- branches/threading-branch/src/app/legend/qgslegend.cpp	2010-08-16 15:17:09 UTC (rev 14092)
+++ branches/threading-branch/src/app/legend/qgslegend.cpp	2010-08-16 15:18:13 UTC (rev 14093)
@@ -625,11 +625,6 @@
 
 void QgsLegend::legendLayerShowInOverview()
 {
-  if ( !mMapCanvas || mMapCanvas->isDrawing() )
-  {
-    return;
-  }
-
   QgsLegendItem* li = dynamic_cast<QgsLegendItem *>( currentItem() );
   if ( !li )
     return;

Modified: branches/threading-branch/src/app/qgisapp.cpp
===================================================================
--- branches/threading-branch/src/app/qgisapp.cpp	2010-08-16 15:17:09 UTC (rev 14092)
+++ branches/threading-branch/src/app/qgisapp.cpp	2010-08-16 15:18:13 UTC (rev 14093)
@@ -4233,31 +4233,17 @@
 
 void QgisApp::capturePoint()
 {
-  if ( mMapCanvas && mMapCanvas->isDrawing() )
-  {
-    return;
-  }
-
   // set current map tool to select
   mMapCanvas->setMapTool( mMapTools.mCapturePoint );
 }
 
 void QgisApp::captureLine()
 {
-  if ( mMapCanvas && mMapCanvas->isDrawing() )
-  {
-    return;
-  }
-
   mMapCanvas->setMapTool( mMapTools.mCaptureLine );
 }
 
 void QgisApp::capturePolygon()
 {
-  if ( mMapCanvas && mMapCanvas->isDrawing() )
-  {
-    return;
-  }
   mMapCanvas->setMapTool( mMapTools.mCapturePolygon );
 }
 
@@ -4283,59 +4269,34 @@
 
 void QgisApp::addVertex()
 {
-  if ( mMapCanvas && mMapCanvas->isDrawing() )
-  {
-    return;
-  }
   mMapCanvas->setMapTool( mMapTools.mVertexAdd );
 
 }
 
 void QgisApp::moveVertex()
 {
-  if ( mMapCanvas && mMapCanvas->isDrawing() )
-  {
-    return;
-  }
   mMapCanvas->setMapTool( mMapTools.mVertexMove );
 }
 
 void QgisApp::addRing()
 {
-  if ( mMapCanvas && mMapCanvas->isDrawing() )
-  {
-    return;
-  }
   mMapCanvas->setMapTool( mMapTools.mAddRing );
 }
 
 void QgisApp::addIsland()
 {
-  if ( mMapCanvas && mMapCanvas->isDrawing() )
-  {
-    return;
-  }
   mMapCanvas->setMapTool( mMapTools.mAddIsland );
 }
 
 
 void QgisApp::deleteVertex()
 {
-  if ( mMapCanvas && mMapCanvas->isDrawing() )
-  {
-    return;
-  }
   mMapCanvas->setMapTool( mMapTools.mVertexDelete );
 }
 
 
 void QgisApp::editCut( QgsMapLayer * layerContainingSelection )
 {
-  if ( mMapCanvas && mMapCanvas->isDrawing() )
-  {
-    return;
-  }
-
   QgsMapLayer *selectionLayer = layerContainingSelection ? layerContainingSelection : activeLayer();
 
   if ( selectionLayer )
@@ -4358,11 +4319,6 @@
 
 void QgisApp::editCopy( QgsMapLayer * layerContainingSelection )
 {
-  if ( mMapCanvas && mMapCanvas->isDrawing() )
-  {
-    return;
-  }
-
   QgsMapLayer *selectionLayer = layerContainingSelection ? layerContainingSelection : activeLayer();
 
   if ( selectionLayer )
@@ -4382,11 +4338,6 @@
 
 void QgisApp::editPaste( QgsMapLayer *destinationLayer )
 {
-  if ( mMapCanvas && mMapCanvas->isDrawing() )
-  {
-    return;
-  }
-
   QgsMapLayer *pasteLayer = destinationLayer ? destinationLayer : activeLayer();
 
   if ( pasteLayer )