summaryrefslogtreecommitdiffstats
path: root/logic
diff options
context:
space:
mode:
Diffstat (limited to 'logic')
-rw-r--r--logic/BaseInstaller.h2
-rw-r--r--logic/BaseVersionList.h3
-rw-r--r--logic/InstanceFactory.h2
-rw-r--r--logic/VersionFilterData.cpp2
-rw-r--r--logic/assets/AssetsUtils.h2
-rw-r--r--logic/forge/ForgeInstaller.h2
-rw-r--r--logic/minecraft/VersionFile.h2
7 files changed, 8 insertions, 7 deletions
diff --git a/logic/BaseInstaller.h b/logic/BaseInstaller.h
index 9531fbff..d89ab7c2 100644
--- a/logic/BaseInstaller.h
+++ b/logic/BaseInstaller.h
@@ -22,7 +22,7 @@ class QDir;
class QString;
class QObject;
class ProgressProvider;
-class BaseVersion;
+struct BaseVersion;
typedef std::shared_ptr<BaseVersion> BaseVersionPtr;
class BaseInstaller
diff --git a/logic/BaseVersionList.h b/logic/BaseVersionList.h
index 21b44e8d..f903b52c 100644
--- a/logic/BaseVersionList.h
+++ b/logic/BaseVersionList.h
@@ -100,7 +100,10 @@ public:
/*!
* Sorts the version list.
*/
+ #pragma clang diagnostic push
+ #pragma clang diagnostic ignored "-Woverloaded-virtual"
virtual void sort() = 0;
+ #pragma clang diagnostic pop
protected
slots:
diff --git a/logic/InstanceFactory.h b/logic/InstanceFactory.h
index 96e2375e..32a31080 100644
--- a/logic/InstanceFactory.h
+++ b/logic/InstanceFactory.h
@@ -22,7 +22,7 @@
#include "BaseVersion.h"
#include "BaseInstance.h"
-class BaseVersion;
+struct BaseVersion;
class BaseInstance;
/*!
diff --git a/logic/VersionFilterData.cpp b/logic/VersionFilterData.cpp
index 8b521266..e8523018 100644
--- a/logic/VersionFilterData.cpp
+++ b/logic/VersionFilterData.cpp
@@ -1,7 +1,7 @@
#include "VersionFilterData.h"
#include "minecraft/ParseUtils.h"
-extern VersionFilterData g_VersionFilterData = VersionFilterData();
+VersionFilterData g_VersionFilterData = VersionFilterData();
VersionFilterData::VersionFilterData()
{
diff --git a/logic/assets/AssetsUtils.h b/logic/assets/AssetsUtils.h
index aaacc2db..5735afd0 100644
--- a/logic/assets/AssetsUtils.h
+++ b/logic/assets/AssetsUtils.h
@@ -18,8 +18,6 @@
#include <QString>
#include <QMap>
-class AssetObject;
-
struct AssetObject
{
QString hash;
diff --git a/logic/forge/ForgeInstaller.h b/logic/forge/ForgeInstaller.h
index 14aeeb51..1c7452d7 100644
--- a/logic/forge/ForgeInstaller.h
+++ b/logic/forge/ForgeInstaller.h
@@ -22,7 +22,7 @@
class InstanceVersion;
class ForgeInstallTask;
-class ForgeVersion;
+struct ForgeVersion;
class ForgeInstaller : public BaseInstaller
{
diff --git a/logic/minecraft/VersionFile.h b/logic/minecraft/VersionFile.h
index 186f4335..9a6c5d3c 100644
--- a/logic/minecraft/VersionFile.h
+++ b/logic/minecraft/VersionFile.h
@@ -12,7 +12,7 @@
#include "JarMod.h"
class InstanceVersion;
-struct VersionFile;
+class VersionFile;
typedef std::shared_ptr<VersionFile> VersionFilePtr;
class VersionFile : public VersionPatch