ofFileDialogResult using fs::path (#8119)

Author: dimitre

libs/openFrameworks/utils/ofFileUtils.cpp

@@ -1773,7 +1773,7 @@ fs::path ofFilePath::getPathForDirectory(const fs::path & path){
 // FIXME: - re-avail
 string ofFilePath::removeTrailingSlash(const fs::path & _path){
 	auto path = ofPathToString(_path);
-	if(path.length() > 0 && (path[path.length() - 1] == '/' || path[path.length() - 1] == '\\')){
+	if(!path.empty() && (path[path.length() - 1] == '/' || path[path.length() - 1] == '\\')){
 		path = path.substr(0, path.length() - 1);
 	}
 	return path;

libs/openFrameworks/utils/ofSystemUtils.cpp

@@ -257,18 +257,15 @@ void resetLocale(std::locale locale){
 
 //------------------------------------------------------------------------------
 ofFileDialogResult::ofFileDialogResult(){
-	filePath = "";
-	fileName = "";
-	bSuccess = false;
 }
 
 //------------------------------------------------------------------------------
-std::string ofFileDialogResult::getName(){
+of::filesystem::path ofFileDialogResult::getName(){
 	return fileName;
 }
 
 //------------------------------------------------------------------------------
-std::string ofFileDialogResult::getPath(){
+of::filesystem::path ofFileDialogResult::getPath(){
 	return filePath;
 }
 
@@ -337,7 +334,7 @@ static int CALLBACK loadDialogBrowseCallback(
 //---------------------------------------------------------------------
 
 // OS specific results here.  "" = cancel or something bad like can't load, can't save, etc...
-ofFileDialogResult ofSystemLoadDialog(std::string windowTitle, bool bFolderSelection, std::string defaultPath){
+ofFileDialogResult ofSystemLoadDialog(std::string windowTitle, bool bFolderSelection, of::filesystem::path defaultPath){
 
 	ofFileDialogResult results;
 
@@ -494,7 +491,7 @@ ofFileDialogResult ofSystemLoadDialog(std::string windowTitle, bool bFolderSelec
 
 
 
-	if( results.filePath.length() > 0 ){
+	if( !results.filePath.empty() ){
 		results.bSuccess = true;
 		results.fileName = ofFilePath::getFileName(results.filePath);
 	}
@@ -575,7 +572,7 @@ ofFileDialogResult ofSystemSaveDialog(std::string defaultName, std::string messa
 	//----------------------------------------------------------------------------------------
 	//----------------------------------------------------------------------------------------
 
-	if( results.filePath.length() > 0 ){
+	if( !results.filePath.empty() ){
 		results.bSuccess = true;
 		results.fileName = ofFilePath::getFileName(results.filePath);
 	}

libs/openFrameworks/utils/ofSystemUtils.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "ofConstants.h" // fs::path
 #include <string>
 
 /// \class ofFileDialogResult
@@ -10,14 +11,14 @@ class ofFileDialogResult{
 
 	/// \return the name of the selected file or directory, if set
 	/// currently returns only 1 file, this may change in the future
-	std::string getName();
+	of::filesystem::path getName();
 
 	/// \return the full path of the selected file or directory, if set
-	std::string getPath();
+	of::filesystem::path getPath();
 
-	std::string filePath; ///< full path to selected file or directory
-	std::string fileName; ///< selected file or directory name
-	bool bSuccess; ///< true if the dialog action was successful, aka file select not cancel
+	of::filesystem::path filePath { "" }; ///< full path to selected file or directory
+	of::filesystem::path fileName { "" }; ///< selected file or directory name
+	bool bSuccess = false; ///< true if the dialog action was successful, aka file select not cancel
 };
 
 /// \brief show an error message in an alert dialog box
@@ -28,7 +29,7 @@ void ofSystemAlertDialog(std::string errorMessage);
 /// \param bFolderSelection set to true to allow folder selection
 /// \param defaultPath optional default directory path to start the dialog in, ie. ofFilePath::getUserHomeDir()
 /// \return dialog result with selection (if any)
-ofFileDialogResult ofSystemLoadDialog(std::string windowTitle="", bool bFolderSelection = false, std::string defaultPath="");
+ofFileDialogResult ofSystemLoadDialog(std::string windowTitle="", bool bFolderSelection = false, of::filesystem::path defaultPath="");
 
 /// \brief show a file save dialog box
 /// \param defaultName suggested filename to start dialog, ie "screenshot.png"