CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE more compiler warning removal

Browse Source
This commit is contained in:
Petr Mrázek
2017-05-21 22:24:06 +02:00
parent d432d8ecfc
commit c329bc73c0
4 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/logic/minecraft/ftb/LegacyFTBInstance.cpp
View File

@@ -12,13 +12,10 @@ QString LegacyFTBInstance::id() const
return "FTB/" + BaseInstance::id(); return "FTB/" + BaseInstance::id();
} }
void LegacyFTBInstance::copy(const QDir &newDir) void LegacyFTBInstance::copy(SettingsObjectPtr newSettings, const QDir& newDir)
{ {
// set the target instance to be plain Legacy // set the target instance to be plain Legacy
INISettingsObject settings_obj(newDir.absoluteFilePath("instance.cfg")); newSettings->set("InstanceType", "Legacy");
settings_obj.registerSetting("InstanceType", "Legacy");
QString inst_type = settings_obj.get("InstanceType").toString();
settings_obj.set("InstanceType", "Legacy");
} }
QString LegacyFTBInstance::typeName() const QString LegacyFTBInstance::typeName() const

2
api/logic/minecraft/ftb/LegacyFTBInstance.h
View File

@@ -8,7 +8,7 @@ class LegacyFTBInstance : public LegacyInstance
public: public:
explicit LegacyFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir); explicit LegacyFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir);
QString id() const override; QString id() const override;
void copy(const QDir &newDir) override; void copy(SettingsObjectPtr newSettings, const QDir &newDir) override;
QString typeName() const override; QString typeName() const override;
bool canExport() const override bool canExport() const override
{ {

1
application/CMakeLists.txt
View File

@@ -107,7 +107,6 @@ SET(MULTIMC_SOURCES
# page provider for instances # page provider for instances
InstancePageProvider.h InstancePageProvider.h
InstancePageProvider.cpp
# Common java checking UI # Common java checking UI
JavaCommon.h JavaCommon.h

0
application/InstancePageProvider.cpp
View File