@@ -140,9 +140,9 @@ bool QgsPythonUtilsImpl::checkSystemImports()
140
140
}
141
141
142
142
// tell the utils script where to look for the plugins
143
- runString ( " qgis.utils.plugin_paths = [" + pluginpaths.join ( QStringLiteral ( " , " ) ) + ' ] ' );
144
- runString ( " qgis.utils.sys_plugin_path = \" " + pluginsPath () + ' \" ' );
145
- runString ( " qgis.utils.home_plugin_path = " + homePluginsPath () );
143
+ runString ( QStringLiteral ( " qgis.utils.plugin_paths = [%1] " ). arg ( pluginpaths.join ( ' , ' ) ) );
144
+ runString ( QStringLiteral ( " qgis.utils.sys_plugin_path = \" %1 \" " ). arg ( pluginsPath () ) );
145
+ runString ( QStringLiteral ( " qgis.utils.home_plugin_path = %1 " ). arg ( homePluginsPath () ) ); // note - homePluginsPath() returns a python expression, not a string literal
146
146
147
147
#ifdef Q_OS_WIN
148
148
runString ( " if oldhome: os.environ['HOME']=oldhome\n " );
@@ -260,7 +260,7 @@ void QgsPythonUtilsImpl::initServerPython( QgsServerInterface *interface )
260
260
bool QgsPythonUtilsImpl::startServerPlugin ( QString packageName )
261
261
{
262
262
QString output;
263
- evalString ( " qgis.utils.startServerPlugin('" + packageName + " ') " , output );
263
+ evalString ( QStringLiteral ( " qgis.utils.startServerPlugin('%1') " ). arg ( packageName ) , output );
264
264
return ( output == QLatin1String ( " True" ) );
265
265
}
266
266
@@ -545,14 +545,14 @@ bool QgsPythonUtilsImpl::evalString( const QString &command, QString &result )
545
545
QString QgsPythonUtilsImpl::pythonPath () const
546
546
{
547
547
if ( QgsApplication::isRunningFromBuildDir () )
548
- return QgsApplication::buildOutputPath () + " /python" ;
548
+ return QgsApplication::buildOutputPath () + QStringLiteral ( " /python" ) ;
549
549
else
550
- return QgsApplication::pkgDataPath () + " /python" ;
550
+ return QgsApplication::pkgDataPath () + QStringLiteral ( " /python" ) ;
551
551
}
552
552
553
553
QString QgsPythonUtilsImpl::pluginsPath () const
554
554
{
555
- return pythonPath () + " /plugins" ;
555
+ return pythonPath () + QStringLiteral ( " /plugins" ) ;
556
556
}
557
557
558
558
QString QgsPythonUtilsImpl::homePythonPath () const
@@ -564,13 +564,13 @@ QString QgsPythonUtilsImpl::homePythonPath() const
564
564
}
565
565
else
566
566
{
567
- return " \" " + settingsDir.replace ( ' \\ ' , QLatin1String ( " \\\\ " ) ) + " python\" " ;
567
+ return QStringLiteral ( " \" " ) + settingsDir.replace ( ' \\ ' , QLatin1String ( " \\\\ " ) ) + QStringLiteral ( " python\" " ) ;
568
568
}
569
569
}
570
570
571
571
QString QgsPythonUtilsImpl::homePluginsPath () const
572
572
{
573
- return homePythonPath () + " + \" /plugins\" " ;
573
+ return homePythonPath () + QStringLiteral ( " + \" /plugins\" " ) ;
574
574
}
575
575
576
576
QStringList QgsPythonUtilsImpl::extraPluginsPaths () const
@@ -603,7 +603,7 @@ QStringList QgsPythonUtilsImpl::pluginList()
603
603
QString QgsPythonUtilsImpl::getPluginMetadata ( const QString &pluginName, const QString &function )
604
604
{
605
605
QString res;
606
- QString str = " qgis.utils.pluginMetadata('" + pluginName + " ', '" + function + " ') " ;
606
+ QString str = QStringLiteral ( " qgis.utils.pluginMetadata('%1 ', '%2') " ). arg ( pluginName, function ) ;
607
607
evalString ( str, res );
608
608
// QgsDebugMsg("metadata "+pluginName+" - '"+function+"' = "+res);
609
609
return res;
@@ -617,47 +617,47 @@ bool QgsPythonUtilsImpl::pluginHasProcessingProvider( const QString &pluginName
617
617
bool QgsPythonUtilsImpl::loadPlugin ( const QString &packageName )
618
618
{
619
619
QString output;
620
- evalString ( " qgis.utils.loadPlugin('" + packageName + " ') " , output );
620
+ evalString ( QStringLiteral ( " qgis.utils.loadPlugin('%1') " ). arg ( packageName ) , output );
621
621
return ( output == QLatin1String ( " True" ) );
622
622
}
623
623
624
624
bool QgsPythonUtilsImpl::startPlugin ( const QString &packageName )
625
625
{
626
626
QString output;
627
- evalString ( " qgis.utils.startPlugin('" + packageName + " ') " , output );
627
+ evalString ( QStringLiteral ( " qgis.utils.startPlugin('%1') " ). arg ( packageName ) , output );
628
628
return ( output == QLatin1String ( " True" ) );
629
629
}
630
630
631
631
bool QgsPythonUtilsImpl::startProcessingPlugin ( const QString &packageName )
632
632
{
633
633
QString output;
634
- evalString ( " qgis.utils.startProcessingPlugin('" + packageName + " ') " , output );
634
+ evalString ( QStringLiteral ( " qgis.utils.startProcessingPlugin('%1') " ). arg ( packageName ) , output );
635
635
return ( output == QLatin1String ( " True" ) );
636
636
}
637
637
638
638
bool QgsPythonUtilsImpl::canUninstallPlugin ( const QString &packageName )
639
639
{
640
640
QString output;
641
- evalString ( " qgis.utils.canUninstallPlugin('" + packageName + " ') " , output );
641
+ evalString ( QStringLiteral ( " qgis.utils.canUninstallPlugin('%1') " ). arg ( packageName ) , output );
642
642
return ( output == QLatin1String ( " True" ) );
643
643
}
644
644
645
645
bool QgsPythonUtilsImpl::unloadPlugin ( const QString &packageName )
646
646
{
647
647
QString output;
648
- evalString ( " qgis.utils.unloadPlugin('" + packageName + " ') " , output );
648
+ evalString ( QStringLiteral ( " qgis.utils.unloadPlugin('%1') " ). arg ( packageName ) , output );
649
649
return ( output == QLatin1String ( " True" ) );
650
650
}
651
651
652
652
bool QgsPythonUtilsImpl::isPluginEnabled ( const QString &packageName ) const
653
653
{
654
- return QgsSettings ().value ( " /PythonPlugins/" + packageName, QVariant ( false ) ).toBool ();
654
+ return QgsSettings ().value ( QStringLiteral ( " /PythonPlugins/" ) + packageName, QVariant ( false ) ).toBool ();
655
655
}
656
656
657
657
bool QgsPythonUtilsImpl::isPluginLoaded ( const QString &packageName )
658
658
{
659
659
QString output;
660
- evalString ( " qgis.utils.isPluginLoaded('" + packageName + " ') " , output );
660
+ evalString ( QStringLiteral ( " qgis.utils.isPluginLoaded('%1') " ). arg ( packageName ) , output );
661
661
return ( output == QLatin1String ( " True" ) );
662
662
}
663
663
0 commit comments