diff options
author | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-10-08 09:20:44 +0900 |
---|---|---|
committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-10-08 09:20:44 +0900 |
commit | 99a800848c2512f7c93504fc7b28e6182a6ceb93 (patch) | |
tree | 0236502664965e5284d0c950ed2c1bf294b1233b /Source/cmQtAutoGenerator.h | |
parent | df4ed7977a77409f899f6f05389960f6b73125a8 (diff) | |
download | cmake-99a800848c2512f7c93504fc7b28e6182a6ceb93.tar.gz cmake-99a800848c2512f7c93504fc7b28e6182a6ceb93.tar.bz2 cmake-99a800848c2512f7c93504fc7b28e6182a6ceb93.zip |
Imported Upstream version 3.20.0upstream/3.20.0
Diffstat (limited to 'Source/cmQtAutoGenerator.h')
-rw-r--r-- | Source/cmQtAutoGenerator.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/Source/cmQtAutoGenerator.h b/Source/cmQtAutoGenerator.h index b4f057d06..5c3a8adcc 100644 --- a/Source/cmQtAutoGenerator.h +++ b/Source/cmQtAutoGenerator.h @@ -31,7 +31,7 @@ public: public: // -- Construction Logger(); - ~Logger(); + ~Logger() = default; // -- Verbosity unsigned int Verbosity() const { return this->Verbosity_; } void SetVerbosity(unsigned int value) { this->Verbosity_ = value; } @@ -54,7 +54,6 @@ public: private: static std::string HeadLine(cm::string_view title); - private: mutable std::mutex Mutex_; unsigned int Verbosity_ = 0; bool ColorOutput_ = false; @@ -79,7 +78,6 @@ public: static bool FileDiffers(std::string const& filename, std::string const& content); -public: // -- Constructors cmQtAutoGenerator(GenT genType); virtual ~cmQtAutoGenerator(); @@ -88,10 +86,10 @@ public: cmQtAutoGenerator& operator=(cmQtAutoGenerator const&) = delete; // -- Info options - std::string const& InfoFile() const { return InfoFile_; } - std::string const& InfoDir() const { return InfoDir_; } - cmFileTime const& InfoFileTime() const { return InfoFileTime_; } - std::string const& InfoConfig() const { return InfoConfig_; } + std::string const& InfoFile() const { return this->InfoFile_; } + std::string const& InfoDir() const { return this->InfoDir_; } + cmFileTime const& InfoFileTime() const { return this->InfoFileTime_; } + std::string const& InfoConfig() const { return this->InfoConfig_; } // -- Info file parsing /** Info file reader class. */ @@ -124,7 +122,7 @@ public: Json::Value const& GetValue(std::string const& key) const { - return Json_[key]; + return this->Json_[key]; } /** Returns true if strings were appended to the list. */ @@ -140,7 +138,6 @@ public: private: std::string ConfigKey(cm::string_view key) const; - private: Json::Value Json_; cmQtAutoGenerator& Gen_; }; @@ -150,7 +147,7 @@ public: cm::string_view key); // -- Directories - ProjectDirsT const& ProjectDirs() const { return ProjectDirs_; } + ProjectDirsT const& ProjectDirs() const { return this->ProjectDirs_; } std::string MessagePath(cm::string_view path) const; // -- Run @@ -161,7 +158,7 @@ protected: virtual bool InitFromInfo(InfoT const& info) = 0; virtual bool Process() = 0; // - Utility classes - Logger const& Log() const { return Logger_; } + Logger const& Log() const { return this->Logger_; } private: // -- Generator type |