diff options
| author | Tannin <devnull@localhost> | 2015-08-09 17:11:18 +0200 |
|---|---|---|
| committer | Tannin <devnull@localhost> | 2015-08-09 17:11:18 +0200 |
| commit | b6627ff5e08063a2aeb035adfb6f1e973ad45dc5 (patch) | |
| tree | e36c27f6fa128d93135bbabf48b815855dbfeed2 | |
| parent | a7d6eb75c20d185c45a0bff309c68e1efaae990e (diff) | |
small code cleanup
| -rw-r--r-- | src/selfupdater.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/selfupdater.cpp b/src/selfupdater.cpp index 9c151746..ed34bfc2 100644 --- a/src/selfupdater.cpp +++ b/src/selfupdater.cpp @@ -234,7 +234,7 @@ void SelfUpdater::installUpdate() {
const QString mopath = QDir::fromNativeSeparators(ToQString(GameInfo::instance().getOrganizerDirectory()));
- QString backupPath = mopath.mid(0).append("/update_backup");
+ QString backupPath = mopath + "/update_backup";
QDir().mkdir(backupPath);
// rename files that are currently open so we can unpack the update
@@ -259,10 +259,10 @@ void SelfUpdater::installUpdate() } else if (outputName != "ModOrganizer") {
data[i]->addOutputFileName(ToWString(outputName).c_str());
}
- QFileInfo file(mopath.mid(0).append("/").append(outputName));
+ QFileInfo file(mopath + "/" + outputName);
if (file.exists() && file.isFile()) {
- if (!shellMove(QStringList(mopath.mid(0).append("/").append(outputName)),
- QStringList(backupPath.mid(0).append("/").append(outputName)))) {
+ if (!shellMove(QStringList(mopath + "/" + outputName),
+ QStringList(backupPath + "/" + outputName))) {
reportError(tr("failed to move outdated files: %1. Please update manually.").arg(windowsErrorString(::GetLastError())));
return;
}
@@ -284,10 +284,10 @@ void SelfUpdater::installUpdate() QMessageBox::information(m_Parent, tr("Update"), tr("Update installed, Mod Organizer will now be restarted."));
QProcess newProcess;
- if (QFile::exists(mopath.mid(0).append("/ModOrganizer.exe"))) {
- newProcess.startDetached(mopath.mid(0).append("/ModOrganizer.exe"), QStringList("update"));
+ if (QFile::exists(mopath + "/ModOrganizer.exe")) {
+ newProcess.startDetached(mopath + "/ModOrganizer.exe", QStringList("update"));
} else {
- newProcess.startDetached(mopath.mid(0).append("/ModOrganiser.exe"), QStringList("update"));
+ newProcess.startDetached(mopath + "/ModOrganiser.exe", QStringList("update"));
}
emit restart();
}
@@ -378,7 +378,7 @@ void SelfUpdater::nxmFilesAvailable(int, QVariant userData, QVariant resultData, QString mainFileName;
int mainFileSize = 0;
- foreach(QVariant file, result) {
+ for(QVariant file : result) {
QVariantMap fileInfo = file.toMap();
if (!fileInfo["uri"].toString().endsWith(".7z")) {
continue;
|
