Merge

1 files changed, 3 insertions, 3 deletions

diff --git a/src/installationmanager.cpp b/src/installationmanager.cpp
index b55d8d3a..2e9678af 100644
--- a/src/installationmanager.cpp
+++ b/src/installationmanager.cpp
@@ -119,17 +119,17 @@ void InstallationManager::mapToArchive(const DirectoryTree::Node *node, std::wst
 

   for (DirectoryTree::const_leaf_iterator iter = node->leafsBegin(); iter != node->leafsEnd(); ++iter) {

     data[iter->getIndex()]->setSkip(false);

-    std::wstring temp = path.substr().append(ToWString(iter->getName()));

+    std::wstring temp = path.substr().append(iter->getName().toStdWString());

     data[iter->getIndex()]->setOutputFileName(temp.c_str());

   }

 

   for (DirectoryTree::const_node_iterator iter = node->nodesBegin(); iter != node->nodesEnd(); ++iter) {

     if ((*iter)->getData().index != -1) {

       data[(*iter)->getData().index]->setSkip(false);

-      std::wstring temp = path.substr().append(ToWString((*iter)->getData().name));

+      std::wstring temp = path.substr().append((*iter)->getData().name.toStdWString());

       data[(*iter)->getData().index]->setOutputFileName(temp.c_str());

     }

-    mapToArchive(*iter, path.substr().append(ToWString((*iter)->getData().name)), data);

+    mapToArchive(*iter, path.substr().append((*iter)->getData().name.toStdWString()), data);

   }

 }