diff options
| author | Thomas Tanner <trtanner@btinternet.com> | 2015-12-06 15:47:40 +0000 |
|---|---|---|
| committer | Thomas Tanner <trtanner@btinternet.com> | 2015-12-06 15:49:56 +0000 |
| commit | 750239bebb992ee673f39da98f413ab0f2e1f002 (patch) | |
| tree | 4fc3a4f2c56a41d750baab84c392eec09fe6f75f /src/executableslist.cpp | |
| parent | cb09ace972731ecc9b0fb653b88d4c599f4530fc (diff) | |
| parent | 865c75a499fe2319ed07e36d8d5d987032058882 (diff) | |
Merge branch 'master' into issue/344
# Conflicts:
# src/gameinfoimpl.cpp
# src/gameinfoimpl.h
# src/shared/fallout3info.h
# src/shared/falloutnvinfo.h
# src/shared/gameinfo.h
# src/shared/oblivioninfo.h
# src/shared/skyriminfo.h
Diffstat (limited to 'src/executableslist.cpp')
| -rw-r--r-- | src/executableslist.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/executableslist.cpp b/src/executableslist.cpp index 12e3d7aa..a4511ade 100644 --- a/src/executableslist.cpp +++ b/src/executableslist.cpp @@ -18,16 +18,18 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>. */
#include "executableslist.h"
-#include <gameinfo.h>
+
+#include "iplugingame.h"
+#include "utility.h"
+
#include <QFileInfo>
#include <QDir>
#include <QDebug>
-#include "utility.h"
+
#include <algorithm>
using namespace MOBase;
-using namespace MOShared;
ExecutablesList::ExecutablesList()
@@ -38,7 +40,7 @@ ExecutablesList::~ExecutablesList() {
}
-void ExecutablesList::init(IPluginGame *game)
+void ExecutablesList::init(IPluginGame const *game)
{
Q_ASSERT(game != nullptr);
m_Executables.clear();
|