- 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, 61 insertions, 61 deletions

diff --git a/src/moapplication.cpp b/src/moapplication.cpp
index aaae77c0..efb0b615 100644
--- a/src/moapplication.cpp
+++ b/src/moapplication.cpp
@@ -17,64 +17,64 @@ 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 "moapplication.h"

-#include "report.h"

-#include "utility.h"

-#include <appconfig.h>

-#include <QFile>

-#include <QStringList>

-

-

-MOApplication::MOApplication(int argc, char **argv)

-  : QApplication(argc, argv)

-{

-  connect(&m_StyleWatcher, SIGNAL(fileChanged(QString)), SLOT(updateStyle(QString)));

-}

-

-

-void MOApplication::setStyleFile(const QString &styleName)

-{

-  // remove all files from watch

-  QStringList currentWatch = m_StyleWatcher.files();

-  if (currentWatch.count() != 0) {

-    m_StyleWatcher.removePaths(currentWatch);

-  }

-  // set new stylesheet or clear it

-  if (styleName.length() != 0) {

-    QString styleSheetName = applicationDirPath() + "/" + ToQString(AppConfig::stylesheetsPath()) + "/" + styleName;

-    m_StyleWatcher.addPath(styleSheetName);

-    updateStyle(styleSheetName);

-  } else {

-    setStyleSheet("");

-  }

-}

-

-

-bool MOApplication::notify(QObject *receiver, QEvent *event)

-{

-  try {

-    return QApplication::notify(receiver, event);

-  } catch (const std::exception &e) {

-    qCritical("uncaught exception in handler (object %s, eventtype %d): %s",

-              receiver->objectName().toUtf8().constData(), event->type(), e.what());

-    reportError(tr("an error occured: %1").arg(e.what()));

-    return false;

-  } catch (...) {

-    qCritical("uncaught non-std exception in handler (object %s, eventtype %d)",

-              receiver->objectName().toUtf8().constData(), event->type());

-    reportError(tr("an error occured"));

-    return false;

-  }

-}

-

-

-void MOApplication::updateStyle(const QString &fileName)

-{

-  QFile file(fileName);

-  if (file.open(QFile::ReadOnly)) {

-    setStyleSheet(file.readAll());

-  } else {

-    qDebug("no stylesheet");

-  }

-  file.close();

-}

+#include "moapplication.h"
+#include "report.h"
+#include "utility.h"
+#include <appconfig.h>
+#include <QFile>
+#include <QStringList>
+
+
+MOApplication::MOApplication(int argc, char **argv)
+  : QApplication(argc, argv)
+{
+  connect(&m_StyleWatcher, SIGNAL(fileChanged(QString)), SLOT(updateStyle(QString)));
+}
+
+
+void MOApplication::setStyleFile(const QString &styleName)
+{
+  // remove all files from watch
+  QStringList currentWatch = m_StyleWatcher.files();
+  if (currentWatch.count() != 0) {
+    m_StyleWatcher.removePaths(currentWatch);
+  }
+  // set new stylesheet or clear it
+  if (styleName.length() != 0) {
+    QString styleSheetName = applicationDirPath() + "/" + MOBase::ToQString(AppConfig::stylesheetsPath()) + "/" + styleName;
+    m_StyleWatcher.addPath(styleSheetName);
+    updateStyle(styleSheetName);
+  } else {
+    setStyleSheet("");
+  }
+}
+
+
+bool MOApplication::notify(QObject *receiver, QEvent *event)
+{
+  try {
+    return QApplication::notify(receiver, event);
+  } catch (const std::exception &e) {
+    qCritical("uncaught exception in handler (object %s, eventtype %d): %s",
+              receiver->objectName().toUtf8().constData(), event->type(), e.what());
+    reportError(tr("an error occured: %1").arg(e.what()));
+    return false;
+  } catch (...) {
+    qCritical("uncaught non-std exception in handler (object %s, eventtype %d)",
+              receiver->objectName().toUtf8().constData(), event->type());
+    reportError(tr("an error occured"));
+    return false;
+  }
+}
+
+
+void MOApplication::updateStyle(const QString &fileName)
+{
+  QFile file(fileName);
+  if (file.open(QFile::ReadOnly)) {
+    setStyleSheet(file.readAll());
+  } else {
+    qDebug("no stylesheet");
+  }
+  file.close();
+}