summaryrefslogtreecommitdiffstats
path: root/Source/cmQtAutoGenerators.h
diff options
context:
space:
mode:
authorSebastian Holtermann <sebholt@xwmw.org>2016-11-30 20:08:54 (GMT)
committerBrad King <brad.king@kitware.com>2016-12-07 13:23:58 (GMT)
commit00750ece6a5dbfd51a8dd789c4d7dc1246f63ec3 (patch)
tree67dba558cad429b5bed657ed4912b22aed63fcd1 /Source/cmQtAutoGenerators.h
parent708e44af5d445d25cc39e83da800ccc57f90a79a (diff)
downloadCMake-00750ece6a5dbfd51a8dd789c4d7dc1246f63ec3.zip
CMake-00750ece6a5dbfd51a8dd789c4d7dc1246f63ec3.tar.gz
CMake-00750ece6a5dbfd51a8dd789c4d7dc1246f63ec3.tar.bz2
QtAutogen: Error and warning log method tweaks
Diffstat (limited to 'Source/cmQtAutoGenerators.h')
-rw-r--r--Source/cmQtAutoGenerators.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index 47f3289..816c380 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -76,13 +76,15 @@ private:
bool NameCollisionTest(const std::map<std::string, std::string>& genFiles,
std::multimap<std::string, std::string>& collisions);
- void NameCollisionLog(
+
+ void LogErrorNameCollision(
const std::string& message,
const std::multimap<std::string, std::string>& collisions);
-
void LogInfo(const std::string& message);
+ void LogWarning(const std::string& message);
void LogError(const std::string& message);
void LogCommand(const std::vector<std::string>& command);
+
std::string JoinExts(const std::vector<std::string>& lst);
static void MergeUicOptions(std::vector<std::string>& opts,