From bdfd41a8621cec48bcd8da61f361269a641cdbb1 Mon Sep 17 00:00:00 2001 From: Tannin Date: Thu, 29 Jan 2015 19:30:10 +0100 Subject: cleanup --- src/modinfo.h | 2 +- src/transfersavesdialog.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modinfo.h b/src/modinfo.h index 903f474a..9a4c7c94 100644 --- a/src/modinfo.h +++ b/src/modinfo.h @@ -1087,7 +1087,7 @@ public: virtual void endorse(bool) {} virtual bool isEmpty() const { return false; } virtual QString name() const; - virtual QString internalName() const { return name() + INT_IDENTIFIER; } + virtual QString internalName() const { return name(); } virtual QString notes() const { return ""; } virtual QDateTime creationTime() const; virtual QString absolutePath() const; diff --git a/src/transfersavesdialog.cpp b/src/transfersavesdialog.cpp index 79c2f55a..c37f0cd0 100644 --- a/src/transfersavesdialog.cpp +++ b/src/transfersavesdialog.cpp @@ -75,7 +75,7 @@ void TransferSavesDialog::refreshLocalSaves() { m_LocalSaves.clear(); - QDir savesDir(m_Profile.getPath() + "/saves"); + QDir savesDir(m_Profile.absolutePath() + "/saves"); QStringList filters; filters << m_GamePlugin->savegameExtension(); @@ -161,7 +161,7 @@ void TransferSavesDialog::on_moveToLocalBtn_clicked() if (QMessageBox::question(this, tr("Confirm"), tr("Copy all save games of character \"%1\" to the profile?").arg(selectedCharacter), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) { - QString destination = m_Profile.getPath().append("/saves"); + QString destination = m_Profile.absolutePath() + "/saves"; OverwriteMode overwriteMode = OVERWRITE_ASK; for (std::vector::const_iterator iter = m_GlobalSaves.begin(); @@ -170,7 +170,7 @@ void TransferSavesDialog::on_moveToLocalBtn_clicked() QStringList files = (*iter)->saveFiles(); foreach (const QString &file, files) { QFileInfo fileInfo(file); - QString destinationFile = destination.mid(0).append("/").append(fileInfo.fileName()); + QString destinationFile = destination + "/" + fileInfo.fileName(); if (QFile::exists(destinationFile)) { if (testOverwrite(overwriteMode, destinationFile)) { QFile::remove(destinationFile); @@ -199,7 +199,7 @@ void TransferSavesDialog::on_copyToLocalBtn_clicked() if (QMessageBox::question(this, tr("Confirm"), tr("Copy all save games of character \"%1\" to the profile?").arg(selectedCharacter), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) { - QString destination = m_Profile.getPath().append("/saves"); + QString destination = m_Profile.absolutePath() + "/saves"; OverwriteMode overwriteMode = OVERWRITE_ASK; for (std::vector::const_iterator iter = m_GlobalSaves.begin(); iter != m_GlobalSaves.end(); ++iter) { @@ -207,7 +207,7 @@ void TransferSavesDialog::on_copyToLocalBtn_clicked() QStringList files = (*iter)->saveFiles(); foreach (const QString &file, files) { QFileInfo fileInfo(file); - QString destinationFile = destination.mid(0).append("/").append(fileInfo.fileName()); + QString destinationFile = destination + "/" + fileInfo.fileName(); if (QFile::exists(destinationFile)) { if (testOverwrite(overwriteMode, destinationFile)) { QFile::remove(destinationFile); -- cgit v1.3.1