Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/freestyle/intern/system/StringUtils.cpp')
-rwxr-xr-xsource/blender/freestyle/intern/system/StringUtils.cpp20
1 files changed, 15 insertions, 5 deletions
diff --git a/source/blender/freestyle/intern/system/StringUtils.cpp b/source/blender/freestyle/intern/system/StringUtils.cpp
index 2af76feeb37..1afee94d962 100755
--- a/source/blender/freestyle/intern/system/StringUtils.cpp
+++ b/source/blender/freestyle/intern/system/StringUtils.cpp
@@ -19,10 +19,14 @@
//
///////////////////////////////////////////////////////////////////////////////
-#include <qfileinfo.h>
+//soc #include <qfileinfo.h>
#include "FreestyleConfig.h"
#include "StringUtils.h"
+//soc
+#include "BKE_utildefines.h"
+#include "BLI_blenlib.h"
+
namespace StringUtils {
void getPathName(const string& path, const string& base, vector<string>& pathnames) {
@@ -33,12 +37,18 @@ namespace StringUtils {
pos < size;
pos = sep + 1, sep = path.find(Config::PATH_SEP, pos)) {
if (sep == (unsigned)string::npos)
- sep = size;
+ sep = size;
dir = path.substr(pos, sep - pos);
- QFileInfo fi(dir.c_str());
- string res = (const char*)fi.absoluteFilePath().toAscii();
+
+//soc QFileInfo fi(dir.c_str());
+//soc string res = (const char*)fi.absoluteFilePath().toAscii();
+ char cleaned[FILE_MAX];
+ BLI_strncpy(cleaned, dir.c_str(), FILE_MAX);
+ BLI_cleanup_file(NULL, cleaned);
+ string res(cleaned);
+
if (!base.empty())
- res += Config::DIR_SEP + base;
+ res += Config::DIR_SEP + base;
pathnames.push_back(res);
}
}