From 6bcc4cb109b4ab6ec194a04c53cf1d545a7a7dfd Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Sat, 27 Apr 2019 23:08:01 +0900 Subject: prefix member variables of AnimationBitmap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic84773399c95d61f843e4388fe01d00cd4facc5a Reviewed-on: https://gerrit.libreoffice.org/71425 Reviewed-by: Tomaž Vajngerl Tested-by: Tomaž Vajngerl --- include/vcl/animate/AnimationBitmap.hxx | 49 ++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 22 deletions(-) (limited to 'include') diff --git a/include/vcl/animate/AnimationBitmap.hxx b/include/vcl/animate/AnimationBitmap.hxx index 5b6be90ca2e5..8dd9a0272862 100644 --- a/include/vcl/animate/AnimationBitmap.hxx +++ b/include/vcl/animate/AnimationBitmap.hxx @@ -33,39 +33,44 @@ enum class Disposal struct VCL_DLLPUBLIC AnimationBitmap { - BitmapEx aBmpEx; - Point aPosPix; - Size aSizePix; - long nWait; - Disposal eDisposal; - bool bUserInput; + BitmapEx maBitmapEx; + Point maPositionPixel; + Size maSizePixel; + long mnWait; + Disposal meDisposal; + bool mbUserInput; AnimationBitmap() - : nWait(0) - , eDisposal(Disposal::Not) - , bUserInput(false) + : mnWait(0) + , meDisposal(Disposal::Not) + , mbUserInput(false) { } - AnimationBitmap(const BitmapEx& rBmpEx, const Point& rPosPix, const Size& rSizePix, - long _nWait = 0, Disposal _eDisposal = Disposal::Not) - : aBmpEx(rBmpEx) - , aPosPix(rPosPix) - , aSizePix(rSizePix) - , nWait(_nWait) - , eDisposal(_eDisposal) - , bUserInput(false) + AnimationBitmap(const BitmapEx& rBitmapEx, const Point& rPositionPixel, const Size& rSizePixel, + long nWait = 0, Disposal eDisposal = Disposal::Not) + : maBitmapEx(rBitmapEx) + , maPositionPixel(rPositionPixel) + , maSizePixel(rSizePixel) + , mnWait(nWait) + , meDisposal(eDisposal) + , mbUserInput(false) { } - bool operator==(const AnimationBitmap& rAnimBmp) const + bool operator==(const AnimationBitmap& rAnimationBitmap) const { - return (rAnimBmp.aBmpEx == aBmpEx && rAnimBmp.aPosPix == aPosPix - && rAnimBmp.aSizePix == aSizePix && rAnimBmp.nWait == nWait - && rAnimBmp.eDisposal == eDisposal && rAnimBmp.bUserInput == bUserInput); + return (rAnimationBitmap.maBitmapEx == maBitmapEx + && rAnimationBitmap.maPositionPixel == maPositionPixel + && rAnimationBitmap.maSizePixel == maSizePixel && rAnimationBitmap.mnWait == mnWait + && rAnimationBitmap.meDisposal == meDisposal + && rAnimationBitmap.mbUserInput == mbUserInput); } - bool operator!=(const AnimationBitmap& rAnimBmp) const { return !(*this == rAnimBmp); } + bool operator!=(const AnimationBitmap& rAnimationBitmap) const + { + return !(*this == rAnimationBitmap); + } BitmapChecksum GetChecksum() const; }; -- cgit