diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-07-01 01:23:49 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-07-01 01:23:49 +0200 |
| commit | 8b86306d48fff4a6cc9291d00e1211a5e5dc1903 (patch) | |
| tree | c50b3a924821d9cf7f7ac789616fb9b26b8e2690 /logic | |
| parent | dd0752e69f33c6092a940091b8a332b18e6be76d (diff) | |
| download | MultiMC-8b86306d48fff4a6cc9291d00e1211a5e5dc1903.tar MultiMC-8b86306d48fff4a6cc9291d00e1211a5e5dc1903.tar.gz MultiMC-8b86306d48fff4a6cc9291d00e1211a5e5dc1903.tar.lz MultiMC-8b86306d48fff4a6cc9291d00e1211a5e5dc1903.tar.xz MultiMC-8b86306d48fff4a6cc9291d00e1211a5e5dc1903.zip | |
Handle a bunch more clang warnings
Diffstat (limited to 'logic')
| -rw-r--r-- | logic/BaseInstaller.h | 2 | ||||
| -rw-r--r-- | logic/BaseVersionList.h | 3 | ||||
| -rw-r--r-- | logic/InstanceFactory.h | 2 | ||||
| -rw-r--r-- | logic/VersionFilterData.cpp | 2 | ||||
| -rw-r--r-- | logic/assets/AssetsUtils.h | 2 | ||||
| -rw-r--r-- | logic/forge/ForgeInstaller.h | 2 | ||||
| -rw-r--r-- | logic/minecraft/VersionFile.h | 2 |
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 |