mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-01 05:26:45 +08:00
Ref T103, plugin directory now from CDirectoryUtils::pluginDirectory()
Hence we can use const QString & like const QString &CPluginManagerWeatherData::pluginDirectory()
This commit is contained in:
committed by
Mathew Sutcliffe
parent
a9198e4f13
commit
3245ff4ef4
@@ -20,7 +20,6 @@
|
||||
|
||||
namespace BlackCore
|
||||
{
|
||||
|
||||
using namespace BlackMisc;
|
||||
using namespace BlackMisc::Simulation;
|
||||
|
||||
@@ -88,7 +87,8 @@ namespace BlackCore
|
||||
for (const QJsonObject &json : plugins)
|
||||
{
|
||||
QString iid = json["IID"].toString();
|
||||
if (iid == QStringLiteral("org.swift-project.blackcore.simulatorinterface")) {
|
||||
if (iid == QStringLiteral("org.swift-project.blackcore.simulatorinterface"))
|
||||
{
|
||||
auto it = m_plugins.insert(pluginIdentifier(json), {});
|
||||
it->info.convertFromJson(json);
|
||||
}
|
||||
@@ -97,14 +97,16 @@ namespace BlackCore
|
||||
|
||||
BlackMisc::CSequence<QString> CPluginManagerSimulator::acceptedIids() const
|
||||
{
|
||||
return {
|
||||
return
|
||||
{
|
||||
QStringLiteral("org.swift-project.blackcore.simulatorinterface"),
|
||||
QStringLiteral("org.swift-project.blackgui.pluginconfiginterface")
|
||||
};
|
||||
}
|
||||
|
||||
QString CPluginManagerSimulator::pluginDirectory() const
|
||||
const QString &CPluginManagerSimulator::pluginDirectory() const
|
||||
{
|
||||
return CDirectoryUtils::binDirectory() % QStringLiteral("/plugins/simulator");
|
||||
static const QString d(CFileUtils::appendFilePaths(CDirectoryUtils::pluginsDirectory(), "simulator"));
|
||||
return d;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user