- moved shared and uibase libraries to namespaces

- bugfix: the "fix mods" function was accessing the save game data incorrectly, causing a crash

1 files changed, 126 insertions, 126 deletions

diff --git a/src/selfupdater.h b/src/selfupdater.h
index 3a92b769..2c4c1ecd 100644
--- a/src/selfupdater.h
+++ b/src/selfupdater.h
@@ -17,129 +17,129 @@ You should have received a copy of the GNU General Public License
 along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef SELFUPDATER_H

-#define SELFUPDATER_H

-

-

-#include "nexusinterface.h"

-#include <archive.h>

-#include <versioninfo.h>

-

-#include <QObject>

-#include <QNetworkReply>

-#include <QFile>

-#include <QProgressDialog>

-

-

-/**

- * @brief manages updates for Mod Organizer itself

- * This class is used to update the Mod Organizer

- * The process looks like this:

- * 1. call testForUpdate() to determine is available

- * 2. if the updateAvailable() signal is received, allow the user to start the update

- * 3. if the user start the update, call startUpdate()

- * 4. startUpdate() will first query a list of files, try to determine if there is an 

- *    incremental update. If not, the user will have to confirm the download of a full download.

- *    Once the correct file is selected, it is downloaded.

- * 5. before the downloaded file is extracted, existing files that are going to be replaced are

- *    moved to "update_backup" on because files that are currently open can't be replaced.

- * 6. the update is extracted and then deleted

- * 7. finally, a restart is requested via signal.

- * 8. at restart, Mod Organizer will remove the update_backup directory since none of the files

- *    should now be open

- * 

- * @todo use NexusBridge

- **/

-class SelfUpdater : public QObject

-{

-

-  Q_OBJECT

-

-public:

-

-  /**

-   * @brief constructor

-   *

-   * @param nexusInterface interface to query information from nexus

-   * @param parent parent widget

-   * @todo passing the nexus interface is unneccessary

-   **/

-  SelfUpdater(NexusInterface *nexusInterface, QWidget *parent);

-  ~SelfUpdater();

-

-  /**

-   * @brief start the update process

-   * @note this should not be called if there is no update available

-   **/

-  void startUpdate();

-

-  /**

-   * @return current version of Mod Organizer

-   **/

-  VersionInfo getVersion() const { return m_MOVersion; }

-

-public slots:

-

-  /**

-   * @brief request information about the current version

-   **/

-  void testForUpdate();

-

-  void nxmDescriptionAvailable(int modID, QVariant userData, QVariant resultData, int requestID);

-  void nxmFilesAvailable(int modID, QVariant userData, QVariant resultData, int requestID);

-  void nxmRequestFailed(int modID, QVariant userData, int requestID, const QString &errorMessage);

-  void nxmDownloadURLsAvailable(int modID, int fileID, QVariant userData, QVariant resultData, int requestID);

-

-signals:

-

-  /**

-   * @brief emitted if a restart of the client is necessary to complete the update

-   **/

-  void restart();

-

-  /**

-   * @brief emitted if an update is available

-   **/

-  void updateAvailable();

-

-  /**

-   * @brief emitted if a message of the day was received

-   **/

-  void motdAvailable(const QString &motd);

-

-private:

-

-  void download(const QString &downloadLink, const QString &fileName);

-  void installUpdate();

-  void queryPassword(LPSTR password);

-  void updateProgress(float percentage);

-  void updateProgressFile(LPCWSTR fileName);

-  void report7ZipError(LPCWSTR errorMessage);

-  QString retrieveNews(const QString &description);

-

-private slots:

-

-  void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);

-  void downloadReadyRead();

-  void downloadFinished();

-  void downloadCancel();

-

-private:

-

-  QWidget *m_Parent;

-  VersionInfo m_MOVersion;

-  NexusInterface *m_Interface;

-  int m_UpdateRequestID;

-  QString m_NewestVersion;

-  QFile m_UpdateFile;

-  QNetworkReply *m_Reply;

-  QProgressDialog m_Progress;

-  bool m_Canceled;

-  int m_Attempts;

-

-  Archive *m_CurrentArchive;

-

-};

-

-

-#endif // SELFUPDATER_H

+#ifndef SELFUPDATER_H
+#define SELFUPDATER_H
+
+
+#include "nexusinterface.h"
+#include <archive.h>
+#include <versioninfo.h>
+
+#include <QObject>
+#include <QNetworkReply>
+#include <QFile>
+#include <QProgressDialog>
+
+
+/**
+ * @brief manages updates for Mod Organizer itself
+ * This class is used to update the Mod Organizer
+ * The process looks like this:
+ * 1. call testForUpdate() to determine is available
+ * 2. if the updateAvailable() signal is received, allow the user to start the update
+ * 3. if the user start the update, call startUpdate()
+ * 4. startUpdate() will first query a list of files, try to determine if there is an 
+ *    incremental update. If not, the user will have to confirm the download of a full download.
+ *    Once the correct file is selected, it is downloaded.
+ * 5. before the downloaded file is extracted, existing files that are going to be replaced are
+ *    moved to "update_backup" on because files that are currently open can't be replaced.
+ * 6. the update is extracted and then deleted
+ * 7. finally, a restart is requested via signal.
+ * 8. at restart, Mod Organizer will remove the update_backup directory since none of the files
+ *    should now be open
+ * 
+ * @todo use NexusBridge
+ **/
+class SelfUpdater : public QObject
+{
+
+  Q_OBJECT
+
+public:
+
+  /**
+   * @brief constructor
+   *
+   * @param nexusInterface interface to query information from nexus
+   * @param parent parent widget
+   * @todo passing the nexus interface is unneccessary
+   **/
+  SelfUpdater(NexusInterface *nexusInterface, QWidget *parent);
+  ~SelfUpdater();
+
+  /**
+   * @brief start the update process
+   * @note this should not be called if there is no update available
+   **/
+  void startUpdate();
+
+  /**
+   * @return current version of Mod Organizer
+   **/
+  MOBase::VersionInfo getVersion() const { return m_MOVersion; }
+
+public slots:
+
+  /**
+   * @brief request information about the current version
+   **/
+  void testForUpdate();
+
+  void nxmDescriptionAvailable(int modID, QVariant userData, QVariant resultData, int requestID);
+  void nxmFilesAvailable(int modID, QVariant userData, QVariant resultData, int requestID);
+  void nxmRequestFailed(int modID, QVariant userData, int requestID, const QString &errorMessage);
+  void nxmDownloadURLsAvailable(int modID, int fileID, QVariant userData, QVariant resultData, int requestID);
+
+signals:
+
+  /**
+   * @brief emitted if a restart of the client is necessary to complete the update
+   **/
+  void restart();
+
+  /**
+   * @brief emitted if an update is available
+   **/
+  void updateAvailable();
+
+  /**
+   * @brief emitted if a message of the day was received
+   **/
+  void motdAvailable(const QString &motd);
+
+private:
+
+  void download(const QString &downloadLink, const QString &fileName);
+  void installUpdate();
+  void queryPassword(LPSTR password);
+  void updateProgress(float percentage);
+  void updateProgressFile(LPCWSTR fileName);
+  void report7ZipError(LPCWSTR errorMessage);
+  QString retrieveNews(const QString &description);
+
+private slots:
+
+  void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
+  void downloadReadyRead();
+  void downloadFinished();
+  void downloadCancel();
+
+private:
+
+  QWidget *m_Parent;
+  MOBase::VersionInfo m_MOVersion;
+  NexusInterface *m_Interface;
+  int m_UpdateRequestID;
+  QString m_NewestVersion;
+  QFile m_UpdateFile;
+  QNetworkReply *m_Reply;
+  QProgressDialog m_Progress;
+  bool m_Canceled;
+  int m_Attempts;
+
+  Archive *m_CurrentArchive;
+
+};
+
+
+#endif // SELFUPDATER_H