Merge pull request #3 from ThosRTanner/archive_cleanup

Refactoring archive library (Part 3)

1 files changed, 5 insertions, 7 deletions

diff --git a/src/installationmanager.h b/src/installationmanager.h
index 111b41f5..5a8ec9d2 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<MOBase::IPluginInstaller*> m_Installers;

   std::set<QString, CaseInsensitive> m_SupportedExtensions;

 

-  Archive *m_CurrentArchive;

+  Archive *m_ArchiveHandler;

   QString m_CurrentFile;

 

   QProgressDialog *m_InstallationProgress { nullptr };