[Scummvm-git-logs] scummvm master -> 1f3aaac12cddddd4c89e70759506506b35c2d8bc

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1f3aaac12c MOHAWK: Silent Compiler Warning About Unused VM Pointer.


Commit: 1f3aaac12cddddd4c89e70759506506b35c2d8bc
    https://github.com/scummvm/scummvm/commit/1f3aaac12cddddd4c89e70759506506b35c2d8bc
Author: D G Turner (digitall at scummvm.org)
Date: 2018-07-29T06:00:42+01:00

Commit Message:
MOHAWK: Silent Compiler Warning About Unused VM Pointer.

This can be restored if required at a later time.

Changed paths:
    engines/mohawk/dialogs.cpp
    engines/mohawk/dialogs.h


diff --git a/engines/mohawk/dialogs.cpp b/engines/mohawk/dialogs.cpp
index 31997f4..9be05a1 100644
--- a/engines/mohawk/dialogs.cpp
+++ b/engines/mohawk/dialogs.cpp
@@ -93,9 +93,8 @@ enum {
 
 #if defined(ENABLE_MYST) || defined(ENABLE_RIVEN)
 
-MohawkOptionsDialog::MohawkOptionsDialog(MohawkEngine *vm) :
-		GUI::Dialog(0, 0, 360, 200),
-		_vm(vm) {
+MohawkOptionsDialog::MohawkOptionsDialog() :
+		GUI::Dialog(0, 0, 360, 200) {
 	new GUI::ButtonWidget(this, 95, 160, 120, 25, _("~O~K"), nullptr, GUI::kOKCmd);
 	new GUI::ButtonWidget(this, 225, 160, 120, 25, _("~C~ancel"), nullptr, GUI::kCloseCmd);
 }
@@ -130,7 +129,7 @@ void MohawkOptionsDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd,
 #ifdef ENABLE_MYST
 
 MystOptionsDialog::MystOptionsDialog(MohawkEngine_Myst* vm) :
-		MohawkOptionsDialog(vm),
+		MohawkOptionsDialog(),
 		_vm(vm),
 		_canDropPage(false),
 		_canShowMap(false),
@@ -281,7 +280,7 @@ void MystOptionsDialog::setCanReturnToMenu(bool canReturnToMenu) {
 #ifdef ENABLE_RIVEN
 
 RivenOptionsDialog::RivenOptionsDialog(MohawkEngine_Riven* vm) :
-		MohawkOptionsDialog(vm),
+		MohawkOptionsDialog(),
 		_vm(vm) {
 	_zipModeCheckbox = new GUI::CheckboxWidget(this, 15, 10, 220, 15, _("~Z~ip Mode Activated"), nullptr, kZipCmd);
 	_waterEffectCheckbox = new GUI::CheckboxWidget(this, 15, 35, 220, 15, _("~W~ater Effect Enabled"), nullptr, kWaterCmd);
diff --git a/engines/mohawk/dialogs.h b/engines/mohawk/dialogs.h
index 71cf7a2..03b9643 100644
--- a/engines/mohawk/dialogs.h
+++ b/engines/mohawk/dialogs.h
@@ -76,14 +76,11 @@ public:
 
 class MohawkOptionsDialog : public GUI::Dialog {
 public:
-	explicit MohawkOptionsDialog(MohawkEngine *_vm);
+	explicit MohawkOptionsDialog();
 	~MohawkOptionsDialog() override;
 
 	void reflowLayout() override;
 	void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) override;
-
-private:
-	MohawkEngine *_vm;
 };
 
 #endif