diff options
author | Brad King <brad.king@kitware.com> | 2019-08-29 13:36:25 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2019-08-29 13:36:36 (GMT) |
commit | 030570d71ff8b15a7242203f2638d3b77af755b9 (patch) | |
tree | 20258001d12f684134c7c01bb2b776524da35c99 /Source/cmQtAutoGenerator.h | |
parent | 49294535042ce610fae867449c82435baef96744 (diff) | |
parent | 32b15d320f9afd858a5966744dda5568cd396798 (diff) | |
download | CMake-030570d71ff8b15a7242203f2638d3b77af755b9.zip CMake-030570d71ff8b15a7242203f2638d3b77af755b9.tar.gz CMake-030570d71ff8b15a7242203f2638d3b77af755b9.tar.bz2 |
Merge topic 'autogen_strcat'
32b15d320f Autogen: cmQtAutoMocUic settings hash computation optimizations
b66cd3fe63 Autogen: cmQtAutoMocUic string concatenation cleanups
619a92eacd Autogen: cmQtAutoRcc settings hash computation optimizations
10dc684508 Autogen: cmQtAutoRcc string concatenation cleanups
da6c4b1273 Autogen: cmQtAutoGenInitializer string concatenation cleanups
7a78d15415 Autogen: Let cmQtAutoGenerator::Logger methods accept cm::string_view
c797148e85 Autogen: Use cm::string_view for AUTO{MOC,UIC,RCC} generator names
8586077baa Autogen: Modernize cmQtAutoGen methods using cm::string_view
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3742
Diffstat (limited to 'Source/cmQtAutoGenerator.h')
-rw-r--r-- | Source/cmQtAutoGenerator.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/Source/cmQtAutoGenerator.h b/Source/cmQtAutoGenerator.h index ff4c4c9..4b8b0b7 100644 --- a/Source/cmQtAutoGenerator.h +++ b/Source/cmQtAutoGenerator.h @@ -7,6 +7,7 @@ #include "cmFileTime.h" #include "cmQtAutoGen.h" +#include "cm_string_view.hxx" #include <mutex> #include <string> @@ -41,21 +42,21 @@ public: bool ColorOutput() const { return this->ColorOutput_; } void SetColorOutput(bool value); // -- Log info - void Info(GenT genType, std::string const& message) const; + void Info(GenT genType, cm::string_view message) const; // -- Log warning - void Warning(GenT genType, std::string const& message) const; - void WarningFile(GenT genType, std::string const& filename, - std::string const& message) const; + void Warning(GenT genType, cm::string_view message) const; + void WarningFile(GenT genType, cm::string_view filename, + cm::string_view message) const; // -- Log error - void Error(GenT genType, std::string const& message) const; - void ErrorFile(GenT genType, std::string const& filename, - std::string const& message) const; - void ErrorCommand(GenT genType, std::string const& message, + void Error(GenT genType, cm::string_view message) const; + void ErrorFile(GenT genType, cm::string_view filename, + cm::string_view message) const; + void ErrorCommand(GenT genType, cm::string_view message, std::vector<std::string> const& command, std::string const& output) const; private: - static std::string HeadLine(std::string const& title); + static std::string HeadLine(cm::string_view title); private: mutable std::mutex Mutex_; |