4 files changed, 15 insertions, 15 deletions
diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp
index 8e3bacd6b7..1d79136422 100644
--- a/src/corelib/io/qfilesystemengine_win.cpp
+++ b/src/corelib/io/qfilesystemengine_win.cpp
@@ -1219,11 +1219,11 @@ QString QFileSystemEngine::rootPath()
     if (FAILED(installedLocation.As(&item)))
         return ret;
 
-    HSTRING finalWinPath;
-    if (FAILED(item->get_Path(&finalWinPath)))
+    HString finalWinPath;
+    if (FAILED(item->get_Path(finalWinPath.GetAddressOf())))
         return ret;
 
-    ret = QDir::fromNativeSeparators(QString::fromWCharArray(WindowsGetStringRawBuffer(finalWinPath, nullptr)));
+    ret = QDir::fromNativeSeparators(QString::fromWCharArray(finalWinPath.GetRawBuffer(nullptr)));
 
 #else
     QString ret = QString::fromLatin1(qgetenv("SystemDrive").constData());
@@ -1319,10 +1319,10 @@ QString QFileSystemEngine::tempPath()
     ComPtr<IStorageItem> tempFolderItem;
     if (FAILED(tempFolder.As(&tempFolderItem)))
         return ret;
-    HSTRING path;
-    if (FAILED(tempFolderItem->get_Path(&path)))
+    HString path;
+    if (FAILED(tempFolderItem->get_Path(path.GetAddressOf())))
         return ret;
-    ret = QDir::fromNativeSeparators(QString::fromWCharArray(WindowsGetStringRawBuffer(path, nullptr)));
+    ret = QDir::fromNativeSeparators(QString::fromWCharArray(path.GetRawBuffer(nullptr)));
 #endif // Q_OS_WINRT
     if (ret.isEmpty()) {
 #if !defined(Q_OS_WINCE)
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index 63a0266948..7b4240e102 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -1084,10 +1084,10 @@ static QString windowsConfigPath(int type)
         ComPtr<IStorageItem> localFolderItem;
         if (FAILED(localFolder.As(&localFolderItem)))
             return result;
-        HSTRING path;
-        if (FAILED(localFolderItem->get_Path(&path)))
+        HString path;
+        if (FAILED(localFolderItem->get_Path(path.GetAddressOf())))
             return result;
-        result = QString::fromWCharArray(WindowsGetStringRawBuffer(path, nullptr));
+        result = QString::fromWCharArray(path.GetRawBuffer(nullptr));
     }
 
     switch (type) {
diff --git a/src/corelib/io/qstandardpaths_winrt.cpp b/src/corelib/io/qstandardpaths_winrt.cpp
index bd72de11bb..84a3930ee0 100644
--- a/src/corelib/io/qstandardpaths_winrt.cpp
+++ b/src/corelib/io/qstandardpaths_winrt.cpp
@@ -89,10 +89,10 @@ QString QStandardPaths::writableLocation(StandardLocation type)
         ComPtr<IStorageItem> settingsFolderItem;
         if (FAILED(settingsFolder.As(&settingsFolderItem)))
             break;
-        HSTRING path;
-        if (FAILED(settingsFolderItem->get_Path(&path)))
+        HString path;
+        if (FAILED(settingsFolderItem->get_Path(path.GetAddressOf())))
             break;
-        result = convertCharArray(WindowsGetStringRawBuffer(path, nullptr));
+        result = convertCharArray(path.GetRawBuffer(nullptr));
         if (isTestModeEnabled())
             result += QLatin1String("/qttest");
         break;
diff --git a/src/corelib/tools/qlocale_win.cpp b/src/corelib/tools/qlocale_win.cpp
index 1690dd83ee..4c44016fdf 100644
--- a/src/corelib/tools/qlocale_win.cpp
+++ b/src/corelib/tools/qlocale_win.cpp
@@ -663,10 +663,10 @@ QVariant QSystemLocalePrivate::uiLanguages()
     unsigned int size;
     languageList->get_Size(&size);
     for (unsigned int i = 0; i < size; ++i) {
-        HSTRING language;
-        languageList->GetAt(i, &language);
+        HString language;
+        languageList->GetAt(i, language.GetAddressOf());
         UINT32 length;
-        PCWSTR rawString = WindowsGetStringRawBuffer(language, &length);
+        PCWSTR rawString = language.GetRawBuffer(&length);
         result << QString::fromWCharArray(rawString, length);
     }
 #else // !Q_OS_WINPHONE