Merge

3 files changed, 6 insertions, 4 deletions

diff --git a/src/aboutdialog.ui b/src/aboutdialog.ui
index 7512645c..81577791 100644
--- a/src/aboutdialog.ui
+++ b/src/aboutdialog.ui
@@ -46,7 +46,7 @@
      <item>

       <widget class="QTabWidget" name="tabWidget">

        <property name="currentIndex">

-        <number>2</number>

+        <number>0</number>

        </property>

        <widget class="QWidget" name="about">

         <attribute name="title">

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);

   }

 }

 

diff --git a/src/modinfo.cpp b/src/modinfo.cpp
index 33d54c77..6c457163 100644
--- a/src/modinfo.cpp
+++ b/src/modinfo.cpp
@@ -18,6 +18,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "modinfo.h"
+
 #include "utility.h"
 #include "installationtester.h"
 #include "categories.h"
@@ -26,6 +27,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "overwriteinfodialog.h"
 #include "json.h"
 #include "messagedialog.h"
+#include "filenamestring.h"
 
 #include <gameinfo.h>
 #include <iplugingame.h>