post-merge cleanup

Addition of FileNameString clase which ignores case during compares.
Affects rather a lot of stuff.
2026-07-27 14:02:39 -07:00 · 2015-06-08 19:55:00 +02:00 · 2015-06-06 15:56:44 +01:00 · 2015-05-09 21:46:40 +02:00 · 2015-03-27 18:24:37 +01:00 · 2015-03-20 10:34:30 +00:00
3 changed files with 26 additions and 10 deletions
@@ -0,0 +1,15 @@
+Import('qt_env')
+
+env = qt_env.Clone()
+
+env.DisableQtModules('Gui')
+env.AppendUnique(CPPDEFINES = [ 'INSTALLERBUNDLE_LIBRARY' ])
+
+# Sigh
+env['CPPPATH'] += [ '.' ]
+
+lib = env.SharedLibrary('installerBundle', env.Glob('*.cpp'))
+env.InstallModule(lib)
+
+res = env['QT_USED_MODULES']
+Return('res')
@@ -27,4 +27,5 @@ HEADERS += installerbundle.h
 include(../plugin_template.pri)

 OTHER_FILES += \
-    installerbundle.json
+    installerbundle.json\
+    SConscript
@@ -53,7 +53,7 @@ QString InstallerBundle::description() const

 VersionInfo InstallerBundle::version() const
 {
-  return VersionInfo(1, 0, 0, VersionInfo::RELEASE_FINAL);
+  return VersionInfo(1, 0, 1, VersionInfo::RELEASE_FINAL);
 }

 bool InstallerBundle::isActive() const
@@ -80,14 +80,14 @@ bool InstallerBundle::isArchiveSupported(const DirectoryTree &tree) const
 {
  for (DirectoryTree::const_leaf_iterator fileIter = tree.leafsBegin();
       fileIter != tree.leafsEnd(); ++fileIter) {
-    if (fileIter->getName().endsWith(".fomod", Qt::CaseInsensitive)) {
+    if (fileIter->getName().endsWith(".fomod")) {
      return true;
    }
  }
  if ((tree.numNodes() == 0)
      && (tree.numLeafs() == 1)
-      && (tree.leafsBegin()->getName().endsWith(".7z", Qt::CaseInsensitive)
-          || tree.leafsBegin()->getName().endsWith(".rar", Qt::CaseInsensitive))) {
+      && (tree.leafsBegin()->getName().endsWith(".7z")
+          || tree.leafsBegin()->getName().endsWith(".rar"))) {
    // nested archive
    return true;
  }
@@ -99,11 +99,11 @@ IPluginInstaller::EInstallResult InstallerBundle::install(GuessedValue<QString>
 {
  for (DirectoryTree::const_leaf_iterator fileIter = tree.leafsBegin();
       fileIter != tree.leafsEnd(); ++fileIter) {
-    QString name = fileIter->getName();
-    if (name.endsWith(".fomod", Qt::CaseInsensitive)
-        || name.endsWith(".7z", Qt::CaseInsensitive)
-        || name.endsWith(".rar", Qt::CaseInsensitive)) {
-      QString tempFile = manager()->extractFile(fileIter->getName());
+    FileNameString name = fileIter->getName();
+    if (name.endsWith(".fomod")
+        || name.endsWith(".7z")
+        || name.endsWith(".rar")) {
+      QString tempFile = manager()->extractFile(name.toQString());
      IPluginInstaller::EInstallResult res = manager()->installArchive(modName, tempFile);
      if (res == IPluginInstaller::RESULT_SUCCESS) {
        res = IPluginInstaller::RESULT_SUCCESSCANCEL;
Author	SHA1	Message	Date
Tannin	d81a26aef0	post-merge cleanup	2015-06-08 19:55:00 +02:00
Tom Tanner	d2ee67f6a9	Addition of FileNameString clase which ignores case during compares. Affects rather a lot of stuff.	2015-06-06 15:56:44 +01:00
Tannin	4b1dd8fb81	Merge	2015-05-09 21:46:40 +02:00
Tannin	17c3bc3450	Merge in changes by Tom Tanner	2015-03-27 18:24:37 +01:00
Tom Tanner	8f9b8cf564	Fixed Scons build for existing bits. Changed pynedit.pro to fetch from 'standard' install location Changed saveas code to use organizer report rather than uibase - this way it's not dependant on the vagaries of the include path, and works the same as the rest of the organiser directory	2015-03-20 10:34:30 +00:00
Tom Tanner	6ef78cf305	Merge with branch1.2	2015-03-18 17:40:29 +00:00
Tom Tanner	729a2d2856	Refactoring and cleanup.	2015-03-18 14:16:04 +00:00
Tom Tanner	dc7d96ec8e	Every plugin now built	2015-03-17 16:31:15 +00:00
Tannin	6797d50370	Merge with branch1.2	2015-01-03 15:58:52 +01:00