OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2361 AppFwk : Improve robustness of load and save of FilePath

Browse Source
This commit is contained in:
Magne Sjaastad 2018-01-12 14:55:59 +01:00
parent 5e3bc0e5ee
commit bf1b755dc8
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmFilePathStreamOperators.cpp
View File

@ -7,9 +7,25 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QTextStream& operator<<(QTextStream& str, const std::vector<caf::FilePath>& filePathObjects) QTextStream& operator<<(QTextStream& str, const std::vector<caf::FilePath>& filePathObjects)
{ {
QStringList trimmedEntries;
for (const auto& filePath : filePathObjects) for (const auto& filePath : filePathObjects)
{ {
str << filePath << ";"; QString text = filePath.path().trimmed();
if (text.isEmpty()) continue;
trimmedEntries.push_back(text);
}
for (const auto& s : trimmedEntries)
{
str << s;
if (s != trimmedEntries.back())
{
str << ";";
}
} }
return str; return str;
@ -28,13 +44,20 @@ QTextStream& operator>>(QTextStream& str, std::vector<caf::FilePath>& filePathOb
QChar singleChar; QChar singleChar;
str >> singleChar; str >> singleChar;
stringSeparatedBySemicolon += singleChar; if (!singleChar.isNull())
{
stringSeparatedBySemicolon += singleChar;
}
} }
QStringList splitBySemicolon = stringSeparatedBySemicolon.split(";"); QStringList splitBySemicolon = stringSeparatedBySemicolon.split(";");
for (const auto& s : splitBySemicolon ) for (const auto& s : splitBySemicolon)
{ {
filePathObjects.push_back(s); QString trimmed = s.trimmed();
if (!trimmed.isEmpty())
{
filePathObjects.push_back(trimmed);
}
} }
return str; return str;