Fix build errors from merge and remove quotes from error messages

3 files changed, 6 insertions, 12 deletions

diff --git a/src/components/smart_objects/include/smart_objects/default_shema_item.h b/src/components/smart_objects/include/smart_objects/default_shema_item.h
index 6bac513b16..a9bf5ae6da 100644
--- a/src/components/smart_objects/include/smart_objects/default_shema_item.h
+++ b/src/components/smart_objects/include/smart_objects/default_shema_item.h
@@ -103,8 +103,7 @@ Errors::eType CDefaultSchemaItem<Type>::validate(const SmartObject& Object,
                                                  std::string& errorMessage) {
   if (getSmartType() != Object.getType()) {
     if (!Object.getKey().empty()) {
-      errorMessage.assign("Validation failed for \"" + Object.getKey() +
-                          "\". ");
+      errorMessage.assign("Validation failed for " + Object.getKey() + ". ");
     }
     errorMessage += "Incorrect type, expected: " +
                     SmartObject::typeToString(getSmartType()) + ", got: " +
diff --git a/src/components/smart_objects/include/smart_objects/enum_schema_item.h b/src/components/smart_objects/include/smart_objects/enum_schema_item.h
index 6f77856c45..1ca0fe07af 100644
--- a/src/components/smart_objects/include/smart_objects/enum_schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/enum_schema_item.h
@@ -211,8 +211,7 @@ Errors::eType TEnumSchemaItem<EnumType>::validate(const SmartObject& Object,
                                                   std::string& errorMessage) {
   if (SmartType_Integer != Object.getType()) {
     if (!Object.getKey().empty()) {
-      errorMessage.assign("Validation failed for \"" + Object.getKey() +
-                          "\". ");
+      errorMessage.assign("Validation failed for " + Object.getKey() + ". ");
     }
 
     if (SmartType_String == Object.getType()) {
@@ -228,8 +227,7 @@ Errors::eType TEnumSchemaItem<EnumType>::validate(const SmartObject& Object,
   if (mAllowedElements.find(static_cast<EnumType>(Object.asInt())) ==
       mAllowedElements.end()) {
     if (!Object.getKey().empty()) {
-      errorMessage.assign("Validation failed for \"" + Object.getKey() +
-                          "\". ");
+      errorMessage.assign("Validation failed for " + Object.getKey() + ". ");
     }
     std::stringstream stream;
     stream << "Invalid enum value: " << Object.asInt();
diff --git a/src/components/smart_objects/include/smart_objects/number_schema_item.h b/src/components/smart_objects/include/smart_objects/number_schema_item.h
index 70e75938ed..dc45bfb625 100644
--- a/src/components/smart_objects/include/smart_objects/number_schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/number_schema_item.h
@@ -131,8 +131,7 @@ Errors::eType TNumberSchemaItem<NumberType>::validate(
     const SmartObject& Object, std::string& errorMessage) {
   if (!isValidNumberType(Object.getType())) {
     if (!Object.getKey().empty()) {
-      errorMessage.assign("Validation failed for \"" + Object.getKey() +
-                          "\". ");
+      errorMessage.assign("Validation failed for " + Object.getKey() + ". ");
     }
     SmartType expectedType = (typeid(double) == typeid(Object.getType()))
                                  ? SmartType_Double
@@ -160,8 +159,7 @@ Errors::eType TNumberSchemaItem<NumberType>::validate(
   NumberType rangeLimit;
   if (mMinValue.getValue(rangeLimit) && (value < rangeLimit)) {
     if (!Object.getKey().empty()) {
-      errorMessage.assign("Validation failed for \"" + Object.getKey() +
-                          "\". ");
+      errorMessage.assign("Validation failed for " + Object.getKey() + ". ");
     }
     std::stringstream stream;
     stream << "Value too small, got: " << value
@@ -172,8 +170,7 @@ Errors::eType TNumberSchemaItem<NumberType>::validate(
 
   if (mMaxValue.getValue(rangeLimit) && (value > rangeLimit)) {
     if (!Object.getKey().empty()) {
-      errorMessage.assign("Validation failed for \"" + Object.getKey() +
-                          "\". ");
+      errorMessage.assign("Validation failed for " + Object.getKey() + ". ");
     }
     std::stringstream stream;
     stream << "Value too large, got: " << value