Merge pull request #289 from steinbergmedia/fix-Windows-compilation-e…

…rror-C2445-result-type-of-conditional-expression-is-ambiguous
steinbergmedia · Mar 30, 2023 · 0cb4966 · 0cb4966
2 parents 26273cd + 0e8683b
commit 0cb4966
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/vstgui/uidescription/editing/uiattributescontroller.cpp b/vstgui/uidescription/editing/uiattributescontroller.cpp
@@ -500,7 +500,7 @@ class MenuController : public TextController, public OptionMenuListenerAdapter,
 
 	bool onCommandMenuItemSelected (CCommandMenuItem* item) override
 	{
-		performValueChange (item->getTag () == 100 ? "" : item->getTitle ());
+		performValueChange (item->getTag () == 100 ? UTF8String ("") : item->getTitle ());
 		return true;
 	}
 

diff --git a/vstgui/uidescription/editing/uibasedatasource.h b/vstgui/uidescription/editing/uibasedatasource.h
@@ -47,7 +47,7 @@ class UIBaseDataSource : public GenericStringListDataBrowserSource, public ICont
 	{
 		if (dataBrowser && actionPerformer)
 		{
-			std::string newName (filterString.empty () ? "New" : filterString);
+			std::string newName (filterString.empty () ? "New" : filterString.data ());
 			if (createUniqueName (newName))
 			{
 				addItem (newName.data ());

diff --git a/vstgui/uidescription/editing/uicolorscontroller.cpp b/vstgui/uidescription/editing/uicolorscontroller.cpp
@@ -358,7 +358,7 @@ bool UIColorsDataSource::dbOnDropInCell (int32_t row, int32_t column, const CPoi
 		}
 		else
 		{
-			std::string newName (filterString.empty () ? "New" : filterString);
+			std::string newName (filterString.empty () ? "New" : filterString.data ());
 			if (createUniqueName (newName))
 			{
 				actionPerformer->performColorChange (newName.data (), *dragColor);

diff --git a/vstgui/uidescription/editing/uitemplatecontroller.cpp b/vstgui/uidescription/editing/uitemplatecontroller.cpp
@@ -354,7 +354,7 @@ void UITemplateController::onUIDescTemplateChanged (UIDescription* desc)
 	{
 		int32_t rowToSelect = templateDataBrowser->getSelectedRow ();
 		int32_t index = 0;
-		auto selectedTemplateStr = selectedTemplateName ? *selectedTemplateName : "";
+		auto selectedTemplateStr = selectedTemplateName ? selectedTemplateName->data () : "";
 		templateNames.clear ();
 		dataSource->setStringList (&templateNames);
 		std::list<const std::string*> tmp;