Compare commits

..
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
+9 -9
View File
@@ -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;