aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/language
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/corelib/language')
-rw-r--r--src/lib/corelib/language/evaluationdata.h4
-rw-r--r--src/lib/corelib/language/identifiersearch.h2
-rw-r--r--src/lib/corelib/language/language.h24
-rw-r--r--src/lib/corelib/language/moduleloader.h28
-rw-r--r--src/lib/corelib/language/projectresolver.cpp2
-rw-r--r--src/lib/corelib/language/projectresolver.h16
-rw-r--r--src/lib/corelib/language/scriptimporter.cpp4
7 files changed, 38 insertions, 42 deletions
diff --git a/src/lib/corelib/language/evaluationdata.h b/src/lib/corelib/language/evaluationdata.h
index efd504a11..791b2f234 100644
--- a/src/lib/corelib/language/evaluationdata.h
+++ b/src/lib/corelib/language/evaluationdata.h
@@ -55,8 +55,8 @@ class Item;
class EvaluationData
{
public:
- Evaluator *evaluator;
- const Item *item;
+ Evaluator *evaluator = nullptr;
+ const Item *item = nullptr;
mutable QHash<QScriptString, QScriptValue> valueCache;
};
diff --git a/src/lib/corelib/language/identifiersearch.h b/src/lib/corelib/language/identifiersearch.h
index d9769266c..7d99c0f13 100644
--- a/src/lib/corelib/language/identifiersearch.h
+++ b/src/lib/corelib/language/identifiersearch.h
@@ -61,7 +61,7 @@ private:
bool visit(QbsQmlJS::AST::IdentifierExpression *e) override;
QMap<QString, bool *> m_requests;
- int m_numberOfFoundIds;
+ int m_numberOfFoundIds = 0;
};
} // namespace Internal
diff --git a/src/lib/corelib/language/language.h b/src/lib/corelib/language/language.h
index 945ec9806..3dbe90747 100644
--- a/src/lib/corelib/language/language.h
+++ b/src/lib/corelib/language/language.h
@@ -162,7 +162,7 @@ private:
QVariantMap m_properties;
QVariantMap m_initialProperties;
std::vector<QString> m_importedFilesUsed;
- bool m_condition;
+ bool m_condition = false;
};
class RuleArtifact
@@ -280,14 +280,14 @@ public:
CodeLocation location;
QString name;
- bool enabled;
+ bool enabled = true;
QString prefix;
std::vector<SourceArtifactPtr> files;
std::unique_ptr<SourceWildCards> wildcards;
PropertyMapPtr properties;
FileTags fileTags;
QString targetOfModule;
- bool overrideTags;
+ bool overrideTags = false;
std::vector<SourceArtifactPtr> allFiles() const;
@@ -295,10 +295,6 @@ public:
void store(PersistentPool &pool);
private:
- ResolvedGroup()
- : enabled(true)
- {}
-
template<PersistentPool::OpType opType> void serializationOp(PersistentPool &pool)
{
pool.serializationOp<opType>(name, enabled, location, prefix, files, wildcards, properties,
@@ -370,7 +366,7 @@ public:
PrivateScriptFunction setupBuildEnvironmentScript;
PrivateScriptFunction setupRunEnvironmentScript;
ResolvedProduct *product = nullptr;
- bool isProduct;
+ bool isProduct = false;
static QStringList argumentNamesForSetupBuildEnv();
static QStringList argumentNamesForSetupRunEnv();
@@ -414,13 +410,13 @@ public:
FileTags inputsFromDependencies;
FileTags explicitlyDependsOn;
FileTags explicitlyDependsOnFromDependencies;
- bool multiplex;
- bool requiresInputs;
+ bool multiplex = false;
+ bool requiresInputs = false;
std::vector<RuleArtifactPtr> artifacts; // unused, if outputFileTags/outputArtifactsScript is non-empty
- bool alwaysRun;
+ bool alwaysRun = false;
// members that we don't need to save
- int ruleGraphId;
+ int ruleGraphId = -1;
static QStringList argumentNamesForOutputArtifacts();
static QStringList argumentNamesForPrepare();
@@ -440,7 +436,7 @@ public:
requiresInputs, alwaysRun, artifacts);
}
private:
- Rule() : multiplex(false), alwaysRun(false), ruleGraphId(-1) {}
+ Rule() = default;
};
bool operator==(const Rule &r1, const Rule &r2);
inline bool operator!=(const Rule &r1, const Rule &r2) { return !(r1 == r2); }
@@ -477,7 +473,7 @@ public:
}
QString fullName;
- PropertyDeclaration::Type type;
+ PropertyDeclaration::Type type = PropertyDeclaration::Type::UnknownType;
QString sourceCode;
bool isBuiltin = false;
};
diff --git a/src/lib/corelib/language/moduleloader.h b/src/lib/corelib/language/moduleloader.h
index a8190596d..85a2467f2 100644
--- a/src/lib/corelib/language/moduleloader.h
+++ b/src/lib/corelib/language/moduleloader.h
@@ -175,7 +175,7 @@ private:
class ProductContext : public ContextBase
{
public:
- ProjectContext *project;
+ ProjectContext *project = nullptr;
ModuleLoaderResult::ProductInfo info;
QString profileName;
QString multiplexConfigurationId;
@@ -201,8 +201,8 @@ private:
class ProjectContext : public ContextBase
{
public:
- TopLevelProjectContext *topLevelProject;
- ModuleLoaderResult *result;
+ TopLevelProjectContext *topLevelProject = nullptr;
+ ModuleLoaderResult *result = nullptr;
std::vector<ProductContext> products;
std::vector<QStringList> searchPathsStack;
};
@@ -232,7 +232,7 @@ private:
public:
ProductContext *product = nullptr;
Item *exportingProductItem = nullptr;
- ProductDependencies *productDependencies;
+ ProductDependencies *productDependencies = nullptr;
};
void handleTopLevelProject(ModuleLoaderResult *loadResult, Item *projectItem,
@@ -457,16 +457,16 @@ private:
Version m_qbsVersion;
Item *m_tempScopeItem = nullptr;
- qint64 m_elapsedTimeProbes;
- qint64 m_elapsedTimePrepareProducts;
- qint64 m_elapsedTimeProductDependencies;
- qint64 m_elapsedTimeTransitiveDependencies;
- qint64 m_elapsedTimeHandleProducts;
- qint64 m_elapsedTimePropertyChecking;
- quint64 m_probesEncountered;
- quint64 m_probesRun;
- quint64 m_probesCachedCurrent;
- quint64 m_probesCachedOld;
+ qint64 m_elapsedTimeProbes = 0;
+ qint64 m_elapsedTimePrepareProducts = 0;
+ qint64 m_elapsedTimeProductDependencies = 0;
+ qint64 m_elapsedTimeTransitiveDependencies = 0;
+ qint64 m_elapsedTimeHandleProducts = 0;
+ qint64 m_elapsedTimePropertyChecking = 0;
+ quint64 m_probesEncountered = 0;
+ quint64 m_probesRun = 0;
+ quint64 m_probesCachedCurrent = 0;
+ quint64 m_probesCachedOld = 0;
Set<QString> m_projectNamesUsedInOverrides;
Set<QString> m_productNamesUsedInOverrides;
Set<QString> m_disabledProjects;
diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp
index 50c177f43..049472310 100644
--- a/src/lib/corelib/language/projectresolver.cpp
+++ b/src/lib/corelib/language/projectresolver.cpp
@@ -98,7 +98,7 @@ struct ProjectResolver::ProductContext
{
ResolvedProductPtr product;
QString buildDirectory;
- Item *item;
+ Item *item = nullptr;
using ArtifactPropertiesInfo = std::pair<ArtifactPropertiesPtr, std::vector<CodeLocation>>;
QHash<QStringList, ArtifactPropertiesInfo> artifactPropertiesPerFilter;
ProjectResolver::FileLocations sourceArtifactLocations;
diff --git a/src/lib/corelib/language/projectresolver.h b/src/lib/corelib/language/projectresolver.h
index c958127e4..428ba144d 100644
--- a/src/lib/corelib/language/projectresolver.h
+++ b/src/lib/corelib/language/projectresolver.h
@@ -172,12 +172,12 @@ private:
void setupExportedProperties(const Item *item, const QString &namePrefix,
std::vector<ExportedProperty> &properties);
- Evaluator *m_evaluator;
+ Evaluator *m_evaluator = nullptr;
Logger &m_logger;
- ScriptEngine *m_engine;
- ProgressObserver *m_progressObserver;
- ProductContext *m_productContext;
- ModuleContext *m_moduleContext;
+ ScriptEngine *m_engine = nullptr;
+ ProgressObserver *m_progressObserver = nullptr;
+ ProductContext *m_productContext = nullptr;
+ ModuleContext *m_moduleContext = nullptr;
QMap<QString, ResolvedProductPtr> m_productsByName;
QHash<FileTag, QList<ResolvedProductPtr> > m_productsByType;
QHash<ResolvedProductPtr, Item *> m_productItemMap;
@@ -190,9 +190,9 @@ private:
Set<CodeLocation> m_groupLocationWarnings;
std::vector<std::pair<ResolvedProductPtr, Item *>> m_productExportInfo;
std::vector<ErrorInfo> m_queuedErrors;
- qint64 m_elapsedTimeModPropEval;
- qint64 m_elapsedTimeAllPropEval;
- qint64 m_elapsedTimeGroups;
+ qint64 m_elapsedTimeModPropEval = 0;
+ qint64 m_elapsedTimeAllPropEval = 0;
+ qint64 m_elapsedTimeGroups = 0;
typedef void (ProjectResolver::*ItemFuncPtr)(Item *item, ProjectContext *projectContext);
using ItemFuncMap = QMap<ItemType, ItemFuncPtr>;
diff --git a/src/lib/corelib/language/scriptimporter.cpp b/src/lib/corelib/language/scriptimporter.cpp
index c5dc887b7..9c6d4d38e 100644
--- a/src/lib/corelib/language/scriptimporter.cpp
+++ b/src/lib/corelib/language/scriptimporter.cpp
@@ -109,8 +109,8 @@ private:
m_suffix += name;
}
- bool m_first;
- bool m_barrier;
+ bool m_first = false;
+ bool m_barrier = false;
QString m_suffix;
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 13:00:58 +0000