diff options
author | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-11-24 10:12:55 +0900 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-01-28 20:22:21 +0000 |
commit | 960c10da41461741d75d1b1c9e99541964269bfb (patch) | |
tree | b45c2961241e52b5eeeca01fc00a834b1f5f17c9 /src/lib/corelib/language | |
parent | eafd4a73ecdcfc1bc016af24e133de871c72dd53 (diff) |
Apply 'modernize-pass-by-value' fix-it
Also, treat this warning as error
This amends 936eee744db9b2fd1b9b66d168d80a113002aad2
Change-Id: I372c3b11baa08375d581052282f4546b2ba2e057
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/language')
-rw-r--r-- | src/lib/corelib/language/deprecationinfo.h | 4 | ||||
-rw-r--r-- | src/lib/corelib/language/language.h | 20 | ||||
-rw-r--r-- | src/lib/corelib/language/moduleloader.cpp | 4 | ||||
-rw-r--r-- | src/lib/corelib/language/moduleloader.h | 4 | ||||
-rw-r--r-- | src/lib/corelib/language/moduleproviderinfo.h | 9 | ||||
-rw-r--r-- | src/lib/corelib/language/projectresolver.h | 6 | ||||
-rw-r--r-- | src/lib/corelib/language/property.h | 10 | ||||
-rw-r--r-- | src/lib/corelib/language/value.h | 6 |
8 files changed, 35 insertions, 28 deletions
diff --git a/src/lib/corelib/language/deprecationinfo.h b/src/lib/corelib/language/deprecationinfo.h index 220f99ad3..89cd07f4a 100644 --- a/src/lib/corelib/language/deprecationinfo.h +++ b/src/lib/corelib/language/deprecationinfo.h @@ -50,9 +50,9 @@ class DeprecationInfo { public: explicit DeprecationInfo(const Version &removalVersion, - const QString &additionalUserInfo = QString()) + QString additionalUserInfo = QString()) : m_removalVersion(removalVersion) - , m_additionalUserInfo(additionalUserInfo) + , m_additionalUserInfo(std::move(additionalUserInfo)) {} DeprecationInfo() = default; diff --git a/src/lib/corelib/language/language.h b/src/lib/corelib/language/language.h index 2d934edc2..bbd851333 100644 --- a/src/lib/corelib/language/language.h +++ b/src/lib/corelib/language/language.h @@ -140,19 +140,19 @@ public: private: Probe() = default; - Probe(const QString &globalId, + Probe(QString globalId, const CodeLocation &location, bool condition, - const QString &configureScript, - const QVariantMap &properties, - const QVariantMap &initialProperties, - const std::vector<QString> &importedFilesUsed) - : m_globalId(globalId) + QString configureScript, + QVariantMap properties, + QVariantMap initialProperties, + std::vector<QString> importedFilesUsed) + : m_globalId(std::move(globalId)) , m_location(location) - , m_configureScript(configureScript) - , m_properties(properties) - , m_initialProperties(initialProperties) - , m_importedFilesUsed(importedFilesUsed) + , m_configureScript(std::move(configureScript)) + , m_properties(std::move(properties)) + , m_initialProperties(std::move(initialProperties)) + , m_importedFilesUsed(std::move(importedFilesUsed)) , m_condition(condition) {} diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index 50ff1cbd3..f8a651e45 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -380,9 +380,9 @@ class PropertyDeclarationCheck : public ValueHandler Logger &m_logger; public: PropertyDeclarationCheck(const Set<Item *> &disabledItems, - const SetupProjectParameters ¶ms, Logger &logger) + SetupProjectParameters params, Logger &logger) : m_disabledItems(disabledItems) - , m_params(params) + , m_params(std::move(params)) , m_logger(logger) { } diff --git a/src/lib/corelib/language/moduleloader.h b/src/lib/corelib/language/moduleloader.h index 2a7a89727..0b169612a 100644 --- a/src/lib/corelib/language/moduleloader.h +++ b/src/lib/corelib/language/moduleloader.h @@ -425,8 +425,8 @@ private: struct DependsChainEntry { - DependsChainEntry(const QualifiedId &name, const CodeLocation &location) - : name(name), location(location) + DependsChainEntry(QualifiedId name, const CodeLocation &location) + : name(std::move(name)), location(location) { } diff --git a/src/lib/corelib/language/moduleproviderinfo.h b/src/lib/corelib/language/moduleproviderinfo.h index fef9d9765..4f757d3d9 100644 --- a/src/lib/corelib/language/moduleproviderinfo.h +++ b/src/lib/corelib/language/moduleproviderinfo.h @@ -55,9 +55,12 @@ class ModuleProviderInfo { public: ModuleProviderInfo() = default; - ModuleProviderInfo(const QualifiedId &name, const QVariantMap &config, - const QStringList &searchPaths, bool transientOutput) - : name(name), config(config), searchPaths(searchPaths), transientOutput(transientOutput) + ModuleProviderInfo(QualifiedId name, QVariantMap config, + QStringList searchPaths, bool transientOutput) + : name(std::move(name)) + , config(std::move(config)) + , searchPaths(std::move(searchPaths)) + , transientOutput(transientOutput) {} static QString outputBaseDirName() { return QStringLiteral("genmodules"); } diff --git a/src/lib/corelib/language/projectresolver.h b/src/lib/corelib/language/projectresolver.h index 428ba144d..a1e24a555 100644 --- a/src/lib/corelib/language/projectresolver.h +++ b/src/lib/corelib/language/projectresolver.h @@ -139,9 +139,9 @@ private: struct ProductDependencyInfo { - ProductDependencyInfo(const ResolvedProductPtr &product, - const QVariantMap ¶meters = QVariantMap()) - : product(product), parameters(parameters) + ProductDependencyInfo(ResolvedProductPtr product, + QVariantMap parameters = QVariantMap()) + : product(std::move(product)), parameters(std::move(parameters)) { } diff --git a/src/lib/corelib/language/property.h b/src/lib/corelib/language/property.h index 204704672..78061bf6f 100644 --- a/src/lib/corelib/language/property.h +++ b/src/lib/corelib/language/property.h @@ -65,9 +65,13 @@ public: { } - Property(const QString &product, const QString &module, const QString &property, - const QVariant &v, Kind k) - : productName(product), moduleName(module), propertyName(property), value(v), kind(k) + Property(QString product, QString module, QString property, + QVariant v, Kind k) + : productName(std::move(product)) + , moduleName(std::move(module)) + , propertyName(std::move(property)) + , value(std::move(v)) + , kind(k) { } diff --git a/src/lib/corelib/language/value.h b/src/lib/corelib/language/value.h index a48e974d3..d3a748d92 100644 --- a/src/lib/corelib/language/value.h +++ b/src/lib/corelib/language/value.h @@ -151,14 +151,14 @@ public: struct PropertyData { PropertyData() = default; - PropertyData(const QString &v, const CodeLocation &l) : value(v), location(l) {} + PropertyData(QString v, const CodeLocation &l) : value(std::move(v)), location(l) {} QString value; CodeLocation location; }; Alternative() = default; - Alternative(const PropertyData &c, const PropertyData &o, const JSSourceValuePtr &v) - : condition(c), overrideListProperties(o), value(v) {} + Alternative(PropertyData c, PropertyData o, JSSourceValuePtr v) + : condition(std::move(c)), overrideListProperties(std::move(o)), value(std::move(v)) {} Alternative clone() const { return Alternative(condition, overrideListProperties, |