From 50dcc4c1d463874460e6c279bb5d68383f03e230 Mon Sep 17 00:00:00 2001
From: Tom Tanner <thosrtanner2@users.sourceforge.net>
Date: Sat, 6 Jun 2015 15:56:44 +0100
Subject: Addition of FileNameString clase which ignores case during compares.

Affects rather a lot of stuff.
---
 src/installationmanager.cpp | 6 +++---
 src/modinfo.cpp             | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src')

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>
-- 
cgit v1.3.1


From b0b2f1d3a993b948516afc0694e19d8d16240d18 Mon Sep 17 00:00:00 2001
From: Tom Tanner <thosrtanner2@users.sourceforge.net>
Date: Sun, 7 Jun 2015 13:37:41 +0100
Subject: Make the about dialog come up on the first tab

---
 src/aboutdialog.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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">
-- 
cgit v1.3.1