Merge pull request #190 from n7space/plugin-update-5.0.3-6.0.2

plugin-update-5.0.3-6.0.2
n7space · Mar 2, 2022 · f9219bc · f9219bc
2 parents 1a1dca2 + 2f59d57
commit f9219bc
Show file tree

Hide file tree

Showing 28 changed files with 99 additions and 93 deletions.
diff --git a/Asn1Acn.json.in b/Asn1Acn.json.in
@@ -1,7 +1,7 @@
 {
     \"Name\" : \"ASN.1/ACN\",
-    \"Version\" : \"5.0.3\",
-    \"CompatVersion\" : \"5.0.0\",
+    \"Version\" : \"6.0.2\",
+    \"CompatVersion\" : \"6.0.0\",
     \"Vendor\" : \"N7 Space sp. z o.o.\",
     \"Copyright\" : \"(C) 2017-2022 N7 Space sp. z o.o.\",
     \"License\" : \"GPL v3.0\",

diff --git a/src/3rdparty/tests/modeltest.cpp b/src/3rdparty/tests/modeltest.cpp
@@ -443,12 +443,12 @@ void ModelTest::data()
     }
 
     // General Purpose roles that should return a QColor
-    QVariant colorVariant = model->data ( model->index ( 0, 0 ), Qt::BackgroundColorRole );
+    QVariant colorVariant = model->data ( model->index ( 0, 0 ), Qt::BackgroundRole );
     if ( colorVariant.isValid() ) {
         QVERIFY( colorVariant.canConvert<QColor>() );
     }
 
-    colorVariant = model->data ( model->index ( 0, 0 ), Qt::TextColorRole );
+    colorVariant = model->data ( model->index ( 0, 0 ), Qt::ForegroundRole );
     if ( colorVariant.isValid() ) {
         QVERIFY( colorVariant.canConvert<QColor>() );
     }

diff --git a/src/asn1acnbuildstep.cpp b/src/asn1acnbuildstep.cpp
@@ -71,7 +71,8 @@ void Asn1AcnBuildStep::updateEnvironment(const ProjectExplorer::BuildConfigurati
 void Asn1AcnBuildStep::updateProcess(const QString &command, const QString &arg)
 {
     auto *pp = processParameters();
-    Utils::CommandLine commandLine(command);
-    commandLine.addArgs(arg, Utils::CommandLine::Raw);
+    Utils::CommandLine commandLine(Utils::FilePath::fromUserInput(command),
+                                   arg,
+                                   Utils::CommandLine::Raw);
     pp->setCommandLine(commandLine);
 }
diff --git a/src/asn1sccparseddocumentbuilder.cpp b/src/asn1sccparseddocumentbuilder.cpp
@@ -112,13 +112,13 @@ std::vector<std::unique_ptr<Data::File>> Asn1SccParsedDocumentBuilder::takeDocum
 
 bool Asn1SccParsedDocumentBuilder::responseContainsAst(const QJsonObject &json)
 {
-    return json[QLatin1Literal("ErrorCode")].toInt(-1) == 0;
+    return json[QLatin1String("ErrorCode")].toInt(-1) == 0;
 }
 
 void Asn1SccParsedDocumentBuilder::storeErrorMessages(const QJsonObject &json)
 {
     const auto parser = ErrorMessageParser();
-    for (const auto message : json[QLatin1Literal("Messages")].toArray()) {
+    for (const auto message : json[QLatin1String("Messages")].toArray()) {
         const auto msg = parser.parse(message.toString());
         if (msg.isValid())
             m_errorMessages.push_back(msg);
@@ -127,8 +127,8 @@ void Asn1SccParsedDocumentBuilder::storeErrorMessages(const QJsonObject &json)
 
 QString Asn1SccParsedDocumentBuilder::getAstXml(const QJsonObject &json)
 {
-    const auto files = json[QLatin1Literal("Files")].toArray();
+    const auto files = json[QLatin1String("Files")].toArray();
     if (files.size() != 1)
         return QString();
-    return files[0].toObject()[QLatin1Literal("Contents")].toString();
+    return files[0].toObject()[QLatin1String("Contents")].toString();
 }
diff --git a/src/astxmlparser.cpp b/src/astxmlparser.cpp
@@ -274,7 +274,7 @@ std::unique_ptr<Data::Types::Type> AstXmlParser::readTypeDetails(const Data::Sou
     return type;
 }
 
-void AstXmlParser::readTypeContents(const QStringRef &name)
+void AstXmlParser::readTypeContents(const QStringView &name)
 {
     if (name == QStringLiteral("SEQUENCE"))
         readSequence();
@@ -287,7 +287,7 @@ void AstXmlParser::readTypeContents(const QStringRef &name)
 }
 
 std::unique_ptr<Data::Types::Type> AstXmlParser::buildTypeFromName(
-    const Data::SourceLocation &location, const QStringRef &name)
+    const Data::SourceLocation &location, const QStringView &name)
 {
     if (name == QStringLiteral("REFERENCE_TYPE"))
         return readReferenceType(location);

diff --git a/src/astxmlparser.h b/src/astxmlparser.h
@@ -78,9 +78,9 @@ class AstXmlParser
     std::unique_ptr<Data::Types::Type> readTypeDetails(const Data::SourceLocation &location);
     std::unique_ptr<Data::Types::Type> readReferenceType(const Data::SourceLocation &location);
     std::unique_ptr<Data::Types::Type> buildTypeFromName(const Data::SourceLocation &location,
-                                                         const QStringRef &name);
+                                                         const QStringView &name);
 
-    void readTypeContents(const QStringRef &name);
+    void readTypeContents(const QStringView &name);
     void readSequence();
     void readSequenceOf();
     void readChoice();

diff --git a/src/completion/acncompletionassist.cpp b/src/completion/acncompletionassist.cpp
@@ -41,7 +41,8 @@ std::unique_ptr<ProposalsBuilder> AcnCompletionAssistProcessor::createKeywordsPr
     return provider;
 }
 
-TextEditor::IAssistProcessor *AcnCompletionAssistProvider::createProcessor() const
+TextEditor::IAssistProcessor *AcnCompletionAssistProvider::createProcessor(const TextEditor::AssistInterface *assistInterface) const
 {
+    Q_UNUSED(assistInterface);
     return new AcnCompletionAssistProcessor;
 }
diff --git a/src/completion/acncompletionassist.h b/src/completion/acncompletionassist.h
@@ -46,7 +46,7 @@ class AcnCompletionAssistProvider : public CompletionAssistProvider
     Q_OBJECT
 
 public:
-    TextEditor::IAssistProcessor *createProcessor() const override;
+    TextEditor::IAssistProcessor *createProcessor(const TextEditor::AssistInterface *assistInterface) const override;
 };
 
 } /* nameapsce Completion */

diff --git a/src/completion/asncompletionassist.cpp b/src/completion/asncompletionassist.cpp
@@ -40,7 +40,8 @@ std::unique_ptr<ProposalsBuilder> AsnCompletionAssistProcessor::createKeywordsPr
     return provider;
 }
 
-TextEditor::IAssistProcessor *AsnCompletionAssistProvider::createProcessor() const
+TextEditor::IAssistProcessor *AsnCompletionAssistProvider::createProcessor(const TextEditor::AssistInterface *assistInterface) const
 {
+    Q_UNUSED(assistInterface);
     return new AsnCompletionAssistProcessor;
 }
diff --git a/src/completion/asncompletionassist.h b/src/completion/asncompletionassist.h
@@ -44,7 +44,7 @@ class AsnCompletionAssistProvider : public CompletionAssistProvider
     Q_OBJECT
 
 public:
-    TextEditor::IAssistProcessor *createProcessor() const override;
+    TextEditor::IAssistProcessor *createProcessor(const TextEditor::AssistInterface *assistInterface) const override;
 };
 
 } /* nameapsce Completion */

diff --git a/src/completion/keywordproposalsbuilder.cpp b/src/completion/keywordproposalsbuilder.cpp
@@ -43,7 +43,7 @@ KeywordProposalsBuilder::KeywordProposalsBuilder(const QStringList &keywords,
 
 static QIcon buildIcon(Utils::Theme::Color theme)
 {
-    return Utils::Icon({{QLatin1String(":/codemodel/images/keyword.png"), theme}}, Utils::Icon::Tint)
+    return Utils::Icon({{":/codemodel/images/keyword.png", theme}}, Utils::Icon::Tint)
         .icon();
 }
 

diff --git a/src/data/types/builtintypes.h b/src/data/types/builtintypes.h
@@ -49,9 +49,9 @@ class Boolean : public BuiltinType
     QString name() const override { return QLatin1String("BOOLEAN"); }
 
 private:
-    QString baseIconFile() const override
+    Utils::FilePath baseIconFile() const override
     {
-        return QStringLiteral(":/asn1acn/images/outline/boolean.png");
+        return ":/asn1acn/images/outline/boolean.png";
     }
 };
 
@@ -61,9 +61,9 @@ class Null : public BuiltinType
     QString name() const override { return QLatin1String("NULL"); }
 
 private:
-    QString baseIconFile() const override
+    Utils::FilePath baseIconFile() const override
     {
-        return QStringLiteral(":/asn1acn/images/outline/null.png");
+        return ":/asn1acn/images/outline/null.png";
     }
 };
 
@@ -73,9 +73,9 @@ class Integer : public BuiltinType
     QString name() const override { return QLatin1String("INTEGER"); }
 
 private:
-    QString baseIconFile() const override
+    Utils::FilePath baseIconFile() const override
     {
-        return QStringLiteral(":/asn1acn/images/outline/integer.png");
+        return ":/asn1acn/images/outline/integer.png";
     }
 };
 
@@ -85,9 +85,9 @@ class Real : public BuiltinType
     QString name() const override { return QLatin1String("REAL"); }
 
 private:
-    QString baseIconFile() const override
+    Utils::FilePath baseIconFile() const override
     {
-        return QStringLiteral(":/asn1acn/images/outline/real.png");
+        return ":/asn1acn/images/outline/real.png";
     }
 };
 
@@ -97,9 +97,9 @@ class BitString : public BuiltinType
     QString name() const override { return QLatin1String("BIT STRING"); }
 
 private:
-    QString baseIconFile() const override
+    Utils::FilePath baseIconFile() const override
     {
-        return QStringLiteral(":/asn1acn/images/outline/bitstring.png");
+        return ":/asn1acn/images/outline/bitstring.png";
     }
 };
 
@@ -109,9 +109,9 @@ class OctetString : public BuiltinType
     QString name() const override { return QLatin1String("OCTET STRING"); }
 
 private:
-    QString baseIconFile() const override
+    Utils::FilePath baseIconFile() const override
     {
-        return QStringLiteral(":/asn1acn/images/outline/octetstring.png");
+        return ":/asn1acn/images/outline/octetstring.png";
     }
 };
 
@@ -121,9 +121,9 @@ class IA5String : public BuiltinType
     QString name() const override { return QLatin1String("IA5String"); }
 
 private:
-    QString baseIconFile() const override
+    Utils::FilePath baseIconFile() const override
     {
-        return QStringLiteral(":/asn1acn/images/outline/ia5string.png");
+        return ":/asn1acn/images/outline/ia5string.png";
     }
 };
 
@@ -133,9 +133,9 @@ class NumericString : public BuiltinType
     QString name() const override { return QLatin1String("NumericString"); }
 
 private:
-    QString baseIconFile() const override
+    Utils::FilePath baseIconFile() const override
     {
-        return QStringLiteral(":/asn1acn/images/outline/numericstring.png");
+        return ":/asn1acn/images/outline/numericstring.png";
     }
 };
 
@@ -145,9 +145,9 @@ class Enumerated : public BuiltinType
     QString name() const override { return QLatin1String("ENUMERATED"); }
 
 private:
-    QString baseIconFile() const override
+    Utils::FilePath baseIconFile() const override
     {
-        return QStringLiteral(":/asn1acn/images/outline/enumerated.png");
+        return ":/asn1acn/images/outline/enumerated.png";
     }
 };
 
@@ -157,9 +157,9 @@ class Choice : public BuiltinType
     QString name() const override { return QLatin1String("CHOICE"); }
 
 private:
-    QString baseIconFile() const override
+    Utils::FilePath baseIconFile() const override
     {
-        return QStringLiteral(":/asn1acn/images/outline/choice.png");
+        return ":/asn1acn/images/outline/choice.png";
     }
 };
 
@@ -169,9 +169,9 @@ class Sequence : public BuiltinType
     QString name() const override { return QLatin1String("SEQUENCE"); }
 
 private:
-    QString baseIconFile() const override
+    Utils::FilePath baseIconFile() const override
     {
-        return QStringLiteral(":/asn1acn/images/outline/sequence.png");
+        return ":/asn1acn/images/outline/sequence.png";
     }
 };
 
@@ -181,9 +181,9 @@ class SequenceOf : public BuiltinType
     QString name() const override { return QLatin1String("SEQUENCE OF"); }
 
 private:
-    QString baseIconFile() const override
+    Utils::FilePath baseIconFile() const override
     {
-        return QStringLiteral(":/asn1acn/images/outline/sequenceof.png");
+        return ":/asn1acn/images/outline/sequenceof.png";
     }
 };
 

diff --git a/src/data/types/labeltype.cpp b/src/data/types/labeltype.cpp
@@ -38,16 +38,16 @@ QString LabelType::name() const
 
 QString LabelType::label() const
 {
-    return QString();
+    return {};
 }
 
-QString LabelType::baseIconFile() const
+Utils::FilePath LabelType::baseIconFile() const
 {
-    return QString();
+    return {};
 }
 
 QIcon LabelType::createIcon(Utils::Theme::Color color) const
 {
     Q_UNUSED(color);
-    return QIcon();
+    return {};
 }
diff --git a/src/data/types/labeltype.h b/src/data/types/labeltype.h
@@ -43,7 +43,7 @@ class LabelType : public Type
     QString label() const override;
 
 private:
-    QString baseIconFile() const override;
+    Utils::FilePath baseIconFile() const override;
     QIcon createIcon(Utils::Theme::Color color) const override;
 
     QString m_name;

diff --git a/src/data/types/type.h b/src/data/types/type.h
@@ -26,6 +26,7 @@
 
 #include <QIcon>
 #include <QString>
+#include <utils/filepath.h>
 
 #include <utils/theme/theme.h>
 
@@ -47,7 +48,7 @@ class Type
 
 private:
     virtual QIcon createIcon(Utils::Theme::Color color) const;
-    virtual QString baseIconFile() const = 0;
+    virtual Utils::FilePath baseIconFile() const = 0;
 };
 
 } // namespace Types

diff --git a/src/data/types/userdefinedtype.cpp b/src/data/types/userdefinedtype.cpp
@@ -42,7 +42,7 @@ QString UserdefinedType::label() const
     return ": " + m_module + "." + name();
 }
 
-QString UserdefinedType::baseIconFile() const
+Utils::FilePath UserdefinedType::baseIconFile() const
 {
-    return QStringLiteral(":/asn1acn/images/outline/userdefined.png");
+    return ":/asn1acn/images/outline/userdefined.png";
 }
diff --git a/src/data/types/userdefinedtype.h b/src/data/types/userdefinedtype.h
@@ -43,7 +43,7 @@ class UserdefinedType : public Type
     QString label() const override;
 
 private:
-    QString baseIconFile() const override;
+    Utils::FilePath baseIconFile() const override;
 
     QString m_name;
     QString m_module;

diff --git a/src/libraries/componentlibraryprocessor.cpp b/src/libraries/componentlibraryprocessor.cpp
@@ -62,7 +62,7 @@ void ComponentLibraryProcessor::process()
             library->addModule(std::move(module));
         } catch (const ModuleMetadataParser::Error &err) {
             using Messages::MessageManager;
-            MessageManager::write(QLatin1Literal("Parsing failed - ") + err.what(),
+            MessageManager::write(QLatin1String("Parsing failed - ") + err.what(),
                                   MessageManager::Type::Metadata);
             continue;
         }