- 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, 138 insertions, 134 deletions

diff --git a/src/nxmaccessmanager.cpp b/src/nxmaccessmanager.cpp
index 55fcf0f7..0f9f0209 100644
--- a/src/nxmaccessmanager.cpp
+++ b/src/nxmaccessmanager.cpp
@@ -17,137 +17,141 @@ You should have received a copy of the GNU General Public License
 along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "nxmaccessmanager.h"

-#include "nxmurl.h"

-#include "report.h"

-#include "utility.h"

-#include "selfupdater.h"

-#include <QMessageBox>

-#include <QNetworkProxy>

-#include <QNetworkRequest>

-#include <QNetworkCookie>

-#include <QNetworkCookieJar>

-#include <gameinfo.h>

-

-

-NXMAccessManager::NXMAccessManager(QObject *parent)

-  : QNetworkAccessManager(parent), m_LoginReply(NULL)

-{

-}

-

-

-QNetworkReply *NXMAccessManager::createRequest(

-    QNetworkAccessManager::Operation operation, const QNetworkRequest &request,

-    QIODevice *device)

-{

-  if (request.url().scheme() != "nxm") {

-    return QNetworkAccessManager::createRequest(operation, request, device);

-  }

-  if (operation == GetOperation) {

-    emit requestNXMDownload(request.url().toString());

-

-    // eat the request, everything else will be done by the download manager

-    return QNetworkAccessManager::createRequest(QNetworkAccessManager::GetOperation,

-                                                QNetworkRequest(QUrl()));

-  } else if (operation == PostOperation) {

-    return QNetworkAccessManager::createRequest(operation, request, device);;

-  } else {

-    return QNetworkAccessManager::createRequest(operation, request, device);

-  }

-}

-

-

-void NXMAccessManager::showCookies()

-{

-  QList<QNetworkCookie> cookies = cookieJar()->cookiesForUrl(QUrl(ToQString(GameInfo::instance().getNexusPage())));

-  foreach (QNetworkCookie cookie, cookies) {

-    qDebug("%s - %s", cookie.name().constData(), cookie.value().constData());

-  }

-}

-

-

-bool NXMAccessManager::loggedIn() const

-{

-  return hasLoginCookies();

-}

-

-

-void NXMAccessManager::login(const QString &username, const QString &password)

-{

-  if (m_LoginReply != NULL) {

-    return;

-  }

-

-  if (hasLoginCookies()) {

-    emit loginSuccessful(false);

-    return;

-  }

-

-  m_Username = username;

-  m_Password = password;

-  pageLogin();

-}

-

-

-void NXMAccessManager::pageLogin()

-{

-  QString requestString = QString("http://gatekeeper.nexusmods.com/Sessions/?Login&username=%2&password=%3").arg(m_Username).arg(m_Password);

-

-  QNetworkRequest request(requestString);

-  m_LoginReply = get(request);

-

-  m_LoginTimeout.start();

-  connect(m_LoginReply, SIGNAL(finished()), this, SLOT(loginFinished()));

-  connect(m_LoginReply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(loginError(QNetworkReply::NetworkError)));

-}

-

-

-void NXMAccessManager::loginTimeout()

-{

-  emit loginFailed(tr("timeout"));

-  m_LoginReply->deleteLater();

-  m_LoginReply = NULL;

-  m_LoginTimeout.stop();

-  m_Username.clear();

-  m_Password.clear();

-}

-

-

-void NXMAccessManager::loginError(QNetworkReply::NetworkError)

-{

-  emit loginFailed(m_LoginReply->errorString());

-  m_LoginTimeout.stop();

-  m_LoginReply->deleteLater();

-  m_LoginReply = NULL;

-  m_Username.clear();

-  m_Password.clear();

-}

-

-

-bool NXMAccessManager::hasLoginCookies() const

-{

-  bool sidCookie = false;

-  QList<QNetworkCookie> cookies = cookieJar()->cookiesForUrl(QUrl(ToQString(GameInfo::instance().getNexusPage())));

-  foreach (QNetworkCookie cookie, cookies) {

-    if (cookie.name() == "sid") {

-      sidCookie = true;

-    }

-  }

-  return sidCookie;

-}

-

-

-void NXMAccessManager::loginFinished()

-{

-  if (hasLoginCookies()) {

-    emit loginSuccessful(true);

-  } else {

-    emit loginFailed(tr("Please check your password"));

-  }

-

-  m_LoginTimeout.stop();

-  m_LoginReply->deleteLater();

-  m_LoginReply = NULL;

-  m_Username.clear();

-  m_Password.clear();

-}

+#include "nxmaccessmanager.h"
+#include "nxmurl.h"
+#include "report.h"
+#include "utility.h"
+#include "selfupdater.h"
+#include <QMessageBox>
+#include <QNetworkProxy>
+#include <QNetworkRequest>
+#include <QNetworkCookie>
+#include <QNetworkCookieJar>
+#include <gameinfo.h>
+
+
+using namespace MOBase;
+using namespace MOShared;
+
+
+NXMAccessManager::NXMAccessManager(QObject *parent)
+  : QNetworkAccessManager(parent), m_LoginReply(NULL)
+{
+}
+
+
+QNetworkReply *NXMAccessManager::createRequest(
+    QNetworkAccessManager::Operation operation, const QNetworkRequest &request,
+    QIODevice *device)
+{
+  if (request.url().scheme() != "nxm") {
+    return QNetworkAccessManager::createRequest(operation, request, device);
+  }
+  if (operation == GetOperation) {
+    emit requestNXMDownload(request.url().toString());
+
+    // eat the request, everything else will be done by the download manager
+    return QNetworkAccessManager::createRequest(QNetworkAccessManager::GetOperation,
+                                                QNetworkRequest(QUrl()));
+  } else if (operation == PostOperation) {
+    return QNetworkAccessManager::createRequest(operation, request, device);;
+  } else {
+    return QNetworkAccessManager::createRequest(operation, request, device);
+  }
+}
+
+
+void NXMAccessManager::showCookies()
+{
+  QList<QNetworkCookie> cookies = cookieJar()->cookiesForUrl(QUrl(ToQString(GameInfo::instance().getNexusPage())));
+  foreach (QNetworkCookie cookie, cookies) {
+    qDebug("%s - %s", cookie.name().constData(), cookie.value().constData());
+  }
+}
+
+
+bool NXMAccessManager::loggedIn() const
+{
+  return hasLoginCookies();
+}
+
+
+void NXMAccessManager::login(const QString &username, const QString &password)
+{
+  if (m_LoginReply != NULL) {
+    return;
+  }
+
+  if (hasLoginCookies()) {
+    emit loginSuccessful(false);
+    return;
+  }
+
+  m_Username = username;
+  m_Password = password;
+  pageLogin();
+}
+
+
+void NXMAccessManager::pageLogin()
+{
+  QString requestString = QString("http://gatekeeper.nexusmods.com/Sessions/?Login&username=%2&password=%3").arg(m_Username).arg(m_Password);
+
+  QNetworkRequest request(requestString);
+  m_LoginReply = get(request);
+
+  m_LoginTimeout.start();
+  connect(m_LoginReply, SIGNAL(finished()), this, SLOT(loginFinished()));
+  connect(m_LoginReply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(loginError(QNetworkReply::NetworkError)));
+}
+
+
+void NXMAccessManager::loginTimeout()
+{
+  emit loginFailed(tr("timeout"));
+  m_LoginReply->deleteLater();
+  m_LoginReply = NULL;
+  m_LoginTimeout.stop();
+  m_Username.clear();
+  m_Password.clear();
+}
+
+
+void NXMAccessManager::loginError(QNetworkReply::NetworkError)
+{
+  emit loginFailed(m_LoginReply->errorString());
+  m_LoginTimeout.stop();
+  m_LoginReply->deleteLater();
+  m_LoginReply = NULL;
+  m_Username.clear();
+  m_Password.clear();
+}
+
+
+bool NXMAccessManager::hasLoginCookies() const
+{
+  bool sidCookie = false;
+  QList<QNetworkCookie> cookies = cookieJar()->cookiesForUrl(QUrl(ToQString(GameInfo::instance().getNexusPage())));
+  foreach (QNetworkCookie cookie, cookies) {
+    if (cookie.name() == "sid") {
+      sidCookie = true;
+    }
+  }
+  return sidCookie;
+}
+
+
+void NXMAccessManager::loginFinished()
+{
+  if (hasLoginCookies()) {
+    emit loginSuccessful(true);
+  } else {
+    emit loginFailed(tr("Please check your password"));
+  }
+
+  m_LoginTimeout.stop();
+  m_LoginReply->deleteLater();
+  m_LoginReply = NULL;
+  m_Username.clear();
+  m_Password.clear();
+}