Skip to content

Commit 6b1d5ee

Browse files
committed
QStringLiteral
1 parent 558d536 commit 6b1d5ee

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

src/python/qgspythonutilsimpl.cpp

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ bool QgsPythonUtilsImpl::checkSystemImports()
140140
}
141141

142142
// 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
146146

147147
#ifdef Q_OS_WIN
148148
runString( "if oldhome: os.environ['HOME']=oldhome\n" );
@@ -260,7 +260,7 @@ void QgsPythonUtilsImpl::initServerPython( QgsServerInterface *interface )
260260
bool QgsPythonUtilsImpl::startServerPlugin( QString packageName )
261261
{
262262
QString output;
263-
evalString( "qgis.utils.startServerPlugin('" + packageName + "')", output );
263+
evalString( QStringLiteral( "qgis.utils.startServerPlugin('%1')" ).arg( packageName ), output );
264264
return ( output == QLatin1String( "True" ) );
265265
}
266266

@@ -545,14 +545,14 @@ bool QgsPythonUtilsImpl::evalString( const QString &command, QString &result )
545545
QString QgsPythonUtilsImpl::pythonPath() const
546546
{
547547
if ( QgsApplication::isRunningFromBuildDir() )
548-
return QgsApplication::buildOutputPath() + "/python";
548+
return QgsApplication::buildOutputPath() + QStringLiteral( "/python" );
549549
else
550-
return QgsApplication::pkgDataPath() + "/python";
550+
return QgsApplication::pkgDataPath() + QStringLiteral( "/python" );
551551
}
552552

553553
QString QgsPythonUtilsImpl::pluginsPath() const
554554
{
555-
return pythonPath() + "/plugins";
555+
return pythonPath() + QStringLiteral( "/plugins" );
556556
}
557557

558558
QString QgsPythonUtilsImpl::homePythonPath() const
@@ -564,13 +564,13 @@ QString QgsPythonUtilsImpl::homePythonPath() const
564564
}
565565
else
566566
{
567-
return "\"" + settingsDir.replace( '\\', QLatin1String( "\\\\" ) ) + "python\"";
567+
return QStringLiteral( "\"" ) + settingsDir.replace( '\\', QLatin1String( "\\\\" ) ) + QStringLiteral( "python\"" );
568568
}
569569
}
570570

571571
QString QgsPythonUtilsImpl::homePluginsPath() const
572572
{
573-
return homePythonPath() + " + \"/plugins\"";
573+
return homePythonPath() + QStringLiteral( " + \"/plugins\"" );
574574
}
575575

576576
QStringList QgsPythonUtilsImpl::extraPluginsPaths() const
@@ -603,7 +603,7 @@ QStringList QgsPythonUtilsImpl::pluginList()
603603
QString QgsPythonUtilsImpl::getPluginMetadata( const QString &pluginName, const QString &function )
604604
{
605605
QString res;
606-
QString str = "qgis.utils.pluginMetadata('" + pluginName + "', '" + function + "')";
606+
QString str = QStringLiteral( "qgis.utils.pluginMetadata('%1', '%2')" ).arg( pluginName, function );
607607
evalString( str, res );
608608
//QgsDebugMsg("metadata "+pluginName+" - '"+function+"' = "+res);
609609
return res;
@@ -617,47 +617,47 @@ bool QgsPythonUtilsImpl::pluginHasProcessingProvider( const QString &pluginName
617617
bool QgsPythonUtilsImpl::loadPlugin( const QString &packageName )
618618
{
619619
QString output;
620-
evalString( "qgis.utils.loadPlugin('" + packageName + "')", output );
620+
evalString( QStringLiteral( "qgis.utils.loadPlugin('%1')" ).arg( packageName ), output );
621621
return ( output == QLatin1String( "True" ) );
622622
}
623623

624624
bool QgsPythonUtilsImpl::startPlugin( const QString &packageName )
625625
{
626626
QString output;
627-
evalString( "qgis.utils.startPlugin('" + packageName + "')", output );
627+
evalString( QStringLiteral( "qgis.utils.startPlugin('%1')" ).arg( packageName ), output );
628628
return ( output == QLatin1String( "True" ) );
629629
}
630630

631631
bool QgsPythonUtilsImpl::startProcessingPlugin( const QString &packageName )
632632
{
633633
QString output;
634-
evalString( "qgis.utils.startProcessingPlugin('" + packageName + "')", output );
634+
evalString( QStringLiteral( "qgis.utils.startProcessingPlugin('%1')" ).arg( packageName ), output );
635635
return ( output == QLatin1String( "True" ) );
636636
}
637637

638638
bool QgsPythonUtilsImpl::canUninstallPlugin( const QString &packageName )
639639
{
640640
QString output;
641-
evalString( "qgis.utils.canUninstallPlugin('" + packageName + "')", output );
641+
evalString( QStringLiteral( "qgis.utils.canUninstallPlugin('%1')" ).arg( packageName ), output );
642642
return ( output == QLatin1String( "True" ) );
643643
}
644644

645645
bool QgsPythonUtilsImpl::unloadPlugin( const QString &packageName )
646646
{
647647
QString output;
648-
evalString( "qgis.utils.unloadPlugin('" + packageName + "')", output );
648+
evalString( QStringLiteral( "qgis.utils.unloadPlugin('%1')" ).arg( packageName ), output );
649649
return ( output == QLatin1String( "True" ) );
650650
}
651651

652652
bool QgsPythonUtilsImpl::isPluginEnabled( const QString &packageName ) const
653653
{
654-
return QgsSettings().value( "/PythonPlugins/" + packageName, QVariant( false ) ).toBool();
654+
return QgsSettings().value( QStringLiteral( "/PythonPlugins/" ) + packageName, QVariant( false ) ).toBool();
655655
}
656656

657657
bool QgsPythonUtilsImpl::isPluginLoaded( const QString &packageName )
658658
{
659659
QString output;
660-
evalString( "qgis.utils.isPluginLoaded('" + packageName + "')", output );
660+
evalString( QStringLiteral( "qgis.utils.isPluginLoaded('%1')" ).arg( packageName ), output );
661661
return ( output == QLatin1String( "True" ) );
662662
}
663663

0 commit comments

Comments
 (0)