[QGIS Commit] r15773 - in trunk/qgis/src: core plugins/offline_editing plugins/spatialquery

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-04-19 14:48:34 -0700 (Tue, 19 Apr 2011)
New Revision: 15773

Modified:
   trunk/qgis/src/core/qgscoordinatetransform.cpp
   trunk/qgis/src/core/qgsdataprovider.h
   trunk/qgis/src/plugins/offline_editing/offline_editing.cpp
   trunk/qgis/src/plugins/offline_editing/offline_editing_plugin.cpp
   trunk/qgis/src/plugins/spatialquery/qgsspatialqueryplugin.cpp
Log:
fix crashes on exit (follows up r15751)

Modified: trunk/qgis/src/core/qgscoordinatetransform.cpp
===================================================================
--- trunk/qgis/src/core/qgscoordinatetransform.cpp	2011-04-19 20:40:26 UTC (rev 15772)
+++ trunk/qgis/src/core/qgscoordinatetransform.cpp	2011-04-19 21:48:34 UTC (rev 15773)
@@ -32,30 +32,43 @@
 // if defined shows all information about transform to stdout
 // #define COORDINATE_TRANSFORM_VERBOSE
 
-QgsCoordinateTransform::QgsCoordinateTransform( ) : QObject(), mSourceCRS(), mDestCRS()
+QgsCoordinateTransform::QgsCoordinateTransform()
+    : QObject()
+    , mInitialisedFlag( false )
+    , mSourceProjection( 0 )
+    , mDestinationProjection( 0 )
 {
   setFinder();
 }
 
-QgsCoordinateTransform::QgsCoordinateTransform( const QgsCoordinateReferenceSystem& source,
-    const QgsCoordinateReferenceSystem& dest )
+QgsCoordinateTransform::QgsCoordinateTransform( const QgsCoordinateReferenceSystem& source, const QgsCoordinateReferenceSystem& dest )
+    : QObject()
+    , mInitialisedFlag( false )
+    , mSourceProjection( 0 )
+    , mDestinationProjection( 0 )
 {
   setFinder();
-
   mSourceCRS = source;
   mDestCRS = dest;
   initialise();
 }
 
 QgsCoordinateTransform::QgsCoordinateTransform( long theSourceSrsId, long theDestSrsId )
-    : mSourceCRS( theSourceSrsId, QgsCoordinateReferenceSystem::InternalCrsId ),
-    mDestCRS( theDestSrsId, QgsCoordinateReferenceSystem::InternalCrsId )
+    : QObject()
+    , mInitialisedFlag( false )
+    , mSourceCRS( theSourceSrsId, QgsCoordinateReferenceSystem::InternalCrsId )
+    , mDestCRS( theDestSrsId, QgsCoordinateReferenceSystem::InternalCrsId )
+    , mSourceProjection( 0 )
+    , mDestinationProjection( 0 )
 {
   initialise();
 }
 
-QgsCoordinateTransform::QgsCoordinateTransform( QString theSourceCRS, QString theDestCRS ) : QObject()
-
+QgsCoordinateTransform::QgsCoordinateTransform( QString theSourceCRS, QString theDestCRS )
+    : QObject()
+    , mInitialisedFlag( false )
+    , mSourceProjection( 0 )
+    , mDestinationProjection( 0 )
 {
   setFinder();
   mSourceCRS.createFromWkt( theSourceCRS );
@@ -69,7 +82,11 @@
 
 QgsCoordinateTransform::QgsCoordinateTransform( long theSourceSrid,
     QString theDestWkt,
-    QgsCoordinateReferenceSystem::CrsType theSourceCRSType ): QObject()
+    QgsCoordinateReferenceSystem::CrsType theSourceCRSType )
+    : QObject()
+    , mInitialisedFlag( false )
+    , mSourceProjection( 0 )
+    , mDestinationProjection( 0 )
 {
   setFinder();
 
@@ -85,11 +102,11 @@
 QgsCoordinateTransform::~QgsCoordinateTransform()
 {
   // free the proj objects
-  if ( mSourceProjection != 0 )
+  if ( mSourceProjection )
   {
     pj_free( mSourceProjection );
   }
-  if ( mDestinationProjection != 0 )
+  if ( mDestinationProjection )
   {
     pj_free( mDestinationProjection );
   }
@@ -106,7 +123,6 @@
   initialise();
 }
 
-
 void QgsCoordinateTransform::setDestCRSID( long theCRSID )
 {
   //!todo Add some logic here to determine if the srsid is a system or user one
@@ -118,11 +134,6 @@
 // And probably shouldn't be a void
 void QgsCoordinateTransform::initialise()
 {
-
-  mInitialisedFlag = false; //guilty until proven innocent...
-  mSourceProjection = NULL;
-  mDestinationProjection = NULL;
-
   // XXX Warning - multiple return paths in this block!!
   if ( !mSourceCRS.isValid() )
   {
@@ -152,11 +163,11 @@
 #endif
 
   mInitialisedFlag = true;
-  if ( mDestinationProjection == NULL )
+  if ( !mDestinationProjection )
   {
     mInitialisedFlag = false;
   }
-  if ( mSourceProjection == NULL )
+  if ( !mSourceProjection )
   {
     mInitialisedFlag = false;
   }

Modified: trunk/qgis/src/core/qgsdataprovider.h
===================================================================
--- trunk/qgis/src/core/qgsdataprovider.h	2011-04-19 20:40:26 UTC (rev 15772)
+++ trunk/qgis/src/core/qgsdataprovider.h	2011-04-19 21:48:34 UTC (rev 15773)
@@ -298,7 +298,7 @@
      *   @param changed binary combination of changes
      *   @note added in 1.7
      */
-    void dataChanged( int change );
+    void dataChanged( int changed );
 
   protected:
     /**

Modified: trunk/qgis/src/plugins/offline_editing/offline_editing.cpp
===================================================================
--- trunk/qgis/src/plugins/offline_editing/offline_editing.cpp	2011-04-19 20:40:26 UTC (rev 15772)
+++ trunk/qgis/src/plugins/offline_editing/offline_editing.cpp	2011-04-19 21:48:34 UTC (rev 15773)
@@ -58,11 +58,6 @@
 
 QgsOfflineEditing::~QgsOfflineEditing()
 {
-  if ( mProgressDialog != NULL )
-  {
-    delete mProgressDialog;
-  }
-  disconnect( QgsMapLayerRegistry::instance(), SIGNAL( layerWasAdded( QgsMapLayer* ) ), this, SLOT( layerAdded( QgsMapLayer* ) ) );
 }
 
 /**

Modified: trunk/qgis/src/plugins/offline_editing/offline_editing_plugin.cpp
===================================================================
--- trunk/qgis/src/plugins/offline_editing/offline_editing_plugin.cpp	2011-04-19 20:40:26 UTC (rev 15772)
+++ trunk/qgis/src/plugins/offline_editing/offline_editing_plugin.cpp	2011-04-19 21:48:34 UTC (rev 15773)
@@ -35,20 +35,17 @@
 static const QString sPluginIcon = ":/offline_editing/offline_editing_copy.png";
 
 QgsOfflineEditingPlugin::QgsOfflineEditingPlugin( QgisInterface* theQgisInterface )
-    : QgisPlugin( sName, sDescription, sPluginVersion, sPluginType ),
-    mQGisIface( theQgisInterface ),
-    mActionConvertProject( NULL ),
-    mActionSynchronize( NULL ),
-    mOfflineEditing( NULL )
+    : QgisPlugin( sName, sDescription, sPluginVersion, sPluginType )
+    , mQGisIface( theQgisInterface )
+    , mActionConvertProject( NULL )
+    , mActionSynchronize( NULL )
+    , mOfflineEditing( NULL )
 {
 }
 
 QgsOfflineEditingPlugin::~QgsOfflineEditingPlugin()
 {
-  if ( mOfflineEditing != NULL )
-  {
-    delete mOfflineEditing;
-  }
+  delete mOfflineEditing;
 }
 
 void QgsOfflineEditingPlugin::initGui()

Modified: trunk/qgis/src/plugins/spatialquery/qgsspatialqueryplugin.cpp
===================================================================
--- trunk/qgis/src/plugins/spatialquery/qgsspatialqueryplugin.cpp	2011-04-19 20:40:26 UTC (rev 15772)
+++ trunk/qgis/src/plugins/spatialquery/qgsspatialqueryplugin.cpp	2011-04-19 21:48:34 UTC (rev 15773)
@@ -59,18 +59,17 @@
 * @parma mIface Pointer to the QGIS interface object
 */
 QgsSpatialQueryPlugin::QgsSpatialQueryPlugin( QgisInterface* iface )
-    : QgisPlugin( name_, description_, version_, type_ ),
-    mIface( iface )
+    : QgisPlugin( name_, description_, version_, type_ )
+    , mDialog( 0 )
+    , mIface( iface )
+    , mSpatialQueryAction( 0 )
 {
-  mDialog = NULL;
 }
 
 QgsSpatialQueryPlugin::~QgsSpatialQueryPlugin()
 {
-  mIface = NULL;
-  delete mSpatialQueryAction;
-  delete mDialog;
 }
+
 /*
 * Initialize the GUI interface for the plugin
 */