fix a warning

jef · jef · commit 12b058b7becf · 2008-08-07T13:33:02.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9021 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/legend/qgslegendlayer.cpp b/src/app/legend/qgslegendlayer.cpp
@@ -460,15 +460,12 @@ QPixmap QgsLegendLayer::getOriginalPixmap() const
       QPixmap myPixmap(32,32);
       rlayer->drawThumbnail(&myPixmap);
       return myPixmap;
-      
-    }
-    else // undefined - should never reach this
-    {
-      return QgisApp::getThemePixmap("/mIconLayer.png");
     }
   }
-}
 
+  // undefined - should never reach this
+  return QgisApp::getThemePixmap("/mIconLayer.png");
+}			
 
 void QgsLegendLayer::addToPopupMenu(QMenu& theMenu, QAction* toggleEditingAction)
 {

Original file line number	Diff line number	Diff line change
`@@ -460,15 +460,12 @@ QPixmap QgsLegendLayer::getOriginalPixmap() const`
`460`	`460`	`QPixmap myPixmap(32,32);`
`461`	`461`	`rlayer->drawThumbnail(&myPixmap);`
`462`	`462`	`return myPixmap;`
`463`		`-`
`464`		`- }`
`465`		`- else // undefined - should never reach this`
`466`		`- {`
`467`		`- return QgisApp::getThemePixmap("/mIconLayer.png");`
`468`	`463`	`}`
`469`	`464`	`}`
`470`		`-}`
`471`	`465`
	`466`	`+ // undefined - should never reach this`
	`467`	`+ return QgisApp::getThemePixmap("/mIconLayer.png");`
	`468`	`+}`
`472`	`469`
`473`	`470`	`void QgsLegendLayer::addToPopupMenu(QMenu& theMenu, QAction* toggleEditingAction)`
`474`	`471`	`{`