[QGIS Commit] r13914 - trunk/qgis/src/plugins/ogr_converter

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-07-13 16:26:53 +0000 (Tue, 13 Jul 2010)
New Revision: 13914

Modified:
   trunk/qgis/src/plugins/ogr_converter/plugin.cpp
Log:
fix OGR converter menu removal

Modified: trunk/qgis/src/plugins/ogr_converter/plugin.cpp
===================================================================
--- trunk/qgis/src/plugins/ogr_converter/plugin.cpp	2010-07-12 18:56:43 UTC (rev 13913)
+++ trunk/qgis/src/plugins/ogr_converter/plugin.cpp	2010-07-13 16:26:53 UTC (rev 13914)
@@ -26,8 +26,6 @@
 #include <QAction>
 #include <QFile>
 #include <QToolBar>
-// std
-#include <cassert>
 
 #include <ogr_api.h>
 
@@ -46,7 +44,7 @@
     mQGisIface( theQgisInterface ),
     mQActionPointer( 0 )
 {
-  assert( 0 != mQGisIface );
+  Q_ASSERT( mQGisIface );
 }
 
 OgrPlugin::~OgrPlugin()
@@ -83,7 +81,7 @@
 
 void OgrPlugin::run()
 {
-  assert( 0 != mQGisIface );
+  Q_ASSERT( mQGisIface );
 
   Dialog* ogrDialog = new Dialog( mQGisIface->mainWindow(), QgisGui::ModalDialogFlags );
   ogrDialog->setAttribute( Qt::WA_DeleteOnClose );
@@ -92,13 +90,13 @@
 
 void OgrPlugin::unload()
 {
-  assert( 0 != mQGisIface );
+  Q_ASSERT( mQGisIface );
 
   // TODO: Who is responsible for OGR cleanup?
   //OGRCleanupAll();
 
   // remove the GUI
-  mQGisIface->removePluginMenu( "OG&R Converter", mQActionPointer );
+  mQGisIface->removePluginMenu( tr( "OG&R Converter" ), mQActionPointer );
   mQGisIface->removeToolBarIcon( mQActionPointer );
   delete mQActionPointer;
 }