1 files changed, 13 insertions, 18 deletions
diff --git a/tests/unit/unittest/filesystem-utilities.h b/tests/unit/unittest/filesystem-utilities.h
index 3bbafdf368..9a4fd8e2db 100644
--- a/tests/unit/unittest/filesystem-utilities.h
+++ b/tests/unit/unittest/filesystem-utilities.h
@@ -26,32 +26,27 @@
 #pragma once
 
 #include <utils/hostosinfo.h>
-#include <utils/smallstring.h>
 
-#include <string>
+#include <nativefilepath.h>
 
-// use std::filesystem::path if it is supported by all compilers
-static const char nativeSeparator = Utils::HostOsInfo::isWindowsHost() ? '\\' : '/';
+template<std::size_t Size>
+ClangBackEnd::NativeFilePath toNativePath(const char (&text)[Size])
+{
+    ClangBackEnd::FilePath path = text;
 
+    return ClangBackEnd::NativeFilePath{path};
+}
 
-template <std::size_t Size>
-std::string toNativePath(const char (&text)[Size])
+inline ClangBackEnd::NativeFilePath toNativePath(const QString &text)
 {
-    std::string path = text;
+    ClangBackEnd::FilePath path{text};
 
-    if (Utils::HostOsInfo::isWindowsHost())
-        std::replace(path.begin(), path.end(), '/', '\\');
-
-    return path;
+    return ClangBackEnd::NativeFilePath{path};
 }
 
-inline
-std::string toNativePath(const QString &qStringPath)
+inline ClangBackEnd::NativeFilePath toNativePath(Utils::SmallStringView text)
 {
-    auto path = qStringPath.toStdString();
-
-    if (Utils::HostOsInfo::isWindowsHost())
-        std::replace(path.begin(), path.end(), '/', '\\');
+    ClangBackEnd::FilePath path{text};
 
-    return path;
+    return ClangBackEnd::NativeFilePath{path};
 }