- 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, 34 insertions, 30 deletions

diff --git a/src/report.cpp b/src/report.cpp
index 6b379a1f..ca7e1dc9 100644
--- a/src/report.cpp
+++ b/src/report.cpp
@@ -17,33 +17,37 @@ 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 "report.h"

-#include "utility.h"

-#include <QMessageBox>

-#include <QApplication>

-#include <Windows.h>

-

-void reportError(QString message)

-{

-  if (QApplication::topLevelWidgets().count() != 0) {

-    QMessageBox messageBox(QMessageBox::Warning, QObject::tr("Error"), message, QMessageBox::Ok);

-    messageBox.exec();

-  } else {

-    ::MessageBoxW(NULL, ToWString(message).c_str(), ToWString(QObject::tr("Error")).c_str(), MB_ICONERROR | MB_OK);

-  }

-}

-

-

-std::tstring toTString(const QString& source)

-{

-#ifdef UNICODE

-  wchar_t* temp = new wchar_t[source.size() + 1];

-  source.toWCharArray(temp);

-  temp[source.size()] = '\0';

-  std::tstring result(temp);

-  delete[] temp;

-  return result;

-#else // UNICODE

-  return source.toAscii();

-#endif // UNICODE

-}

+#include "report.h"
+#include "utility.h"
+#include <QMessageBox>
+#include <QApplication>
+#include <Windows.h>
+
+
+using namespace MOBase;
+
+
+void reportError(QString message)
+{
+  if (QApplication::topLevelWidgets().count() != 0) {
+    QMessageBox messageBox(QMessageBox::Warning, QObject::tr("Error"), message, QMessageBox::Ok);
+    messageBox.exec();
+  } else {
+    ::MessageBoxW(NULL, ToWString(message).c_str(), ToWString(QObject::tr("Error")).c_str(), MB_ICONERROR | MB_OK);
+  }
+}
+
+
+std::tstring toTString(const QString& source)
+{
+#ifdef UNICODE
+  wchar_t* temp = new wchar_t[source.size() + 1];
+  source.toWCharArray(temp);
+  temp[source.size()] = '\0';
+  std::tstring result(temp);
+  delete[] temp;
+  return result;
+#else // UNICODE
+  return source.toAscii();
+#endif // UNICODE
+}