From 2fb491711188d413f65bdd8193644d25ae03c2c2 Mon Sep 17 00:00:00 2001 From: Thomas Tanner Date: Sun, 27 Sep 2015 13:29:04 +0100 Subject: Changes to go with cleaned up archive library --- src/installationmanager.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/installationmanager.h') diff --git a/src/installationmanager.h b/src/installationmanager.h index d4b4f7dc..d73f4653 100644 --- a/src/installationmanager.h +++ b/src/installationmanager.h @@ -147,12 +147,10 @@ public: private: - void queryPassword(LPSTR password); + void queryPassword(QString *password); void updateProgress(float percentage); - void updateProgressFile(LPCWSTR fileName); - void report7ZipError(LPCWSTR errorMessage); - - void dummyProgressFile(LPCWSTR) {} + void updateProgressFile(const QString &fileName); + void report7ZipError(const QString &errorMessage); MOBase::DirectoryTree *createFilesTree(); @@ -161,7 +159,7 @@ private: void mapToArchive(const MOBase::DirectoryTree::Node *baseNode); // recursive worker function for mapToArchive - void mapToArchive(const MOBase::DirectoryTree::Node *node, std::wstring path, FileData * const *data); + void mapToArchive(const MOBase::DirectoryTree::Node *node, QString path, FileData * const *data); bool unpackSingleFile(const QString &fileName); @@ -205,7 +203,7 @@ private: std::vector m_Installers; std::set m_SupportedExtensions; - Archive *m_CurrentArchive; + Archive *m_ArchiveHandler; QString m_CurrentFile; QProgressDialog m_InstallationProgress; -- cgit v1.3.1