diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2021-10-31 17:39:45 +0300 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-11-01 10:07:43 +0000 |
commit | 9f479174b9c6353aac458f58cc3893203e9c0027 (patch) | |
tree | f9477d5b6679c707424d9823ae9b17b8e443a84d | |
parent | 38f233502e32112e15179420da86d6e6afb79b24 (diff) | |
download | qbs-9f479174b9c6353aac458f58cc3893203e9c0027.tar.gz |
pkgconfig: Rename vars to variables
Change-Id: Iffc41104f002684525f5a0efe6c44cd326299678
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | src/lib/pkgconfig/pcpackage.h | 2 | ||||
-rw-r--r-- | src/lib/pkgconfig/pcparser.cpp | 6 | ||||
-rw-r--r-- | src/lib/pkgconfig/pkgconfig.cpp | 4 | ||||
-rw-r--r-- | tests/auto/pkgconfig/tst_pkgconfig.cpp | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/pkgconfig/pcpackage.h b/src/lib/pkgconfig/pcpackage.h index 340a4698f..9d86816aa 100644 --- a/src/lib/pkgconfig/pcpackage.h +++ b/src/lib/pkgconfig/pcpackage.h @@ -114,7 +114,7 @@ public: std::vector<RequiredVersion> conflicts; using VariablesMap = std::map<std::string, std::string, std::less<>>; - VariablesMap vars; + VariablesMap variables; bool uninstalled{false}; diff --git a/src/lib/pkgconfig/pcparser.cpp b/src/lib/pkgconfig/pcparser.cpp index b3ba57c3d..20e92a600 100644 --- a/src/lib/pkgconfig/pcparser.cpp +++ b/src/lib/pkgconfig/pcparser.cpp @@ -424,11 +424,11 @@ try #if HAS_STD_FILESYSTEM const auto fsPath = std::filesystem::path(path); package.filePath = fsPath.generic_string(); - package.vars["pcfiledir"] = fsPath.parent_path().generic_string(); + package.variables["pcfiledir"] = fsPath.parent_path().generic_string(); #else QFileInfo fileInfo(QString::fromStdString(path)); package.filePath = fileInfo.absoluteFilePath().toStdString(); - package.vars["pcfiledir"] = fileInfo.absolutePath().toStdString(); + package.variables["pcfiledir"] = fileInfo.absolutePath().toStdString(); #endif std::string line; @@ -764,7 +764,7 @@ void PcParser::parseLine(PcPackage &pkg, std::string_view str) // ignore this feature for now const auto value = trimAndSubstitute(pkg, str); - if (!pkg.vars.insert({std::string(tag), value}).second) + if (!pkg.variables.insert({std::string(tag), value}).second) raizeDuplicateVariableException(pkg, tag); } } diff --git a/src/lib/pkgconfig/pkgconfig.cpp b/src/lib/pkgconfig/pkgconfig.cpp index f017b365c..76c8094b7 100644 --- a/src/lib/pkgconfig/pkgconfig.cpp +++ b/src/lib/pkgconfig/pkgconfig.cpp @@ -238,8 +238,8 @@ std::string_view PkgConfig::packageGetVariable(const PcPackage &pkg, std::string } if (varval.empty()) { - const auto it = pkg.vars.find(var); - varval = (it != pkg.vars.end()) ? it->second : std::string_view(); + const auto it = pkg.variables.find(var); + varval = (it != pkg.variables.end()) ? it->second : std::string_view(); } return varval; diff --git a/tests/auto/pkgconfig/tst_pkgconfig.cpp b/tests/auto/pkgconfig/tst_pkgconfig.cpp index 542984378..1e2ef9e2a 100644 --- a/tests/auto/pkgconfig/tst_pkgconfig.cpp +++ b/tests/auto/pkgconfig/tst_pkgconfig.cpp @@ -90,12 +90,12 @@ void TestPkgConfig::pkgConfig() QCOMPARE(QString::fromStdString(package.description), json.value("Description").toString()); QCOMPARE(QString::fromStdString(package.version), json.value("Version").toString()); - auto vars = json["Vars"].toMap(); - vars["pcfiledir"] = QFileInfo(m_workingDataDir).absoluteFilePath(); + auto variables = json["Vars"].toMap(); + variables["pcfiledir"] = QFileInfo(m_workingDataDir).absoluteFilePath(); - for (const auto &[key, value]: package.vars) { + for (const auto &[key, value]: package.variables) { QCOMPARE(QString::fromStdString(value), - vars.value(QString::fromStdString(key)).toString()); + variables.value(QString::fromStdString(key)).toString()); } const auto jsonLibs = json.value("Libs").toJsonArray().toVariantList(); |