use static locals instead of global pointers for some ^Cngletons (proably more valgrind happyness; followup 572bda8)

jef-n · jef-n · commit f4ca526ab409 · 2013-10-12T23:01:16.000+02:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -837,7 +837,6 @@ QgisApp::~QgisApp()
   // cancel request for FileOpen events
   QgsApplication::setFileOpenEventReceiver( 0 );
 
-  // delete map layer registry and provider registry
   QgsApplication::exitQgis();
 
   delete QgsProject::instance();
diff --git a/src/app/qgsfieldsproperties.cpp b/src/app/qgsfieldsproperties.cpp
@@ -734,7 +734,7 @@ QgsVectorLayer::EditType QgsFieldsProperties::editTypeFromButton( QPushButton* b
 
 QgsAttributeEditorElement* QgsFieldsProperties::createAttributeEditorWidget( QTreeWidgetItem* item, QObject *parent )
 {
-  QgsAttributeEditorElement* widgetDef;
+  QgsAttributeEditorElement *widgetDef = 0;
 
   DesignerTreeItemData itemData = item->data( 0, DesignerTreeRole ).value<DesignerTreeItemData>();
   switch ( itemData.type() )
diff --git a/src/app/qgsshortcutsmanager.cpp b/src/app/qgsshortcutsmanager.cpp
@@ -17,11 +17,16 @@
 
 #include <QSettings>
 
+QgsShortcutsManager* QgsShortcutsManager::mInstance = NULL;
+
 QgsShortcutsManager::QgsShortcutsManager( QObject *parent ) : QObject( parent )
 {
 }
 
-QgsShortcutsManager* QgsShortcutsManager::mInstance = NULL;
+QgsShortcutsManager::~QgsShortcutsManager()
+{
+  mInstance = 0;
+}
 
 QgsShortcutsManager* QgsShortcutsManager::instance( QObject *parent )
 {
diff --git a/src/app/qgsshortcutsmanager.h b/src/app/qgsshortcutsmanager.h
@@ -26,7 +26,7 @@
   */
 class APP_EXPORT QgsShortcutsManager : public QObject
 {
-    Q_OBJECT;
+    Q_OBJECT
   public:
 
     //! return instance of the manager
@@ -56,6 +56,8 @@ class APP_EXPORT QgsShortcutsManager : public QObject
     // return action by it's name. NULL if nothing found
     QAction* actionByName( QString name );
 
+    ~QgsShortcutsManager();
+
   public slots:
     void actionDestroyed();
 
diff --git a/src/core/gps/qgsgpsconnectionregistry.cpp b/src/core/gps/qgsgpsconnectionregistry.cpp
@@ -18,11 +18,8 @@
 #include "qgsgpsconnectionregistry.h"
 #include "qgsgpsconnection.h"
 
-QgsGPSConnectionRegistry* QgsGPSConnectionRegistry::mInstance = 0;
-
 QgsGPSConnectionRegistry::QgsGPSConnectionRegistry()
 {
-
 }
 
 QgsGPSConnectionRegistry::~QgsGPSConnectionRegistry()
@@ -36,11 +33,8 @@ QgsGPSConnectionRegistry::~QgsGPSConnectionRegistry()
 
 QgsGPSConnectionRegistry* QgsGPSConnectionRegistry::instance()
 {
-  if ( !mInstance )
-  {
-    mInstance = new QgsGPSConnectionRegistry();
-  }
-  return mInstance;
+  static QgsGPSConnectionRegistry mInstance;
+  return &mInstance;
 }
 
 void QgsGPSConnectionRegistry::registerConnection( QgsGPSConnection* c )
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -592,7 +592,6 @@ void QgsApplication::initQgis()
 void QgsApplication::exitQgis()
 {
   delete QgsMapLayerRegistry::instance();
-  delete QgsProviderRegistry::instance();
 }
 
 QString QgsApplication::showSettings()
diff --git a/src/core/qgscrscache.cpp b/src/core/qgscrscache.cpp
@@ -18,15 +18,11 @@
 #include "qgscrscache.h"
 #include "qgscoordinatetransform.h"
 
-QgsCoordinateTransformCache* QgsCoordinateTransformCache::mInstance = 0;
 
 QgsCoordinateTransformCache* QgsCoordinateTransformCache::instance()
 {
-  if ( !mInstance )
-  {
-    mInstance = new QgsCoordinateTransformCache();
-  }
-  return mInstance;
+  static QgsCoordinateTransformCache mInstance;
+  return &mInstance;
 }
 
 QgsCoordinateTransformCache::~QgsCoordinateTransformCache()
@@ -36,7 +32,6 @@ QgsCoordinateTransformCache::~QgsCoordinateTransformCache()
   {
     delete tIt.value();
   }
-  delete mInstance;
 }
 
 const QgsCoordinateTransform* QgsCoordinateTransformCache::transform( const QString& srcAuthId, const QString& destAuthId )
@@ -79,15 +74,11 @@ void QgsCoordinateTransformCache::invalidateCrs( const QString& crsAuthId )
   }
 }
 
-QgsCRSCache* QgsCRSCache::mInstance = 0;
 
 QgsCRSCache* QgsCRSCache::instance()
 {
-  if ( !mInstance )
-  {
-    mInstance = new QgsCRSCache();
-  }
-  return mInstance;
+  static QgsCRSCache mInstance;
+  return &mInstance;
 }
 
 QgsCRSCache::QgsCRSCache()
@@ -96,7 +87,6 @@ QgsCRSCache::QgsCRSCache()
 
 QgsCRSCache::~QgsCRSCache()
 {
-  delete mInstance;
 }
 
 void QgsCRSCache::updateCRSCache( const QString& authid )
diff --git a/src/core/qgscrscache.h b/src/core/qgscrscache.h
@@ -38,7 +38,6 @@ class CORE_EXPORT QgsCoordinateTransformCache
     void invalidateCrs( const QString& crsAuthId );
 
   private:
-    static QgsCoordinateTransformCache* mInstance;
     QHash< QPair< QString, QString >, QgsCoordinateTransform* > mTransforms;
 };
 
@@ -57,7 +56,6 @@ class CORE_EXPORT QgsCRSCache
     QgsCRSCache();
 
   private:
-    static QgsCRSCache* mInstance;
     QHash< QString, QgsCoordinateReferenceSystem > mCRS;
     /**CRS that is not initialised (returned in case of error)*/
     QgsCoordinateReferenceSystem mInvalidCRS;
diff --git a/src/core/qgsmaplayerregistry.h b/src/core/qgsmaplayerregistry.h
@@ -245,14 +245,9 @@ class CORE_EXPORT QgsMapLayerRegistry : public QObject
     void connectNotify( const char * signal );
 
   private:
-
-    static QgsMapLayerRegistry* mInstance;
-
+    static QgsMapLayerRegistry *mInstance;
     QMap<QString, QgsMapLayer*> mMapLayers;
     QSet<QgsMapLayer*> mOwnedLayers;
-
-
-
 }; // class QgsMapLayerRegistry
 
 #endif //QgsMapLayerRegistry_H
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -41,7 +41,7 @@
 #include <QTextStream>
 
 // canonical project instance
-QgsProject * QgsProject::theProject_;
+QgsProject *QgsProject::theProject_ = 0;
 
 /**
     Take the given scope and key and convert them to a string list of key
@@ -304,8 +304,8 @@ struct QgsProject::Imp
   bool dirty;
 
   Imp()
-      : title( "" ),
-      dirty( false )
+      : title( "" )
+      , dirty( false )
   {                             // top property node is the root
     // "properties" that contains all plug-in
     // and extra property keys and values
@@ -359,18 +359,14 @@ QgsProject::~QgsProject()
 
 
 
-QgsProject * QgsProject::instance()
+QgsProject *QgsProject::instance()
 {
-  if ( !QgsProject::theProject_ )
+  if ( !theProject_ )
   {
-    QgsProject::theProject_ = new QgsProject;
+    theProject_ = new QgsProject;
   }
-
-  return QgsProject::theProject_;
-} // QgsProject * instance()
-
-
-
+  return theProject_;
+} // QgsProject *instance()
 
 void QgsProject::title( QString const &title )
 {
diff --git a/src/core/qgsproviderregistry.cpp b/src/core/qgsproviderregistry.cpp
@@ -43,17 +43,12 @@ typedef QString protocolDrivers_t();
 //typedef int dataCapabilities_t();
 //typedef QgsDataItem * dataItem_t(QString);
 
-QgsProviderRegistry *QgsProviderRegistry::_instance = 0;
+
 
 QgsProviderRegistry *QgsProviderRegistry::instance( QString pluginPath )
 {
-  if ( _instance == 0 )
-  {
-    _instance = new QgsProviderRegistry( pluginPath );
-  }
-
-  return _instance;
-
+  static QgsProviderRegistry mInstance( pluginPath );
+  return &mInstance;
 } // QgsProviderRegistry::instance
 
 
diff --git a/src/core/qgsproviderregistry.h b/src/core/qgsproviderregistry.h
@@ -155,13 +155,9 @@ class CORE_EXPORT QgsProviderRegistry
     typedef std::map<QString, QgsProviderMetadata*> Providers;
 
   private:
-
     /** ctor private since instance() creates it */
     QgsProviderRegistry( QString pluginPath );
 
-    /** pointer to canonical Singleton object */
-    static QgsProviderRegistry* _instance;
-
     /** associative container of provider metadata handles */
     Providers mProviders;
 
diff --git a/src/core/raster/qgsrasterrendererregistry.cpp b/src/core/raster/qgsrasterrendererregistry.cpp
@@ -35,15 +35,10 @@ QgsRasterRendererRegistryEntry::QgsRasterRendererRegistryEntry(): rendererCreate
 {
 }
 
-QgsRasterRendererRegistry* QgsRasterRendererRegistry::mInstance = 0;
-
 QgsRasterRendererRegistry* QgsRasterRendererRegistry::instance()
 {
-  if ( !mInstance )
-  {
-    mInstance = new QgsRasterRendererRegistry();
-  }
-  return mInstance;
+  static QgsRasterRendererRegistry mInstance;
+  return &mInstance;
 }
 
 QgsRasterRendererRegistry::QgsRasterRendererRegistry()
diff --git a/src/core/symbology-ng/qgsrendererv2registry.cpp b/src/core/symbology-ng/qgsrendererv2registry.cpp
@@ -21,8 +21,6 @@
 #include "qgsrulebasedrendererv2.h"
 #include "qgspointdisplacementrenderer.h"
 
-QgsRendererV2Registry* QgsRendererV2Registry::mInstance = NULL;
-
 QgsRendererV2Registry::QgsRendererV2Registry()
 {
   // add default renderers
@@ -59,10 +57,8 @@ QgsRendererV2Registry::~QgsRendererV2Registry()
 
 QgsRendererV2Registry* QgsRendererV2Registry::instance()
 {
-  if ( !mInstance )
-    mInstance = new QgsRendererV2Registry();
-
-  return mInstance;
+  static QgsRendererV2Registry mInstance;
+  return &mInstance;
 }
 
 
diff --git a/src/core/symbology-ng/qgsrendererv2registry.h b/src/core/symbology-ng/qgsrendererv2registry.h
@@ -156,8 +156,6 @@ class CORE_EXPORT QgsRendererV2Registry
     QgsRendererV2Registry();
     ~QgsRendererV2Registry();
 
-    static QgsRendererV2Registry* mInstance;
-
     QMap<QString, QgsRendererV2AbstractMetadata*> mRenderers;
 
     //! list to keep order in which renderers have been added
diff --git a/src/core/symbology-ng/qgssvgcache.cpp b/src/core/symbology-ng/qgssvgcache.cpp
@@ -79,15 +79,10 @@ double rasterScaleFactor;
 QColor fill;
 QColor outline;
 
-QgsSvgCache* QgsSvgCache::mInstance = 0;
-
 QgsSvgCache* QgsSvgCache::instance()
 {
-  if ( !mInstance )
-  {
-    mInstance = new QgsSvgCache();
-  }
-  return mInstance;
+  static QgsSvgCache mInstance;
+  return &mInstance;
 }
 
 QgsSvgCache::QgsSvgCache( QObject *parent )
diff --git a/src/core/symbology-ng/qgssvgcache.h b/src/core/symbology-ng/qgssvgcache.h
@@ -111,8 +111,6 @@ class CORE_EXPORT QgsSvgCache : public QObject
     void downloadProgress( qint64, qint64 );
 
   private:
-    static QgsSvgCache* mInstance;
-
     /**Entry pointers accessible by file name*/
     QMultiHash< QString, QgsSvgCacheEntry* > mEntryLookup;
     /**Estimated total size of all images, pictures and svgContent*/
diff --git a/src/core/symbology-ng/qgssymbollayerv2registry.cpp b/src/core/symbology-ng/qgssymbollayerv2registry.cpp
@@ -21,8 +21,6 @@
 #include "qgsfillsymbollayerv2.h"
 #include "qgsvectorfieldsymbollayer.h"
 
-QgsSymbolLayerV2Registry* QgsSymbolLayerV2Registry::mInstance = NULL;
-
 QgsSymbolLayerV2Registry::QgsSymbolLayerV2Registry()
 {
   // init registry with known symbol layers
@@ -83,9 +81,8 @@ QgsSymbolLayerV2AbstractMetadata* QgsSymbolLayerV2Registry::symbolLayerMetadata(
 
 QgsSymbolLayerV2Registry* QgsSymbolLayerV2Registry::instance()
 {
-  if ( !mInstance )
-    mInstance = new QgsSymbolLayerV2Registry();
-  return mInstance;
+  static QgsSymbolLayerV2Registry mInstance;
+  return &mInstance;
 }
 
 QgsSymbolLayerV2* QgsSymbolLayerV2Registry::defaultSymbolLayer( QgsSymbolV2::SymbolType type )
diff --git a/src/core/symbology-ng/qgssymbollayerv2registry.h b/src/core/symbology-ng/qgssymbollayerv2registry.h
@@ -140,7 +140,6 @@ class CORE_EXPORT QgsSymbolLayerV2Registry
     QgsSymbolLayerV2Registry();
     ~QgsSymbolLayerV2Registry();
 
-    static QgsSymbolLayerV2Registry* mInstance;
     QMap<QString, QgsSymbolLayerV2AbstractMetadata*> mMetadata;
 
 };
diff --git a/src/mapserver/qgsconfigcache.cpp b/src/mapserver/qgsconfigcache.cpp
@@ -23,15 +23,11 @@
 #include "qgssldparser.h"
 #include <QCoreApplication>
 
-QgsConfigCache* QgsConfigCache::mInstance = 0;
 
 QgsConfigCache* QgsConfigCache::instance()
 {
-  if ( !mInstance )
-  {
-    mInstance = new QgsConfigCache();
-  }
-  return mInstance;
+  static QgsConfigCache mInstance;
+  return &mInstance;
 }
 
 QgsConfigCache::QgsConfigCache()
diff --git a/src/mapserver/qgsmslayercache.cpp b/src/mapserver/qgsmslayercache.cpp
@@ -20,15 +20,10 @@
 #include "qgslogger.h"
 #include <QFile>
 
-QgsMSLayerCache* QgsMSLayerCache::mInstance = 0;
-
 QgsMSLayerCache* QgsMSLayerCache::instance()
 {
-  if ( !mInstance )
-  {
-    mInstance = new QgsMSLayerCache();
-  }
-  return mInstance;
+  static QgsMSLayerCache mInstance;
+  return &mInstance;
 }
 
 QgsMSLayerCache::QgsMSLayerCache()
@@ -55,7 +50,6 @@ QgsMSLayerCache::~QgsMSLayerCache()
   {
     delete entry.layerPointer;
   }
-  delete mInstance;
 }
 
 void QgsMSLayerCache::insertLayer( const QString& url, const QString& layerName, QgsMapLayer* layer, const QString& configFile, const QList<QString>& tempFiles )
diff --git a/src/mapserver/qgsmslayercache.h b/src/mapserver/qgsmslayercache.h
diff --git a/src/plugins/spit/qgspgutil.cpp b/src/plugins/spit/qgspgutil.cpp
diff --git a/src/plugins/spit/qgspgutil.h b/src/plugins/spit/qgspgutil.h

Original file line number	Diff line number	Diff line change
`@@ -734,7 +734,7 @@ QgsVectorLayer::EditType QgsFieldsProperties::editTypeFromButton( QPushButton* b`
`734`	`734`
`735`	`735`	`QgsAttributeEditorElement* QgsFieldsProperties::createAttributeEditorWidget( QTreeWidgetItem* item, QObject *parent )`
`736`	`736`	`{`
`737`		`- QgsAttributeEditorElement* widgetDef;`
	`737`	`+ QgsAttributeEditorElement *widgetDef = 0;`
`738`	`738`
`739`	`739`	`DesignerTreeItemData itemData = item->data( 0, DesignerTreeRole ).value<DesignerTreeItemData>();`
`740`	`740`	`switch ( itemData.type() )`
Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,16 @@`
`17`	`17`
`18`	`18`	`#include <QSettings>`
`19`	`19`
	`20`	`+QgsShortcutsManager* QgsShortcutsManager::mInstance = NULL;`
	`21`	`+`
`20`	`22`	`QgsShortcutsManager::QgsShortcutsManager( QObject *parent ) : QObject( parent )`
`21`	`23`	`{`
`22`	`24`	`}`
`23`	`25`
`24`		`-QgsShortcutsManager* QgsShortcutsManager::mInstance = NULL;`
	`26`	`+QgsShortcutsManager::~QgsShortcutsManager()`
	`27`	`+{`
	`28`	`+ mInstance = 0;`
	`29`	`+}`
`25`	`30`
`26`	`31`	`QgsShortcutsManager* QgsShortcutsManager::instance( QObject *parent )`
`27`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,8 @@`
`18`	`18`	`#include "qgsgpsconnectionregistry.h"`
`19`	`19`	`#include "qgsgpsconnection.h"`
`20`	`20`
`21`		`-QgsGPSConnectionRegistry* QgsGPSConnectionRegistry::mInstance = 0;`
`22`		`-`
`23`	`21`	`QgsGPSConnectionRegistry::QgsGPSConnectionRegistry()`
`24`	`22`	`{`
`25`		`-`
`26`	`23`	`}`
`27`	`24`
`28`	`25`	`QgsGPSConnectionRegistry::~QgsGPSConnectionRegistry()`
`@@ -36,11 +33,8 @@ QgsGPSConnectionRegistry::~QgsGPSConnectionRegistry()`
`36`	`33`
`37`	`34`	`QgsGPSConnectionRegistry* QgsGPSConnectionRegistry::instance()`
`38`	`35`	`{`
`39`		`- if ( !mInstance )`
`40`		`- {`
`41`		`- mInstance = new QgsGPSConnectionRegistry();`
`42`		`- }`
`43`		`- return mInstance;`
	`36`	`+ static QgsGPSConnectionRegistry mInstance;`
	`37`	`+ return &mInstance;`
`44`	`38`	`}`
`45`	`39`
`46`	`40`	`void QgsGPSConnectionRegistry::registerConnection( QgsGPSConnection* c )`
Original file line number	Diff line number	Diff line change
`@@ -592,7 +592,6 @@ void QgsApplication::initQgis()`
`592`	`592`	`void QgsApplication::exitQgis()`
`593`	`593`	`{`
`594`	`594`	`delete QgsMapLayerRegistry::instance();`
`595`		`- delete QgsProviderRegistry::instance();`
`596`	`595`	`}`
`597`	`596`
`598`	`597`	`QString QgsApplication::showSettings()`
Original file line number	Diff line number	Diff line change
`@@ -18,15 +18,11 @@`
`18`	`18`	`#include "qgscrscache.h"`
`19`	`19`	`#include "qgscoordinatetransform.h"`
`20`	`20`
`21`		`-QgsCoordinateTransformCache* QgsCoordinateTransformCache::mInstance = 0;`
`22`	`21`
`23`	`22`	`QgsCoordinateTransformCache* QgsCoordinateTransformCache::instance()`
`24`	`23`	`{`
`25`		`- if ( !mInstance )`
`26`		`- {`
`27`		`- mInstance = new QgsCoordinateTransformCache();`
`28`		`- }`
`29`		`- return mInstance;`
	`24`	`+ static QgsCoordinateTransformCache mInstance;`
	`25`	`+ return &mInstance;`
`30`	`26`	`}`
`31`	`27`
`32`	`28`	`QgsCoordinateTransformCache::~QgsCoordinateTransformCache()`
`@@ -36,7 +32,6 @@ QgsCoordinateTransformCache::~QgsCoordinateTransformCache()`
`36`	`32`	`{`
`37`	`33`	`delete tIt.value();`
`38`	`34`	`}`
`39`		`- delete mInstance;`
`40`	`35`	`}`
`41`	`36`
`42`	`37`	`const QgsCoordinateTransform* QgsCoordinateTransformCache::transform( const QString& srcAuthId, const QString& destAuthId )`
`@@ -79,15 +74,11 @@ void QgsCoordinateTransformCache::invalidateCrs( const QString& crsAuthId )`
`79`	`74`	`}`
`80`	`75`	`}`
`81`	`76`
`82`		`-QgsCRSCache* QgsCRSCache::mInstance = 0;`
`83`	`77`
`84`	`78`	`QgsCRSCache* QgsCRSCache::instance()`
`85`	`79`	`{`
`86`		`- if ( !mInstance )`
`87`		`- {`
`88`		`- mInstance = new QgsCRSCache();`
`89`		`- }`
`90`		`- return mInstance;`
	`80`	`+ static QgsCRSCache mInstance;`
	`81`	`+ return &mInstance;`
`91`	`82`	`}`
`92`	`83`
`93`	`84`	`QgsCRSCache::QgsCRSCache()`
`@@ -96,7 +87,6 @@ QgsCRSCache::QgsCRSCache()`
`96`	`87`
`97`	`88`	`QgsCRSCache::~QgsCRSCache()`
`98`	`89`	`{`
`99`		`- delete mInstance;`
`100`	`90`	`}`
`101`	`91`
`102`	`92`	`void QgsCRSCache::updateCRSCache( const QString& authid )`
Original file line number	Diff line number	Diff line change
`@@ -35,15 +35,10 @@ QgsRasterRendererRegistryEntry::QgsRasterRendererRegistryEntry(): rendererCreate`
`35`	`35`	`{`
`36`	`36`	`}`
`37`	`37`
`38`		`-QgsRasterRendererRegistry* QgsRasterRendererRegistry::mInstance = 0;`
`39`		`-`
`40`	`38`	`QgsRasterRendererRegistry* QgsRasterRendererRegistry::instance()`
`41`	`39`	`{`
`42`		`- if ( !mInstance )`
`43`		`- {`
`44`		`- mInstance = new QgsRasterRendererRegistry();`
`45`		`- }`
`46`		`- return mInstance;`
	`40`	`+ static QgsRasterRendererRegistry mInstance;`
	`41`	`+ return &mInstance;`
`47`	`42`	`}`
`48`	`43`
`49`	`44`	`QgsRasterRendererRegistry::QgsRasterRendererRegistry()`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,6 @@`
`21`	`21`	`#include "qgsrulebasedrendererv2.h"`
`22`	`22`	`#include "qgspointdisplacementrenderer.h"`
`23`	`23`
`24`		`-QgsRendererV2Registry* QgsRendererV2Registry::mInstance = NULL;`
`25`		`-`
`26`	`24`	`QgsRendererV2Registry::QgsRendererV2Registry()`
`27`	`25`	`{`
`28`	`26`	`// add default renderers`
`@@ -59,10 +57,8 @@ QgsRendererV2Registry::~QgsRendererV2Registry()`
`59`	`57`
`60`	`58`	`QgsRendererV2Registry* QgsRendererV2Registry::instance()`
`61`	`59`	`{`
`62`		`- if ( !mInstance )`
`63`		`- mInstance = new QgsRendererV2Registry();`
`64`		`-`
`65`		`- return mInstance;`
	`60`	`+ static QgsRendererV2Registry mInstance;`
	`61`	`+ return &mInstance;`
`66`	`62`	`}`
`67`	`63`
`68`	`64`
Original file line number	Diff line number	Diff line change
`@@ -20,15 +20,10 @@`
`20`	`20`	`#include "qgslogger.h"`
`21`	`21`	`#include <QFile>`
`22`	`22`
`23`		`-QgsMSLayerCache* QgsMSLayerCache::mInstance = 0;`
`24`		`-`
`25`	`23`	`QgsMSLayerCache* QgsMSLayerCache::instance()`
`26`	`24`	`{`
`27`		`- if ( !mInstance )`
`28`		`- {`
`29`		`- mInstance = new QgsMSLayerCache();`
`30`		`- }`
`31`		`- return mInstance;`
	`25`	`+ static QgsMSLayerCache mInstance;`
	`26`	`+ return &mInstance;`
`32`	`27`	`}`
`33`	`28`
`34`	`29`	`QgsMSLayerCache::QgsMSLayerCache()`
`@@ -55,7 +50,6 @@ QgsMSLayerCache::~QgsMSLayerCache()`
`55`	`50`	`{`
`56`	`51`	`delete entry.layerPointer;`
`57`	`52`	`}`
`58`		`- delete mInstance;`
`59`	`53`	`}`
`60`	`54`
`61`	`55`	`void QgsMSLayerCache::insertLayer( const QString& url, const QString& layerName, QgsMapLayer* layer, const QString& configFile, const QList<QString>& tempFiles )`