Final eradication of igameinfo and adding python wrappers for IPluginGame

9 files changed, 1 insertions, 117 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 22b725de..8a2964d4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -61,7 +61,6 @@ SET(organizer_SRCS
     moapplication.cpp
     profileinputdialog.cpp
     icondelegate.cpp
-    gameinfoimpl.cpp
     csvbuilder.cpp
     savetextasdialog.cpp
     qtgroupingproxy.cpp
@@ -150,7 +149,6 @@ SET(organizer_HDRS
     moapplication.h
     profileinputdialog.h
     icondelegate.h
-    gameinfoimpl.h
     csvbuilder.h
     savetextasdialog.h
     qtgroupingproxy.h
diff --git a/src/gameinfoimpl.cpp b/src/gameinfoimpl.cpp
deleted file mode 100644
index 580ee02c..00000000
--- a/src/gameinfoimpl.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*

-Copyright (C) 2012 Sebastian Herbord. All rights reserved.

-

-This file is part of Mod Organizer.

-

-Mod Organizer is free software: you can redistribute it and/or modify

-it under the terms of the GNU General Public License as published by

-the Free Software Foundation, either version 3 of the License, or

-(at your option) any later version.

-

-Mod Organizer is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-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 "gameinfoimpl.h"

-#include <gameinfo.h>

-#include <utility.h>

-#include <QDir>

-

-

-using namespace MOBase;

-using namespace MOShared;

-

-

-GameInfoImpl::GameInfoImpl()

-{

-}

-

-/*

-IGameInfo::Type GameInfoImpl::type() const

-{

-  switch (GameInfo::instance().getType()) {

-    case GameInfo::TYPE_OBLIVION: return IGameInfo::TYPE_OBLIVION;

-    case GameInfo::TYPE_FALLOUT3: return IGameInfo::TYPE_FALLOUT3;

-    case GameInfo::TYPE_FALLOUTNV: return IGameInfo::TYPE_FALLOUTNV;

-    case GameInfo::TYPE_SKYRIM: return IGameInfo::TYPE_SKYRIM;

-    default: throw MyException(QObject::tr("invalid game type %1").arg(GameInfo::instance().getType()));

-  }

-}

-

-QString GameInfoImpl::path() const

-{

-  return QDir::fromNativeSeparators(ToQString(GameInfo::instance().getGameDirectory()));

-}

-

-QString GameInfoImpl::binaryName() const

-{

-  return ToQString(GameInfo::instance().getgetBinaryName());

-}

-*/

diff --git a/src/gameinfoimpl.h b/src/gameinfoimpl.h
deleted file mode 100644
index f3a21669..00000000
--- a/src/gameinfoimpl.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*

-Copyright (C) 2012 Sebastian Herbord. All rights reserved.

-

-This file is part of Mod Organizer.

-

-Mod Organizer is free software: you can redistribute it and/or modify

-it under the terms of the GNU General Public License as published by

-the Free Software Foundation, either version 3 of the License, or

-(at your option) any later version.

-

-Mod Organizer is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-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 GAMEINFOIMPL_H

-#define GAMEINFOIMPL_H

-

-

-#include <igameinfo.h>

-#include <QString>

-

-

-class GameInfoImpl : public MOBase::IGameInfo

-{

-public:

-  GameInfoImpl();

-

-//  virtual Type type() const;

-//  virtual QString path() const;

-//  virtual QString binaryName() const;

-

-};

-

-#endif // GAMEINFOIMPL_H

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 84a51b62..7142bcb1 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -52,7 +52,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "credentialsdialog.h"

 #include "selectiondialog.h"

 #include "csvbuilder.h"

-#include "gameinfoimpl.h"

 #include "savetextasdialog.h"

 #include "problemsdialog.h"

 #include "previewdialog.h"

diff --git a/src/organizer.pro b/src/organizer.pro
index 65c1e4d3..2869fda5 100644
--- a/src/organizer.pro
+++ b/src/organizer.pro
@@ -70,7 +70,6 @@ SOURCES += \
     moapplication.cpp \

     profileinputdialog.cpp \

     icondelegate.cpp \

-    gameinfoimpl.cpp \

     csvbuilder.cpp \

     savetextasdialog.cpp \

     qtgroupingproxy.cpp \

@@ -145,7 +144,6 @@ HEADERS  += \
     moapplication.h \

     profileinputdialog.h \

     icondelegate.h \

-    gameinfoimpl.h \

     csvbuilder.h \

     savetextasdialog.h \

     qtgroupingproxy.h \

diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index 704dc734..826d5bea 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -1,7 +1,6 @@
 #include "organizercore.h"

 

 #include "mainwindow.h"

-#include "gameinfoimpl.h"

 #include "messagedialog.h"

 #include "logbuffer.h"

 #include "credentialsdialog.h"

@@ -119,8 +118,7 @@ QStringList toStringList(InputIterator current, InputIterator end)
 

 

 OrganizerCore::OrganizerCore(const QSettings &initSettings)

-  : m_GameInfo(new GameInfoImpl())

-  , m_UserInterface(nullptr)

+  : m_UserInterface(nullptr)

   , m_PluginContainer(nullptr)

   , m_GameName()

   , m_CurrentProfile(nullptr)

@@ -187,7 +185,6 @@ OrganizerCore::~OrganizerCore()
   m_ModList.setProfile(nullptr);

   NexusInterface::instance()->cleanup();

 

-  delete m_GameInfo;

   delete m_DirectoryStructure;

 }

 

@@ -556,11 +553,6 @@ void OrganizerCore::setCurrentProfile(const QString &profileName)
   refreshDirectoryStructure();

 }

 

-MOBase::IGameInfo &OrganizerCore::gameInfo() const

-{

-  return *m_GameInfo;

-}

-

 MOBase::IModRepositoryBridge *OrganizerCore::createNexusBridge() const

 {

   return new NexusBridge();

diff --git a/src/organizercore.h b/src/organizercore.h
index 00cf6934..6075eb18 100644
--- a/src/organizercore.h
+++ b/src/organizercore.h
@@ -126,7 +126,6 @@ public:
   MOBase::DelayedFileWriter &pluginsWriter() { return m_PluginListsWriter; }

 

 public:

-  MOBase::IGameInfo &gameInfo() const;

   MOBase::IModRepositoryBridge *createNexusBridge() const;

   QString profileName() const;

   QString profilePath() const;

@@ -231,8 +230,6 @@ private:
 

 private:

 

-  MOBase::IGameInfo *m_GameInfo;

-

   IUserInterface *m_UserInterface;

   PluginContainer *m_PluginContainer;

   QString m_GameName;

diff --git a/src/organizerproxy.cpp b/src/organizerproxy.cpp
index 17c5a16f..3c103ff0 100644
--- a/src/organizerproxy.cpp
+++ b/src/organizerproxy.cpp
@@ -15,11 +15,6 @@ OrganizerProxy::OrganizerProxy(OrganizerCore *organizer, const QString &pluginNa
 {

 }

 

-IGameInfo &OrganizerProxy::gameInfo() const

-{

-  return m_Proxied->gameInfo();

-}

-

 IModRepositoryBridge *OrganizerProxy::createNexusBridge() const

 {

   return new NexusBridge(m_PluginName);

diff --git a/src/organizerproxy.h b/src/organizerproxy.h
index 31009c8a..2f5e0970 100644
--- a/src/organizerproxy.h
+++ b/src/organizerproxy.h
@@ -12,7 +12,6 @@ public:
 

   OrganizerProxy(OrganizerCore *organizer, const QString &pluginName);

 

-  virtual MOBase::IGameInfo &gameInfo() const;

   virtual MOBase::IModRepositoryBridge *createNexusBridge() const;

   virtual QString profileName() const;

   virtual QString profilePath() const;