From 855f0cbbbf56528c6ed2e98549315920eb7792f4 Mon Sep 17 00:00:00 2001
From: Eberhard Graether <egraether@gmail.com>
Date: Fri, 11 Aug 2017 12:22:33 +0200
Subject: [PATCH] ui: improved comment contrast in color schemes

* fixed clang warnings
---
 bin/app/data/color_schemes/bad_rainbow.xml  |  2 +-
 bin/app/data/color_schemes/bright.xml       |  4 ++--
 bin/app/data/color_schemes/dark.xml         |  4 ++--
 src/lib/settings/SourceGroupSettingsCxx.cpp | 15 ++++++++-------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/bin/app/data/color_schemes/bad_rainbow.xml b/bin/app/data/color_schemes/bad_rainbow.xml
index a552d148..6123daf6 100644
--- a/bin/app/data/color_schemes/bad_rainbow.xml
+++ b/bin/app/data/color_schemes/bad_rainbow.xml
@@ -121,7 +121,7 @@
 				<type>#FF5961</type>
 				<comment>#78946B</comment>
 				<number>#FC7F30</number>
-				<quotation>#F283F2</quotation>
+				<quotation>#DB77DB</quotation>
 				<function>#FFCC3B</function>
 			</syntax>
 
diff --git a/bin/app/data/color_schemes/bright.xml b/bin/app/data/color_schemes/bright.xml
index ca80d04d..8e499ad5 100644
--- a/bin/app/data/color_schemes/bright.xml
+++ b/bin/app/data/color_schemes/bright.xml
@@ -119,7 +119,7 @@
 				<directive>#1B8856</directive>
 				<keyword>#1B8856</keyword>
 				<type>#C1492D</type>
-				<comment>#8FB2C4</comment>
+				<comment>#6B9AB2</comment>
 				<number>#C1315E</number>
 				<quotation>#865F9E</quotation>
 				<function>#CC9533</function>
@@ -173,7 +173,7 @@
 						<text>#000000</text>
 					</normal>
 					<focus>
-						<fill>#FFFF0000</fill>
+						<fill>#CCFF0000</fill>
 					</focus>
 				</error>
 				<fulltext>
diff --git a/bin/app/data/color_schemes/dark.xml b/bin/app/data/color_schemes/dark.xml
index 2facfae6..4f9493a5 100644
--- a/bin/app/data/color_schemes/dark.xml
+++ b/bin/app/data/color_schemes/dark.xml
@@ -119,7 +119,7 @@
 				<directive>#1F9C62</directive>
 				<keyword>#1F9C62</keyword>
 				<type>#D95233</type>
-				<comment>#456A7D</comment>
+				<comment>#4E768A</comment>
 				<number>#CC3463</number>
 				<quotation>#9368AD</quotation>
 				<function>#D69C36</function>
@@ -171,7 +171,7 @@
 				<error>
 					<normal>
 						<border>transparent</border>
-						<fill>#A0FF0000</fill>
+						<fill>#BBFF0000</fill>
 						<text>#000000</text>
 					</normal>
 					<focus>
diff --git a/src/lib/settings/SourceGroupSettingsCxx.cpp b/src/lib/settings/SourceGroupSettingsCxx.cpp
index 4450621e..b854ed1b 100644
--- a/src/lib/settings/SourceGroupSettingsCxx.cpp
+++ b/src/lib/settings/SourceGroupSettingsCxx.cpp
@@ -144,15 +144,16 @@ SourceGroupSettingsCxx::SourceGroupSettingsCxx(const std::string& id, SourceGrou
 	: SourceGroupSettings(id, type, projectSettings)
 	, m_headerSearchPaths(std::vector<FilePath>())
 	, m_frameworkSearchPaths(std::vector<FilePath>())
-	, m_compilerFlags(std::vector<std::string>())
-	, m_useSourcePathsForHeaderSearch(false)
-	, m_hasDefinedUseSourcePathsForHeaderSearch(false)
-	, m_compilationDatabasePath(FilePath())
 	, m_targetOptionsEnabled(false)
 	, m_targetArch("")
 	, m_targetVendor("")
 	, m_targetSys("")
 	, m_targetAbi("")
+	, m_compilerFlags(std::vector<std::string>())
+	, m_useSourcePathsForHeaderSearch(false)
+	, m_hasDefinedUseSourcePathsForHeaderSearch(false)
+	, m_compilationDatabasePath(FilePath())
+	, m_shouldApplyAnonymousTypedefTransformation(true)
 {
 }
 
@@ -327,9 +328,9 @@ std::string SourceGroupSettingsCxx::getTargetFlag() const
 	{
 		targetFlag = "--target=";
 		targetFlag += m_targetArch;
-		targetFlag += "-" + m_targetVendor.empty() ? "unknown" : m_targetVendor;
-		targetFlag += "-" + m_targetSys.empty() ? "unknown" : m_targetSys;
-		targetFlag += "-" + m_targetAbi.empty() ? "unknown" : m_targetAbi;
+		targetFlag += "-" + (m_targetVendor.empty() ? "unknown" : m_targetVendor);
+		targetFlag += "-" + (m_targetSys.empty() ? "unknown" : m_targetSys);
+		targetFlag += "-" + (m_targetAbi.empty() ? "unknown" : m_targetAbi);
 	}
 	return targetFlag;
 }