diff options
Diffstat (limited to 'src/plugins/extensionmanager')
-rw-r--r-- | src/plugins/extensionmanager/remotespec.cpp | 12 | ||||
-rw-r--r-- | src/plugins/extensionmanager/remotespec.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/extensionmanager/remotespec.cpp b/src/plugins/extensionmanager/remotespec.cpp index c8f2114b3e9..fe7294f1928 100644 --- a/src/plugins/extensionmanager/remotespec.cpp +++ b/src/plugins/extensionmanager/remotespec.cpp @@ -49,14 +49,14 @@ FilePath RemoteSpec::installLocation(bool inUserFolder) const return {}; }; -Result RemoteSpec::fromJson(const QJsonObject &remoteJsonData) +Result<> RemoteSpec::fromJson(const QJsonObject &remoteJsonData) { qCDebug(remoteSpec).noquote() << "Remote JSON data:" << QJsonDocument(remoteJsonData).toJson(QJsonDocument::Indented); return fromJson(remoteJsonData, remoteJsonData.value("latest").toString()); } -Utils::Result RemoteSpec::fromJson(const QJsonObject &remoteJsonData, const QString &version) +Utils::Result<> RemoteSpec::fromJson(const QJsonObject &remoteJsonData, const QString &version) { m_remoteJsonData = remoteJsonData; m_version = version; @@ -66,15 +66,15 @@ Utils::Result RemoteSpec::fromJson(const QJsonObject &remoteJsonData, const QStr if (!plugin.isEmpty()) { auto res = ExtensionSystem::PluginSpec::readMetaData(plugin.value("metadata").toObject()); if (!res) - return Result::Error(res.error()); + return ResultError(res.error()); if (hasError()) - return Result::Error(errorString()); - return Result::Ok; + return ResultError(errorString()); + return ResultOk; } m_isPack = true; - return Result::Ok; + return ResultOk; } std::vector<std::unique_ptr<RemoteSpec>> RemoteSpec::versions() const diff --git a/src/plugins/extensionmanager/remotespec.h b/src/plugins/extensionmanager/remotespec.h index a6e274426eb..a787250f5b8 100644 --- a/src/plugins/extensionmanager/remotespec.h +++ b/src/plugins/extensionmanager/remotespec.h @@ -45,8 +45,8 @@ public: ExtensionSystem::IPlugin *plugin() const override; Utils::FilePath installLocation(bool inUserFolder) const override; - Utils::Result fromJson(const QJsonObject &remoteJsonData); - Utils::Result fromJson(const QJsonObject &remoteJsonData, const QString &version); + Utils::Result<> fromJson(const QJsonObject &remoteJsonData); + Utils::Result<> fromJson(const QJsonObject &remoteJsonData, const QString &version); QString id() const override; QString displayName() const override; |