diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-07 11:57:50 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-07 12:07:43 +0200 |
commit | cb2b7a951ba447796611eaf411842ef9572a3d6c (patch) | |
tree | 53c489ad61e855e1732e048a2b137cd4eec184f3 /include | |
parent | 51e472296b42ea27532c80f68ed741ce204e1e59 (diff) |
loplugin:staticmethods: vcl
Change-Id: I9a563100400375cd185729282b3e4f1ff3a44151
Diffstat (limited to 'include')
-rw-r--r-- | include/vcl/bitmap.hxx | 2 | ||||
-rw-r--r-- | include/vcl/button.hxx | 4 | ||||
-rw-r--r-- | include/vcl/combobox.hxx | 2 | ||||
-rw-r--r-- | include/vcl/edit.hxx | 6 | ||||
-rw-r--r-- | include/vcl/fixed.hxx | 8 | ||||
-rw-r--r-- | include/vcl/gdimtf.hxx | 8 | ||||
-rw-r--r-- | include/vcl/group.hxx | 2 | ||||
-rw-r--r-- | include/vcl/lstbox.hxx | 2 | ||||
-rw-r--r-- | include/vcl/menu.hxx | 2 | ||||
-rw-r--r-- | include/vcl/mnemonic.hxx | 4 | ||||
-rw-r--r-- | include/vcl/outdev.hxx | 2 | ||||
-rw-r--r-- | include/vcl/splitwin.hxx | 2 | ||||
-rw-r--r-- | include/vcl/toolbox.hxx | 2 | ||||
-rw-r--r-- | include/vcl/wall.hxx | 2 | ||||
-rw-r--r-- | include/vcl/window.hxx | 4 |
15 files changed, 26 insertions, 26 deletions
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 13f3df17dcc7..22cf16750aa9 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -730,7 +730,7 @@ public: SAL_DLLPRIVATE bool ImplSeparableBlurFilter( const double aRadius ); SAL_DLLPRIVATE bool ImplSeparableUnsharpenFilter( const double aRadius ); SAL_DLLPRIVATE bool ImplDuotoneFilter( const sal_uLong nColorOne, sal_uLong nColorTwo ); - SAL_DLLPRIVATE void ImplBlurContributions( + SAL_DLLPRIVATE static void ImplBlurContributions( const int aSize, const int aNumberOfContributions, double* pBlurVector, diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 36103705abd9..f6e05f478a4d 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -122,7 +122,7 @@ protected: bool mbIsActive; SAL_DLLPRIVATE void ImplInitPushButtonData(); - SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ); + SAL_DLLPRIVATE static WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDrawPushButtonContent(OutputDevice* pDev, DrawFlags nDrawFlags, const Rectangle& rRect, bool bMenuBtnSep); @@ -407,7 +407,7 @@ private: // to the left or right ( depending on RTL or LTR settings ) bool mbLegacyNoTextAlign; SAL_DLLPRIVATE void ImplInitCheckBoxData(); - SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ); + SAL_DLLPRIVATE static WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags, const Point& rPos, const Size& rSize, diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index 81d1b90c3379..e67a4e247234 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -42,7 +42,7 @@ private: protected: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); - SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); + SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE void ImplCalcEditHeight(); SAL_DLLPRIVATE long getMaxWidthScrollBarAndDownButton() const; diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 8bc6b2bf642d..5aaa9f7776d2 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -108,7 +108,7 @@ private: SAL_DLLPRIVATE void ImplDelete( const Selection& rSelection, sal_uInt8 nDirection, sal_uInt8 nMode ); SAL_DLLPRIVATE void ImplSetText( const OUString& rStr, const Selection* pNewSelection ); SAL_DLLPRIVATE void ImplInsertText( const OUString& rStr, const Selection* pNewSelection = nullptr, bool bIsUserInput = false ); - SAL_DLLPRIVATE OUString ImplGetValidString( const OUString& rString ) const; + SAL_DLLPRIVATE static OUString ImplGetValidString( const OUString& rString ); SAL_DLLPRIVATE void ImplClearBackground(vcl::RenderContext& rRenderContext, const Rectangle& rRectangle, long nXStart, long nXEnd); SAL_DLLPRIVATE void ImplPaintBorder(vcl::RenderContext& rRenderContext, long nXStart, long nXEnd); SAL_DLLPRIVATE void ImplShowCursor( bool bOnlyIfVisible = true ); @@ -124,14 +124,14 @@ private: SAL_DLLPRIVATE void ImplPaste(css::uno::Reference<css::datatransfer::clipboard::XClipboard>& rxClipboard); SAL_DLLPRIVATE long ImplGetTextYPosition() const; SAL_DLLPRIVATE css::uno::Reference<css::i18n::XExtendedInputSequenceChecker > const & ImplGetInputSequenceChecker(); - SAL_DLLPRIVATE css::uno::Reference<css::i18n::XBreakIterator > ImplGetBreakIterator() const; + SAL_DLLPRIVATE static css::uno::Reference<css::i18n::XBreakIterator > ImplGetBreakIterator(); SAL_DLLPRIVATE void filterText(); protected: using Control::ImplInitSettings; using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); - SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); + SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE void ImplSetSelection( const Selection& rSelection, bool bPaint = true ); SAL_DLLPRIVATE ControlType ImplGetNativeControlType() const; diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index 42090549d98a..93dafda582ac 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -40,7 +40,7 @@ private: using Control::ImplInitSettings; using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); - SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); + SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags, const Point& rPos, const Size& rSize, bool bFillLayout = false ) const; public: @@ -95,7 +95,7 @@ private: using Control::ImplInitSettings; using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); - SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); + SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplDraw(vcl::RenderContext& rRenderContext); protected: @@ -127,7 +127,7 @@ private: using Control::ImplInitSettings; using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); - SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); + SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags, const Point& rPos, const Size& rSize ); @@ -156,7 +156,7 @@ private: using Control::ImplInitSettings; using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); - SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); + SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle ); protected: SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags, diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index 882f6fb3187a..f0ac2ace9ba2 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -85,13 +85,13 @@ private: SAL_DLLPRIVATE void ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pColParam, BmpExchangeFnc pFncBmp, const void* pBmpParam ); - SAL_DLLPRIVATE Point ImplGetRotatedPoint( const Point& rPt, const Point& rRotatePt, + SAL_DLLPRIVATE static Point ImplGetRotatedPoint( const Point& rPt, const Point& rRotatePt, const Size& rOffset, double fSin, double fCos ); - SAL_DLLPRIVATE tools::Polygon ImplGetRotatedPolygon( const tools::Polygon& rPoly, const Point& rRotatePt, + SAL_DLLPRIVATE static tools::Polygon ImplGetRotatedPolygon( const tools::Polygon& rPoly, const Point& rRotatePt, const Size& rOffset, double fSin, double fCos ); - SAL_DLLPRIVATE tools::PolyPolygon ImplGetRotatedPolyPolygon( const tools::PolyPolygon& rPoly, const Point& rRotatePt, + SAL_DLLPRIVATE static tools::PolyPolygon ImplGetRotatedPolyPolygon( const tools::PolyPolygon& rPoly, const Point& rRotatePt, const Size& rOffset, double fSin, double fCos ); - SAL_DLLPRIVATE void ImplAddGradientEx( GDIMetaFile& rMtf, + SAL_DLLPRIVATE static void ImplAddGradientEx( GDIMetaFile& rMtf, const OutputDevice& rMapDev, const tools::PolyPolygon& rPolyPoly, const Gradient& rGrad ); diff --git a/include/vcl/group.hxx b/include/vcl/group.hxx index a66b1342eda1..3c68a4cdb5a6 100644 --- a/include/vcl/group.hxx +++ b/include/vcl/group.hxx @@ -31,7 +31,7 @@ private: using Control::ImplInitSettings; using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); - SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); + SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags, const Point& rPos, const Size& rSize, bool bLayout = false ); diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index f4ae404de91a..3133304c9ce7 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -106,7 +106,7 @@ private: protected: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); - SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); + SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); bool IsDropDownBox() const { return mpFloatWin != nullptr; } diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 38681ab2a169..684c2a832fe3 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -196,7 +196,7 @@ protected: // returns native submenu arrow size and spacing from right border // return value is whether it's supported natively - SAL_DLLPRIVATE bool ImplGetNativeSubmenuArrowSize(vcl::RenderContext& rRenderContext, Size& rArrowSize, long& rArrowSpacing) const; + SAL_DLLPRIVATE static bool ImplGetNativeSubmenuArrowSize(vcl::RenderContext& rRenderContext, Size& rArrowSize, long& rArrowSpacing); SAL_DLLPRIVATE void ImplAddDel( ImplMenuDelData &rDel ); SAL_DLLPRIVATE void ImplRemoveDel( ImplMenuDelData &rDel ); diff --git a/include/vcl/mnemonic.hxx b/include/vcl/mnemonic.hxx index 9d5fa1944e27..a3aa33ea9a0a 100644 --- a/include/vcl/mnemonic.hxx +++ b/include/vcl/mnemonic.hxx @@ -57,8 +57,8 @@ private: css::uno::Reference< css::i18n::XCharacterClassification > mxCharClass; protected: - SAL_DLLPRIVATE sal_uInt16 ImplGetMnemonicIndex( sal_Unicode c ); - SAL_DLLPRIVATE sal_Unicode ImplFindMnemonic( const OUString& rKey ); + SAL_DLLPRIVATE static sal_uInt16 ImplGetMnemonicIndex( sal_Unicode c ); + SAL_DLLPRIVATE static sal_Unicode ImplFindMnemonic( const OUString& rKey ); public: MnemonicGenerator(); diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 9ccfb6700c2d..7342f5266ba1 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1170,7 +1170,7 @@ private: SAL_DLLPRIVATE void ImplDrawSpecialText( SalLayout& ); SAL_DLLPRIVATE void ImplDrawTextRect( long nBaseX, long nBaseY, long nX, long nY, long nWidth, long nHeight ); - SAL_DLLPRIVATE void ImplDrawWavePixel( long nOriginX, long nOriginY, long nCurX, long nCurY, short nOrientation, SalGraphics* pGraphics, OutputDevice* pOutDev, + SAL_DLLPRIVATE static void ImplDrawWavePixel( long nOriginX, long nOriginY, long nCurX, long nCurY, short nOrientation, SalGraphics* pGraphics, OutputDevice* pOutDev, bool bDrawPixAsRect, long nPixWidth, long nPixHeight ); SAL_DLLPRIVATE void ImplDrawWaveLine( long nBaseX, long nBaseY, long nStartX, long nStartY, long nWidth, long nHeight, long nLineWidth, short nOrientation, const Color& rColor ); SAL_DLLPRIVATE void ImplDrawWaveTextLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontLineStyle eTextLine, Color aColor, bool bIsAbove ); diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx index 2bacd58a8b9e..2be70304a8aa 100644 --- a/include/vcl/splitwin.hxx +++ b/include/vcl/splitwin.hxx @@ -110,7 +110,7 @@ private: static SAL_DLLPRIVATE void ImplCalcSet2( SplitWindow* pWindow, ImplSplitSet* pSet, bool bHide, bool bRows, bool bDown = true ); SAL_DLLPRIVATE void ImplDrawBack(vcl::RenderContext& rRenderContext, ImplSplitSet* pSet ); - SAL_DLLPRIVATE void ImplDrawBack(vcl::RenderContext& rRenderContext, const Rectangle& rRect, + SAL_DLLPRIVATE static void ImplDrawBack(vcl::RenderContext& rRenderContext, const Rectangle& rRect, const Wallpaper* pWall, const Bitmap* pBitmap ); static SAL_DLLPRIVATE sal_uInt16 ImplTestSplit( ImplSplitSet* pSet, const Point& rPos, long& rMouseOff, ImplSplitSet** ppFoundSet, sal_uInt16& rFoundPos, diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index fe3fa39d03e9..f1ad481d6d3e 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -227,7 +227,7 @@ public: SAL_DLLPRIVATE void ImplDrawGradientBackground(vcl::RenderContext& rRenderContext, ImplDockingWindowWrapper *pWrapper); SAL_DLLPRIVATE bool ImplDrawNativeBackground(vcl::RenderContext& rRenderContext, const vcl::Region &rRegion); SAL_DLLPRIVATE void ImplDrawTransparentBackground(vcl::RenderContext& rRenderContext, const vcl::Region &rRegion); - SAL_DLLPRIVATE void ImplDrawConstantBackground(vcl::RenderContext& rRenderContext, const vcl::Region &rRegion, bool bIsInPopupMode); + SAL_DLLPRIVATE static void ImplDrawConstantBackground(vcl::RenderContext& rRenderContext, const vcl::Region &rRegion, bool bIsInPopupMode); SAL_DLLPRIVATE void ImplDrawBackground(vcl::RenderContext& rRenderContext, const Rectangle &rRect); SAL_DLLPRIVATE void ImplErase(vcl::RenderContext& rRenderContext, const Rectangle &rRect, bool bHighlight, bool bHasOpenPopup = false ); diff --git a/include/vcl/wall.hxx b/include/vcl/wall.hxx index bfcd72f73838..ac1d3d27c224 100644 --- a/include/vcl/wall.hxx +++ b/include/vcl/wall.hxx @@ -59,7 +59,7 @@ public: private: ImplType mpImplWallpaper; - SAL_DLLPRIVATE Gradient ImplGetApplicationGradient() const; + SAL_DLLPRIVATE static Gradient ImplGetApplicationGradient(); public: Wallpaper(); diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 7de1c77b83a0..9b36a551356f 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -650,7 +650,7 @@ private: SAL_DLLPRIVATE SalGraphics* ImplGetFrameGraphics() const; - SAL_DLLPRIVATE void ImplCallFocusChangeActivate( vcl::Window* pNewOverlapWindow, vcl::Window* pOldOverlapWindow ); + SAL_DLLPRIVATE static void ImplCallFocusChangeActivate( vcl::Window* pNewOverlapWindow, vcl::Window* pOldOverlapWindow ); SAL_DLLPRIVATE vcl::Window* ImplGetFirstOverlapWindow(); SAL_DLLPRIVATE const vcl::Window* ImplGetFirstOverlapWindow() const; @@ -738,7 +738,7 @@ private: SAL_DLLPRIVATE void ImplCallActivateListeners(vcl::Window*); SAL_DLLPRIVATE void ImplCallDeactivateListeners(vcl::Window*); - SAL_DLLPRIVATE void ImplHandleScroll( ScrollBar* pHScrl, long nX, ScrollBar* pVScrl, long nY ); + SAL_DLLPRIVATE static void ImplHandleScroll( ScrollBar* pHScrl, long nX, ScrollBar* pVScrl, long nY ); SAL_DLLPRIVATE Rectangle ImplOutputToUnmirroredAbsoluteScreenPixel( const Rectangle& rRect ) const; SAL_DLLPRIVATE long ImplGetUnmirroredOutOffX(); |