diff options
| author | hjk <hjk@qt.io> | 2022-05-11 16:51:46 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2022-05-20 07:06:10 +0000 |
| commit | 8dacb123e0e7194b507e609c1016f8bcc3aaceaa (patch) | |
| tree | 7aa8bf5e54ff131a038358f49ec47f76bf140c0f /src/libs/utils/aspects.cpp | |
| parent | a493970e05affcd33b2d16c07580205a479eb30a (diff) | |
| download | qt-creator-8dacb123e0e7194b507e609c1016f8bcc3aaceaa.tar.gz | |
Utils: Pass MacroExpander to ArgumentsAspect constructor
In the past we wanted to keep the aspect constructor simple but
it turned out that exceptions were needed and accumulating, so those
are likely here to stay.
By passing also the MacroExpander to the ArgumentsAspect constructor
allows other single-purpose warts like the ProjectConfiguration::doPostInit()
machinery can be removed.
Change-Id: I148b0ca1ab0740270eecd0d3134620de65a86d4f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/libs/utils/aspects.cpp')
| -rw-r--r-- | src/libs/utils/aspects.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp index e0cf0440c6..247281e619 100644 --- a/src/libs/utils/aspects.cpp +++ b/src/libs/utils/aspects.cpp @@ -2392,7 +2392,7 @@ void AspectContainer::forEachAspect(const std::function<void(BaseAspect *)> &run } } -BaseAspect::Data::Ptr BaseAspect::extractData(const MacroExpander *expander) const +BaseAspect::Data::Ptr BaseAspect::extractData() const { QTC_ASSERT(d->m_dataCreator, return {}); Data *data = d->m_dataCreator(); @@ -2400,7 +2400,7 @@ BaseAspect::Data::Ptr BaseAspect::extractData(const MacroExpander *expander) con data->m_id = id(); data->m_cloner = d->m_dataCloner; for (const DataExtractor &extractor : d->m_dataExtractors) - extractor(data, expander); + extractor(data); return Data::Ptr(data); } |