[Scummvm-git-logs] scummvm master -> 7b73e406f108e5cbffe2e20b8bdc99ca11722cdb

eriktorbjorn noreply at scummvm.org
Sun Nov 19 09:00:50 UTC 2023


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:
7b73e406f1 SCUMM: Remove commented out member variables


Commit: 7b73e406f108e5cbffe2e20b8bdc99ca11722cdb
    https://github.com/scummvm/scummvm/commit/7b73e406f108e5cbffe2e20b8bdc99ca11722cdb
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2023-11-19T10:00:24+01:00

Commit Message:
SCUMM: Remove commented out member variables

There were no further plans for them, they were just the remains of
earlier experimentation.

Changed paths:
    engines/scumm/gfx_mac.h


diff --git a/engines/scumm/gfx_mac.h b/engines/scumm/gfx_mac.h
index 6630d3619dd..13d10bc267c 100644
--- a/engines/scumm/gfx_mac.h
+++ b/engines/scumm/gfx_mac.h
@@ -219,7 +219,6 @@ public:
 	class MacCheckbox : public MacWidget {
 	private:
 		Common::Rect _hitBounds;
-		//bool _isChecked = false;
 
 	public:
 		MacCheckbox(MacGui::MacDialogWindow *window, Common::Rect bounds, Common::String text, bool enabled);
@@ -273,7 +272,6 @@ public:
 		int _caretX = -1;
 
 		uint32 _lastClickTime = 0;
-		//uint32 _lastScrollTime = 0;
 
 		int _lastClickX = 0;
 
@@ -395,8 +393,6 @@ public:
 		MacPicture *_handle;
 		int _minX;
 		int _maxX;
-		//int _leftMargin;
-		//int _rightMargin;
 
 		void eraseHandle();
 		void drawHandle();
@@ -405,7 +401,7 @@ public:
 		 MacPictureSlider(MacGui::MacDialogWindow *window, MacPicture *background, MacPicture *handle, bool enabled, int minX, int maxX, int minValue, int maxValue, int leftMargin, int rightMargin)
 			: MacSliderBase(window, background->getBounds(), minValue, maxValue, minX + leftMargin, maxX - rightMargin, enabled),
 			_background(background), _handle(handle), _minX(minX),
-			_maxX(maxX)/*, _leftMargin(leftMargin), _rightMargin(rightMargin) */ {}
+			_maxX(maxX) {}
 
 		bool findWidget(int x, int y) const;
 		void draw(bool drawFocused = false);
@@ -485,7 +481,6 @@ public:
 
 		MacWidget *_defaultWidget = nullptr;
 
-		//int _mouseOverWidget = -1;
 		MacWidget *_focusedWidget = nullptr;
 		Common::Point _focusClick;
 		Common::Point _oldMousePos;




More information about the Scummvm-git-logs mailing list