diff options
| -rw-r--r-- | src/installationmanager.cpp | 10 | ||||
| -rw-r--r-- | src/installationmanager.h | 8 |
2 files changed, 2 insertions, 16 deletions
diff --git a/src/installationmanager.cpp b/src/installationmanager.cpp index 00f06af1..a60e60eb 100644 --- a/src/installationmanager.cpp +++ b/src/installationmanager.cpp @@ -125,12 +125,6 @@ void InstallationManager::setURL(QString const &url) m_URL = url; } -void InstallationManager::queryPassword(QString *password) -{ - *password = QInputDialog::getText(nullptr, tr("Password required"), - tr("Password"), QLineEdit::Password); -} - bool InstallationManager::extractFiles(QString extractPath, QString title, bool showFilenames) { QProgressDialog *installationProgress = new QProgressDialog(m_ParentWidget); @@ -630,8 +624,8 @@ IPluginInstaller::EInstallResult InstallationManager::install(const QString &fil // open the archive and construct the directory tree the installers work on bool archiveOpen = m_ArchiveHandler->open( fileName.toStdWString(), [this]() { - QString password; - queryPassword(&password); + QString password = QInputDialog::getText(m_ParentWidget, tr("Password required"), + tr("Password"), QLineEdit::Password); return password.toStdWString(); }); if (!archiveOpen) { diff --git a/src/installationmanager.h b/src/installationmanager.h index 3d0dd35f..67e58356 100644 --- a/src/installationmanager.h +++ b/src/installationmanager.h @@ -189,14 +189,6 @@ public: private: - void queryPassword(QString *password); - void updateProgress(float percentage); - void updateProgressFile(const QString &fileName); - void report7ZipError(const QString &errorMessage); - - // Recursive worker function for mapToArchive (takes raw reference for "speed"). - bool unpackSingleFile(const QString &fileName); - MOBase::IPluginInstaller::EInstallResult doInstall(MOBase::GuessedValue<QString> &modName, QString gameName, int modID, const QString &version, const QString &newestVersion, int categoryID, int fileCategoryID, const QString &repository); |