From 1484d74c1dfd24cfe5b6f13f76d58ff395e4d253 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Tue, 10 Jan 2023 16:00:36 +0100 Subject: Put ctor.h contents in ctor namespace. --- src/task.h | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'src/task.h') diff --git a/src/task.h b/src/task.h index 4efbfff..b4f37a5 100644 --- a/src/task.h +++ b/src/task.h @@ -21,12 +21,10 @@ enum class State Error, }; -struct Settings; - class Task { public: - Task(const BuildConfiguration& config, const Settings& settings, + Task(const ctor::BuildConfiguration& config, const ctor::Settings& settings, const std::string& sourceDir); virtual ~Task() = default; @@ -59,11 +57,11 @@ public: //! Returns a reference to the originating build config. //! Note: the build config of a derived task will be that of its parent //! (target) task. - const BuildConfiguration& buildConfig() const; + const ctor::BuildConfiguration& buildConfig() const; - TargetType targetType() const; - Language sourceLanguage() const; - OutputSystem outputSystem() const; + ctor::TargetType targetType() const; + ctor::Language sourceLanguage() const; + ctor::OutputSystem outputSystem() const; std::string compiler() const; std::set> getDependsTasks(); @@ -77,10 +75,10 @@ protected: std::vector dependsStr; std::set> dependsTasks; - const BuildConfiguration& config; - TargetType target_type{TargetType::Auto}; - Language source_language{Language::Auto}; - OutputSystem output_system{OutputSystem::Host}; - const Settings& settings; + const ctor::BuildConfiguration& config; + ctor::TargetType target_type{ctor::TargetType::Auto}; + ctor::Language source_language{ctor::Language::Auto}; + ctor::OutputSystem output_system{ctor::OutputSystem::Host}; + const ctor::Settings& settings; std::string sourceDir; }; -- cgit v1.2.3