[Plugin Manager] Make appropriate methods const

borysiasty · borysiasty · commit 039ae695076a · 2013-06-10T20:55:08.000+02:00
diff --git a/python/gui/qgspluginmanagerinterface.sip b/python/gui/qgspluginmanagerinterface.sip
@@ -26,7 +26,7 @@ class QgsPluginManagerInterface : QObject
     virtual void reloadModel() = 0;
 
     //! return given plugin metadata
-    virtual QMap<QString, QString> * pluginMetadata( QString key ) = 0;
+    virtual const QMap<QString, QString> * pluginMetadata( QString key ) const = 0;
 
     //! clear the repository listWidget
     virtual void clearRepositoryList() = 0;
diff --git a/src/app/pluginmanager/qgsapppluginmanagerinterface.cpp b/src/app/pluginmanager/qgsapppluginmanagerinterface.cpp
@@ -72,7 +72,7 @@ void QgsAppPluginManagerInterface::reloadModel()
 
 
 //! return given plugin metadata
-QMap<QString, QString> * QgsAppPluginManagerInterface::pluginMetadata( QString key )
+const QMap<QString, QString> * QgsAppPluginManagerInterface::pluginMetadata( QString key ) const
 {
   return mPluginManager->pluginMetadata( key );
 }
diff --git a/src/app/pluginmanager/qgsapppluginmanagerinterface.h b/src/app/pluginmanager/qgsapppluginmanagerinterface.h
@@ -46,7 +46,7 @@ class QgsAppPluginManagerInterface : public QgsPluginManagerInterface
     void reloadModel();
 
     //! return given plugin metadata
-    QMap<QString, QString> * pluginMetadata( QString key );
+    const QMap<QString, QString> * pluginMetadata( QString key ) const;
 
     //! clear the repository listWidget
     void clearRepositoryList();
diff --git a/src/app/pluginmanager/qgspluginmanager.cpp b/src/app/pluginmanager/qgspluginmanager.cpp
@@ -188,7 +188,7 @@ void QgsPluginManager::setPythonUtils( QgsPythonUtils* pythonUtils )
 
 void QgsPluginManager::loadPlugin( QString id )
 {
-  QMap<QString, QString>* plugin = pluginMetadata( id );
+  const QMap<QString, QString>* plugin = pluginMetadata( id );
 
   if ( ! plugin )
   {
@@ -219,7 +219,7 @@ void QgsPluginManager::loadPlugin( QString id )
 
 void QgsPluginManager::unloadPlugin( QString id )
 {
-  QMap<QString, QString>* plugin = pluginMetadata( id );
+  const QMap<QString, QString>* plugin = pluginMetadata( id );
 
   if ( ! plugin )
   {
@@ -547,7 +547,7 @@ void QgsPluginManager::pluginItemChanged( QStandardItem * item )
 
 void QgsPluginManager::showPluginDetails( QStandardItem * item )
 {
-  QMap<QString, QString> * metadata = pluginMetadata( item->data( PLUGIN_BASE_NAME_ROLE ).toString() );
+  const QMap<QString, QString> * metadata = pluginMetadata( item->data( PLUGIN_BASE_NAME_ROLE ).toString() );
 
   if ( ! metadata ) return;
 
@@ -767,9 +767,9 @@ void QgsPluginManager::addPluginMetadata( QString key,  QMap<QString, QString> m
 
 
 
-QMap<QString, QString>* QgsPluginManager::pluginMetadata( QString key )
+const QMap<QString, QString> * QgsPluginManager::pluginMetadata( QString key ) const
 {
-  QMap<QString, QMap<QString, QString> >::iterator it = mPlugins.find( key );
+  QMap<QString, QMap<QString, QString> >::const_iterator it = mPlugins.find( key );
   if ( it != mPlugins.end() )
   {
     return &it.value();
@@ -1174,7 +1174,7 @@ void QgsPluginManager::on_ckbExperimental_toggled( bool state )
 
 bool QgsPluginManager::isPluginLoaded( QString key )
 {
-  QMap<QString, QString>* plugin = pluginMetadata( key );
+  const QMap<QString, QString>* plugin = pluginMetadata( key );
   if ( plugin->isEmpty() )
   {
     // No such plugin in the metadata registry
diff --git a/src/app/pluginmanager/qgspluginmanager.h b/src/app/pluginmanager/qgspluginmanager.h
@@ -72,7 +72,7 @@ class QgsPluginManager : public QgsOptionsDialogBase, private Ui::QgsPluginManag
     void addPluginMetadata( QString key, QMap<QString, QString> metadata );
 
     //! Return metadata of given plugin
-    QMap<QString, QString> * pluginMetadata( QString key );
+    const QMap<QString, QString> * pluginMetadata( QString key ) const;
 
     //! Select one of the vertical tabs programatically
     void selectTabItem( int idx );
diff --git a/src/app/qgspluginregistry.cpp b/src/app/qgspluginregistry.cpp
@@ -67,9 +67,9 @@ void QgsPluginRegistry::setPythonUtils( QgsPythonUtils* pythonUtils )
   mPythonUtils = pythonUtils;
 }
 
-bool QgsPluginRegistry::isLoaded( QString key )
+bool QgsPluginRegistry::isLoaded( QString key ) const
 {
-  QMap<QString, QgsPluginMetadata>::iterator it = mPlugins.find( key );
+  QMap<QString, QgsPluginMetadata>::const_iterator it = mPlugins.find( key );
   if ( it != mPlugins.end() ) // found a c++ plugin?
     return true;
 
@@ -107,7 +107,7 @@ QgisPlugin *QgsPluginRegistry::plugin( QString key )
   return it->plugin();
 }
 
-bool QgsPluginRegistry::isPythonPlugin( QString key )
+bool QgsPluginRegistry::isPythonPlugin( QString key ) const
 {
   if ( mPythonUtils && mPythonUtils->isEnabled() )
   {
@@ -184,7 +184,7 @@ void QgsPluginRegistry::unloadAll()
 }
 
 
-bool QgsPluginRegistry::checkQgisVersion( QString minVersion, QString maxVersion )
+bool QgsPluginRegistry::checkQgisVersion( QString minVersion, QString maxVersion ) const
 {
   // Parse qgisMinVersion. Must be in form x.y.z or just x.y
   QStringList minVersionParts = minVersion.split( '.' );
@@ -593,7 +593,7 @@ bool QgsPluginRegistry::checkPythonPlugin( QString packageName )
   return true;
 }
 
-bool QgsPluginRegistry::isPythonPluginCompatible( QString packageName )
+bool QgsPluginRegistry::isPythonPluginCompatible( QString packageName ) const
 {
   QString minVersion = mPythonUtils->getPluginMetadata( packageName, "qgisMinimumVersion" );
   // try to read qgisMaximumVersion. Note checkQgisVersion can cope with "__error__" value.
diff --git a/src/app/qgspluginregistry.h b/src/app/qgspluginregistry.h
@@ -46,7 +46,7 @@ class QgsPluginRegistry
     void setQgisInterface( QgisInterface* iface );
 
     //! Check whether this module is loaded
-    bool isLoaded( QString key );
+    bool isLoaded( QString key ) const;
 
     //! Retrieve library of the plugin
     QString library( QString key );
@@ -55,7 +55,7 @@ class QgsPluginRegistry
     QgisPlugin * plugin( QString key );
 
     //! Return whether the plugin is pythonic
-    bool isPythonPlugin( QString key );
+    bool isPythonPlugin( QString key ) const;
 
     //! Add a plugin to the map of loaded plugins
     void addPlugin( QString key, QgsPluginMetadata metadata );
@@ -88,7 +88,7 @@ class QgsPluginRegistry
     void restoreSessionPlugins( QString thePluginDirString );
 
     //! Check whether plugin is compatible with current version of QGIS
-    bool isPythonPluginCompatible( QString packageName );
+    bool isPythonPluginCompatible( QString packageName ) const;
 
     //! Returns metadata of all loaded plugins
     QList<QgsPluginMetadata*> pluginData();
@@ -104,7 +104,7 @@ class QgsPluginRegistry
 
     //! Check current QGIS version against requested minimal and optionally maximal QGIS version
     //! if maxVersion not specified, the default value is assumed: floor(minVersion) + 0.99.99
-    bool checkQgisVersion( QString minVersion, QString maxVersion = "" );
+    bool checkQgisVersion( QString minVersion, QString maxVersion = "" ) const;
 
   private:
     static QgsPluginRegistry* _instance;
diff --git a/src/gui/qgspluginmanagerinterface.h b/src/gui/qgspluginmanagerinterface.h
@@ -43,7 +43,7 @@ class GUI_EXPORT QgsPluginManagerInterface : public QObject
     virtual void reloadModel() = 0;
 
     //! return given plugin metadata
-    virtual QMap<QString, QString> * pluginMetadata( QString key ) = 0;
+    virtual const QMap<QString, QString> * pluginMetadata( QString key ) const = 0;
 
     //! clear the repository listWidget
     virtual void clearRepositoryList() = 0;

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ void QgsAppPluginManagerInterface::reloadModel()`
`72`	`72`
`73`	`73`
`74`	`74`	`//! return given plugin metadata`
`75`		`-QMap<QString, QString> * QgsAppPluginManagerInterface::pluginMetadata( QString key )`
	`75`	`+const QMap<QString, QString> * QgsAppPluginManagerInterface::pluginMetadata( QString key ) const`
`76`	`76`	`{`
`77`	`77`	`return mPluginManager->pluginMetadata( key );`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ void QgsPluginManager::setPythonUtils( QgsPythonUtils* pythonUtils )`
`188`	`188`
`189`	`189`	`void QgsPluginManager::loadPlugin( QString id )`
`190`	`190`	`{`
`191`		`- QMap<QString, QString>* plugin = pluginMetadata( id );`
	`191`	`+ const QMap<QString, QString>* plugin = pluginMetadata( id );`
`192`	`192`
`193`	`193`	`if ( ! plugin )`
`194`	`194`	`{`
`@@ -219,7 +219,7 @@ void QgsPluginManager::loadPlugin( QString id )`
`219`	`219`
`220`	`220`	`void QgsPluginManager::unloadPlugin( QString id )`
`221`	`221`	`{`
`222`		`- QMap<QString, QString>* plugin = pluginMetadata( id );`
	`222`	`+ const QMap<QString, QString>* plugin = pluginMetadata( id );`
`223`	`223`
`224`	`224`	`if ( ! plugin )`
`225`	`225`	`{`
`@@ -547,7 +547,7 @@ void QgsPluginManager::pluginItemChanged( QStandardItem * item )`
`547`	`547`
`548`	`548`	`void QgsPluginManager::showPluginDetails( QStandardItem * item )`
`549`	`549`	`{`
`550`		`- QMap<QString, QString> * metadata = pluginMetadata( item->data( PLUGIN_BASE_NAME_ROLE ).toString() );`
	`550`	`+ const QMap<QString, QString> * metadata = pluginMetadata( item->data( PLUGIN_BASE_NAME_ROLE ).toString() );`
`551`	`551`
`552`	`552`	`if ( ! metadata ) return;`
`553`	`553`
`@@ -767,9 +767,9 @@ void QgsPluginManager::addPluginMetadata( QString key, QMap<QString, QString> m`
`767`	`767`
`768`	`768`
`769`	`769`
`770`		`-QMap<QString, QString>* QgsPluginManager::pluginMetadata( QString key )`
	`770`	`+const QMap<QString, QString> * QgsPluginManager::pluginMetadata( QString key ) const`
`771`	`771`	`{`
`772`		`- QMap<QString, QMap<QString, QString> >::iterator it = mPlugins.find( key );`
	`772`	`+ QMap<QString, QMap<QString, QString> >::const_iterator it = mPlugins.find( key );`
`773`	`773`	`if ( it != mPlugins.end() )`
`774`	`774`	`{`
`775`	`775`	`return &it.value();`
`@@ -1174,7 +1174,7 @@ void QgsPluginManager::on_ckbExperimental_toggled( bool state )`
`1174`	`1174`
`1175`	`1175`	`bool QgsPluginManager::isPluginLoaded( QString key )`
`1176`	`1176`	`{`
`1177`		`- QMap<QString, QString>* plugin = pluginMetadata( key );`
	`1177`	`+ const QMap<QString, QString>* plugin = pluginMetadata( key );`
`1178`	`1178`	`if ( plugin->isEmpty() )`
`1179`	`1179`	`{`
`1180`	`1180`	`// No such plugin in the metadata registry`
Original file line number	Diff line number	Diff line change
`@@ -67,9 +67,9 @@ void QgsPluginRegistry::setPythonUtils( QgsPythonUtils* pythonUtils )`
`67`	`67`	`mPythonUtils = pythonUtils;`
`68`	`68`	`}`
`69`	`69`
`70`		`-bool QgsPluginRegistry::isLoaded( QString key )`
	`70`	`+bool QgsPluginRegistry::isLoaded( QString key ) const`
`71`	`71`	`{`
`72`		`- QMap<QString, QgsPluginMetadata>::iterator it = mPlugins.find( key );`
	`72`	`+ QMap<QString, QgsPluginMetadata>::const_iterator it = mPlugins.find( key );`
`73`	`73`	`if ( it != mPlugins.end() ) // found a c++ plugin?`
`74`	`74`	`return true;`
`75`	`75`
`@@ -107,7 +107,7 @@ QgisPlugin *QgsPluginRegistry::plugin( QString key )`
`107`	`107`	`return it->plugin();`
`108`	`108`	`}`
`109`	`109`
`110`		`-bool QgsPluginRegistry::isPythonPlugin( QString key )`
	`110`	`+bool QgsPluginRegistry::isPythonPlugin( QString key ) const`
`111`	`111`	`{`
`112`	`112`	`if ( mPythonUtils && mPythonUtils->isEnabled() )`
`113`	`113`	`{`
`@@ -184,7 +184,7 @@ void QgsPluginRegistry::unloadAll()`
`184`	`184`	`}`
`185`	`185`
`186`	`186`
`187`		`-bool QgsPluginRegistry::checkQgisVersion( QString minVersion, QString maxVersion )`
	`187`	`+bool QgsPluginRegistry::checkQgisVersion( QString minVersion, QString maxVersion ) const`
`188`	`188`	`{`
`189`	`189`	`// Parse qgisMinVersion. Must be in form x.y.z or just x.y`
`190`	`190`	`QStringList minVersionParts = minVersion.split( '.' );`
`@@ -593,7 +593,7 @@ bool QgsPluginRegistry::checkPythonPlugin( QString packageName )`
`593`	`593`	`return true;`
`594`	`594`	`}`
`595`	`595`
`596`		`-bool QgsPluginRegistry::isPythonPluginCompatible( QString packageName )`
	`596`	`+bool QgsPluginRegistry::isPythonPluginCompatible( QString packageName ) const`
`597`	`597`	`{`
`598`	`598`	`QString minVersion = mPythonUtils->getPluginMetadata( packageName, "qgisMinimumVersion" );`
`599`	`599`	`// try to read qgisMaximumVersion. Note checkQgisVersion can cope with "__error__" value.`