Skip to content

Commit 039ae69

Browse files
committed
[Plugin Manager] Make appropriate methods const
1 parent 9ca721e commit 039ae69

8 files changed

+20
-20
lines changed

python/gui/qgspluginmanagerinterface.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class QgsPluginManagerInterface : QObject
2626
virtual void reloadModel() = 0;
2727

2828
//! return given plugin metadata
29-
virtual QMap<QString, QString> * pluginMetadata( QString key ) = 0;
29+
virtual const QMap<QString, QString> * pluginMetadata( QString key ) const = 0;
3030

3131
//! clear the repository listWidget
3232
virtual void clearRepositoryList() = 0;

src/app/pluginmanager/qgsapppluginmanagerinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void QgsAppPluginManagerInterface::reloadModel()
7272

7373

7474
//! return given plugin metadata
75-
QMap<QString, QString> * QgsAppPluginManagerInterface::pluginMetadata( QString key )
75+
const QMap<QString, QString> * QgsAppPluginManagerInterface::pluginMetadata( QString key ) const
7676
{
7777
return mPluginManager->pluginMetadata( key );
7878
}

src/app/pluginmanager/qgsapppluginmanagerinterface.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class QgsAppPluginManagerInterface : public QgsPluginManagerInterface
4646
void reloadModel();
4747

4848
//! return given plugin metadata
49-
QMap<QString, QString> * pluginMetadata( QString key );
49+
const QMap<QString, QString> * pluginMetadata( QString key ) const;
5050

5151
//! clear the repository listWidget
5252
void clearRepositoryList();

src/app/pluginmanager/qgspluginmanager.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ void QgsPluginManager::setPythonUtils( QgsPythonUtils* pythonUtils )
188188

189189
void QgsPluginManager::loadPlugin( QString id )
190190
{
191-
QMap<QString, QString>* plugin = pluginMetadata( id );
191+
const QMap<QString, QString>* plugin = pluginMetadata( id );
192192

193193
if ( ! plugin )
194194
{
@@ -219,7 +219,7 @@ void QgsPluginManager::loadPlugin( QString id )
219219

220220
void QgsPluginManager::unloadPlugin( QString id )
221221
{
222-
QMap<QString, QString>* plugin = pluginMetadata( id );
222+
const QMap<QString, QString>* plugin = pluginMetadata( id );
223223

224224
if ( ! plugin )
225225
{
@@ -547,7 +547,7 @@ void QgsPluginManager::pluginItemChanged( QStandardItem * item )
547547

548548
void QgsPluginManager::showPluginDetails( QStandardItem * item )
549549
{
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() );
551551

552552
if ( ! metadata ) return;
553553

@@ -767,9 +767,9 @@ void QgsPluginManager::addPluginMetadata( QString key, QMap<QString, QString> m
767767

768768

769769

770-
QMap<QString, QString>* QgsPluginManager::pluginMetadata( QString key )
770+
const QMap<QString, QString> * QgsPluginManager::pluginMetadata( QString key ) const
771771
{
772-
QMap<QString, QMap<QString, QString> >::iterator it = mPlugins.find( key );
772+
QMap<QString, QMap<QString, QString> >::const_iterator it = mPlugins.find( key );
773773
if ( it != mPlugins.end() )
774774
{
775775
return &it.value();
@@ -1174,7 +1174,7 @@ void QgsPluginManager::on_ckbExperimental_toggled( bool state )
11741174

11751175
bool QgsPluginManager::isPluginLoaded( QString key )
11761176
{
1177-
QMap<QString, QString>* plugin = pluginMetadata( key );
1177+
const QMap<QString, QString>* plugin = pluginMetadata( key );
11781178
if ( plugin->isEmpty() )
11791179
{
11801180
// No such plugin in the metadata registry

src/app/pluginmanager/qgspluginmanager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class QgsPluginManager : public QgsOptionsDialogBase, private Ui::QgsPluginManag
7272
void addPluginMetadata( QString key, QMap<QString, QString> metadata );
7373

7474
//! Return metadata of given plugin
75-
QMap<QString, QString> * pluginMetadata( QString key );
75+
const QMap<QString, QString> * pluginMetadata( QString key ) const;
7676

7777
//! Select one of the vertical tabs programatically
7878
void selectTabItem( int idx );

src/app/qgspluginregistry.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ void QgsPluginRegistry::setPythonUtils( QgsPythonUtils* pythonUtils )
6767
mPythonUtils = pythonUtils;
6868
}
6969

70-
bool QgsPluginRegistry::isLoaded( QString key )
70+
bool QgsPluginRegistry::isLoaded( QString key ) const
7171
{
72-
QMap<QString, QgsPluginMetadata>::iterator it = mPlugins.find( key );
72+
QMap<QString, QgsPluginMetadata>::const_iterator it = mPlugins.find( key );
7373
if ( it != mPlugins.end() ) // found a c++ plugin?
7474
return true;
7575

@@ -107,7 +107,7 @@ QgisPlugin *QgsPluginRegistry::plugin( QString key )
107107
return it->plugin();
108108
}
109109

110-
bool QgsPluginRegistry::isPythonPlugin( QString key )
110+
bool QgsPluginRegistry::isPythonPlugin( QString key ) const
111111
{
112112
if ( mPythonUtils && mPythonUtils->isEnabled() )
113113
{
@@ -184,7 +184,7 @@ void QgsPluginRegistry::unloadAll()
184184
}
185185

186186

187-
bool QgsPluginRegistry::checkQgisVersion( QString minVersion, QString maxVersion )
187+
bool QgsPluginRegistry::checkQgisVersion( QString minVersion, QString maxVersion ) const
188188
{
189189
// Parse qgisMinVersion. Must be in form x.y.z or just x.y
190190
QStringList minVersionParts = minVersion.split( '.' );
@@ -593,7 +593,7 @@ bool QgsPluginRegistry::checkPythonPlugin( QString packageName )
593593
return true;
594594
}
595595

596-
bool QgsPluginRegistry::isPythonPluginCompatible( QString packageName )
596+
bool QgsPluginRegistry::isPythonPluginCompatible( QString packageName ) const
597597
{
598598
QString minVersion = mPythonUtils->getPluginMetadata( packageName, "qgisMinimumVersion" );
599599
// try to read qgisMaximumVersion. Note checkQgisVersion can cope with "__error__" value.

src/app/qgspluginregistry.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class QgsPluginRegistry
4646
void setQgisInterface( QgisInterface* iface );
4747

4848
//! Check whether this module is loaded
49-
bool isLoaded( QString key );
49+
bool isLoaded( QString key ) const;
5050

5151
//! Retrieve library of the plugin
5252
QString library( QString key );
@@ -55,7 +55,7 @@ class QgsPluginRegistry
5555
QgisPlugin * plugin( QString key );
5656

5757
//! Return whether the plugin is pythonic
58-
bool isPythonPlugin( QString key );
58+
bool isPythonPlugin( QString key ) const;
5959

6060
//! Add a plugin to the map of loaded plugins
6161
void addPlugin( QString key, QgsPluginMetadata metadata );
@@ -88,7 +88,7 @@ class QgsPluginRegistry
8888
void restoreSessionPlugins( QString thePluginDirString );
8989

9090
//! Check whether plugin is compatible with current version of QGIS
91-
bool isPythonPluginCompatible( QString packageName );
91+
bool isPythonPluginCompatible( QString packageName ) const;
9292

9393
//! Returns metadata of all loaded plugins
9494
QList<QgsPluginMetadata*> pluginData();
@@ -104,7 +104,7 @@ class QgsPluginRegistry
104104

105105
//! Check current QGIS version against requested minimal and optionally maximal QGIS version
106106
//! if maxVersion not specified, the default value is assumed: floor(minVersion) + 0.99.99
107-
bool checkQgisVersion( QString minVersion, QString maxVersion = "" );
107+
bool checkQgisVersion( QString minVersion, QString maxVersion = "" ) const;
108108

109109
private:
110110
static QgsPluginRegistry* _instance;

src/gui/qgspluginmanagerinterface.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class GUI_EXPORT QgsPluginManagerInterface : public QObject
4343
virtual void reloadModel() = 0;
4444

4545
//! return given plugin metadata
46-
virtual QMap<QString, QString> * pluginMetadata( QString key ) = 0;
46+
virtual const QMap<QString, QString> * pluginMetadata( QString key ) const = 0;
4747

4848
//! clear the repository listWidget
4949
virtual void clearRepositoryList() = 0;

0 commit comments

Comments
 (0)