Mercurial > projects > doodle
diff doodle/tk/events.d @ 48:1b4c9ba58673
Stylistic overhaul.
author | daveb |
---|---|
date | Tue, 03 Aug 2010 17:37:21 +0930 |
parents | 157b4ad5615d |
children | c63719604adb |
line wrap: on
line diff
--- a/doodle/tk/events.d Tue Aug 03 16:57:06 2010 +0930 +++ b/doodle/tk/events.d Tue Aug 03 17:37:21 2010 +0930 @@ -7,13 +7,13 @@ abstract class Event { this(in Mask mask) { - mMask = mask; + _mask = mask; } - Mask mask() const { return mMask; } + Mask mask() const { return _mask; } private { - Mask mMask; + Mask _mask; } } @@ -25,35 +25,35 @@ final class KeyEvent : Event { this(in string str, in uint value, in Mask mask) { super(mask); - mStr = str; - mValue = value; + _str = str; + _value = value; } - string str() const { return mStr; } + string str() const { return _str; } override string toString() const { - return std.string.format("Key event: %s, %d, %s", mStr, mValue, mMask); + return std.string.format("Key event: %s, %d, %s", _str, _value, _mask); } private { - string mStr; - uint mValue; + string _str; + uint _value; } } abstract class PointerEvent : Event { - this(in Point pixel_point, in Point model_point, in Mask mask) { + this(in Point pixelPoint, in Point modelPoint, in Mask mask) { super(mask); - mPixelPoint = pixel_point; - mModelPoint = model_point; + _pixelPoint = pixelPoint; + _modelPoint = modelPoint; } - Point pixel_point() const { return mPixelPoint; } - Point model_point() const { return mModelPoint; } + Point pixelPoint() const { return _pixelPoint; } + Point modelPoint() const { return _modelPoint; } private { - Point mPixelPoint; - Point mModelPoint; + Point _pixelPoint; + Point _modelPoint; } } @@ -71,59 +71,59 @@ final class ButtonEvent : PointerEvent { this(in ButtonAction button_action, in ButtonName button_name, - in Point pixel_point, - in Point model_point, + in Point pixelPoint, + in Point modelPoint, in Mask mask) { - super(pixel_point, model_point, mask); - mButtonAction = button_action; - mButtonName = button_name; + super(pixelPoint, modelPoint, mask); + _buttonAction = button_action; + _buttonName = button_name; } override string toString() const { return std.string.format("Button event: %s, %s, %s, %s, %s", - enumToString(mButtonAction), enumToString(mButtonName), - mPixelPoint, mModelPoint, mMask); + enumToString(_buttonAction), enumToString(_buttonName), + _pixelPoint, _modelPoint, _mask); } - ButtonAction button_action() const { return mButtonAction; } - ButtonName button_name() const { return mButtonName; } + ButtonAction button_action() const { return _buttonAction; } + ButtonName button_name() const { return _buttonName; } private { - ButtonAction mButtonAction; - ButtonName mButtonName; + ButtonAction _buttonAction; + ButtonName _buttonName; } } final class MotionEvent : PointerEvent { - this(in Point pixel_point, - in Point model_point, + this(in Point pixelPoint, + in Point modelPoint, in Mask mask) { - super(pixel_point, model_point, mask); + super(pixelPoint, modelPoint, mask); } override string toString() const { return std.string.format("Motion event: %s, %s, %s", - mPixelPoint, mModelPoint, mMask); + _pixelPoint, _modelPoint, _mask); } } final class ScrollEvent : PointerEvent { - this(in ScrollDirection scroll_direction, - in Point pixel_point, - in Point model_point, + this(in ScrollDirection scrollDirection, + in Point pixelPoint, + in Point modelPoint, in Mask mask) { - super(pixel_point, model_point, mask); - mScrollDirection = scroll_direction; + super(pixelPoint, modelPoint, mask); + _scrollDirection = scrollDirection; } override string toString() const { return std.string.format("Scroll event: %s, %s, %s, %s", - enumToString(mScrollDirection), mPixelPoint, mModelPoint, mMask); + enumToString(_scrollDirection), _pixelPoint, _modelPoint, _mask); } - ScrollDirection scroll_direction() const { return mScrollDirection; } + ScrollDirection scrollDirection() const { return _scrollDirection; } private { - ScrollDirection mScrollDirection; + ScrollDirection _scrollDirection; } }