diff options
-rw-r--r-- | vcl/inc/unx/gtk/gtkdata.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 10 | ||||
-rw-r--r-- | vcl/inc/unx/i18n_ic.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/unx/saldata.hxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/app/i18n_ic.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/app/saldata.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/app/saltimer.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/xrender_peer.hxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk/app/gtkinst.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkPicker.hxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk/window/gtksalframe.cxx | 34 | ||||
-rw-r--r-- | vcl/workben/mtfdemo.cxx | 2 | ||||
-rw-r--r-- | vcl/workben/svpclient.cxx | 2 | ||||
-rw-r--r-- | vcl/workben/vcldemo.cxx | 16 |
17 files changed, 48 insertions, 48 deletions
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx index 416b583c2ea4..9269132c4502 100644 --- a/vcl/inc/unx/gtk/gtkdata.hxx +++ b/vcl/inc/unx/gtk/gtkdata.hxx @@ -108,8 +108,8 @@ public: void Init(); virtual void Dispose() SAL_OVERRIDE; - void initNWF(); - void deInitNWF(); + static void initNWF(); + static void deInitNWF(); static gboolean userEventFn( gpointer data ); diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 58b9aa5e563d..6c354c30ea44 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -272,7 +272,7 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider bool bSendRelease ); - GdkNativeWindow findTopLevelSystemWindow( GdkNativeWindow aWindow ); + static GdkNativeWindow findTopLevelSystemWindow( GdkNativeWindow aWindow ); static int m_nFloats; @@ -304,8 +304,8 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider void createNewWindow( ::Window aParent, bool bXEmbed, SalX11Screen nXScreen ); void askForXEmbedFocus( sal_Int32 nTimecode ); - void AllocateFrame(); - void TriggerPaintEvent(); + static void AllocateFrame(); + static void TriggerPaintEvent(); void updateWMClass(); void SetScreen( unsigned int nNewScreen, int eType, Rectangle *pSize = NULL ); @@ -331,8 +331,8 @@ public: void grabPointer(bool bGrab, bool bOwnerEvents = false); void grabKeyboard(bool bGrab); - GtkSalDisplay* getDisplay(); - GdkDisplay* getGdkDisplay(); + static GtkSalDisplay* getDisplay(); + static GdkDisplay* getGdkDisplay(); GtkWidget* getWindow() const { return m_pWindow; } GtkFixed* getFixedContainer() const { return m_pFixedContainer; } GdkWindow* getForeignParent() const { return m_pForeignParent; } diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx index 2703a0506364..656a3f0d4c14 100644 --- a/vcl/inc/unx/i18n_ic.hxx +++ b/vcl/inc/unx/i18n_ic.hxx @@ -50,8 +50,8 @@ private: XVaNestedList mpPreeditAttributes; bool SupportInputMethodStyle( XIMStyles *pIMStyles ); - unsigned int GetWeightingOfIMStyle( XIMStyle n_style ) const ; - Bool IsSupportedIMStyle( XIMStyle n_style ) const ; + static unsigned int GetWeightingOfIMStyle( XIMStyle n_style ); + Bool IsSupportedIMStyle( XIMStyle n_style ) const; public: diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx index 0dba4c960c9e..1cd83a908dda 100644 --- a/vcl/inc/unx/saldata.hxx +++ b/vcl/inc/unx/saldata.hxx @@ -77,7 +77,7 @@ public: void StartTimer( sal_uLong nMS ); inline void StopTimer(); - void Timeout( bool idle ) const; + static void Timeout( bool idle ); // X errors virtual void ErrorTrapPush() SAL_OVERRIDE; diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx index 60cb0f0cdb5d..3daeb2b2c861 100644 --- a/vcl/unx/generic/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -442,7 +442,7 @@ SalI18N_InputContext::ExtendEventMask( ::Window aFocusWindow ) // tune the styles provided by the input method with the supported one unsigned int -SalI18N_InputContext::GetWeightingOfIMStyle( XIMStyle nStyle ) const +SalI18N_InputContext::GetWeightingOfIMStyle( XIMStyle nStyle ) { struct StyleWeightingT { const XIMStyle nStyle; diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx index d8e9644f8167..b2212a4b8819 100644 --- a/vcl/unx/generic/app/saldata.cxx +++ b/vcl/unx/generic/app/saldata.cxx @@ -612,7 +612,7 @@ bool SalXLib::CheckTimeout( bool bExecuteTimers ) idle = false; } // notify - GetX11SalData()->Timeout( idle ); + X11SalData::Timeout( idle ); } } } diff --git a/vcl/unx/generic/app/saltimer.cxx b/vcl/unx/generic/app/saltimer.cxx index fc55afb85c48..44f3853e35f3 100644 --- a/vcl/unx/generic/app/saltimer.cxx +++ b/vcl/unx/generic/app/saltimer.cxx @@ -29,7 +29,7 @@ #include <unx/saltimer.h> #include <unx/salinst.h> -void X11SalData::Timeout( bool idle ) const +void X11SalData::Timeout( bool idle ) { ImplSVData* pSVData = ImplGetSVData(); if( pSVData->mpSalTimer ) diff --git a/vcl/unx/generic/gdi/xrender_peer.hxx b/vcl/unx/generic/gdi/xrender_peer.hxx index 79609d624ba9..bf8dfd6147cb 100644 --- a/vcl/unx/generic/gdi/xrender_peer.hxx +++ b/vcl/unx/generic/gdi/xrender_peer.hxx @@ -64,7 +64,7 @@ public: void FreeGlyphSet( GlyphSet ) const; void AddGlyph( GlyphSet, XRenderGlyph nXRGlyph, const XGlyphInfo&, const char* pBuffer, int nBufSize ) const; - void FreeGlyph( GlyphSet, XRenderGlyph nXRGlyphId ) const; + static void FreeGlyph( GlyphSet, XRenderGlyph nXRGlyphId ); void CompositeString32( Picture aSrc, Picture aDst, GlyphSet, int nDstX, int nDstY, const unsigned* pText, int nTextLen ) const; void FillRectangle( int nOp, Picture aDst, const XRenderColor*, @@ -148,7 +148,7 @@ inline void XRenderPeer::AddGlyph( GlyphSet aGS, XRenderGlyph nXRGlyph, pBuffer, nBufSize ); } -inline void XRenderPeer::FreeGlyph( GlyphSet aGS, XRenderGlyph nXRGlyph ) const +inline void XRenderPeer::FreeGlyph( GlyphSet aGS, XRenderGlyph nXRGlyph ) { (void)aGS; (void)nXRGlyph; diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index dec58ca8088e..f9883c871be8 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -177,7 +177,7 @@ void GtkInstance::EnsureInit() // initialize SalData GtkData *pSalData = GetGtkSalData(); pSalData->Init(); - pSalData->initNWF(); + GtkData::initNWF(); InitAtkBridge(); diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index feda439d28f2..aef326cb8f91 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -1184,7 +1184,7 @@ void SalGtkFilePicker::HandleSetListValue(GtkComboBox *pWidget, sal_Int16 nContr gtk_widget_set_sensitive(GTK_WIDGET(pWidget), nItems > 1); } -uno::Any SalGtkFilePicker::HandleGetListValue(GtkComboBox *pWidget, sal_Int16 nControlAction) const +uno::Any SalGtkFilePicker::HandleGetListValue(GtkComboBox *pWidget, sal_Int16 nControlAction) { uno::Any aAny; switch (nControlAction) diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx index bac2d01a2240..ec1e07a82e27 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx @@ -255,7 +255,7 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base void HandleSetListValue(GtkComboBox *pWidget, sal_Int16 nControlAction, const ::com::sun::star::uno::Any& rValue); - ::com::sun::star::uno::Any HandleGetListValue(GtkComboBox *pWidget, sal_Int16 nControlAction) const; + static ::com::sun::star::uno::Any HandleGetListValue(GtkComboBox *pWidget, sal_Int16 nControlAction); static void expander_changed_cb( GtkExpander *expander, SalGtkFilePicker *pobjFP ); static void preview_toggled_cb( GObject *cb, SalGtkFilePicker *pobjFP ); diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx index eb8e814b804b..78d810cf16c7 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx @@ -63,7 +63,7 @@ class SalGtkPicker // to instantiate own services ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - OUString getResString( sal_Int32 aId ); + static OUString getResString( sal_Int32 aId ); }; //Run the Gtk Dialog. Watch for any "new windows" created while we're diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index a3b6cb0df03c..ac0a6a82ea74 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -620,14 +620,14 @@ void GtkSalGraphics::copyBits( const SalTwoRect& rPosAry, { aWin = GDK_WINDOW_XWINDOW(pWin); if( aWin != None ) - XSetWindowBackgroundPixmap( pFrame->getDisplay()->GetDisplay(), + XSetWindowBackgroundPixmap( GtkSalFrame::getDisplay()->GetDisplay(), aWin, None ); } } X11SalGraphics::copyBits( rPosAry, pSrcGraphics ); if( pFrame && pFrame->getBackgroundPixmap() != None ) - XSetWindowBackgroundPixmap( pFrame->getDisplay()->GetDisplay(), + XSetWindowBackgroundPixmap( GtkSalFrame::getDisplay()->GetDisplay(), aWin, pFrame->getBackgroundPixmap() ); } diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 3a1cae108573..2c829db7d993 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -3255,13 +3255,13 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer { // close popups if user clicks outside our application gint x, y; - bClosePopups = (gdk_display_get_window_at_pointer( pThis->getGdkDisplay(), &x, &y ) == NULL); + bClosePopups = (gdk_display_get_window_at_pointer( GtkSalFrame::getGdkDisplay(), &x, &y ) == NULL); } /* #i30306# release implicit pointer grab if no popups are open; else * Drag cannot grab the pointer and will fail. */ if( m_nFloats < 1 || bClosePopups ) - gdk_display_pointer_ungrab( pThis->getGdkDisplay(), GDK_CURRENT_TIME ); + gdk_display_pointer_ungrab( GtkSalFrame::getGdkDisplay(), GDK_CURRENT_TIME ); } if( pThis->m_bWindowIsGtkPlug && @@ -3641,10 +3641,10 @@ gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, GdkEvent*, gpointer frame ) if( bSetFocus ) { GetGenericData()->ErrorTrapPush(); - XSetInputFocus( pThis->getDisplay()->GetDisplay(), + XSetInputFocus( GtkSalFrame::getDisplay()->GetDisplay(), widget_get_xid(pWidget), RevertToParent, CurrentTime ); - XSync( pThis->getDisplay()->GetDisplay(), False ); + XSync( GtkSalFrame::getDisplay()->GetDisplay(), False ); GetGenericData()->ErrorTrapPop(); } #else @@ -3653,7 +3653,7 @@ gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, GdkEvent*, gpointer frame ) #endif pThis->CallCallback( SALEVENT_RESIZE, NULL ); - pThis->TriggerPaintEvent(); + TriggerPaintEvent(); return false; } @@ -3681,7 +3681,7 @@ gboolean GtkSalFrame::signalConfigure( GtkWidget*, GdkEventConfigure* pEvent, gp * this event. So let's swallow it. */ if( (pThis->m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) && - pThis->getDisplay()->GetCaptureFrame() == pThis ) + GtkSalFrame::getDisplay()->GetCaptureFrame() == pThis ) return false; /* #i31785# claims we cannot trust the x,y members of the event; @@ -3739,7 +3739,7 @@ gboolean GtkSalFrame::signalConfigure( GtkWidget*, GdkEventConfigure* pEvent, gp pThis->updateScreenNumber(); if( bSized ) - pThis->AllocateFrame(); + AllocateFrame(); if( bMoved && bSized ) pThis->CallCallback( SALEVENT_MOVERESIZE, NULL ); @@ -3749,7 +3749,7 @@ gboolean GtkSalFrame::signalConfigure( GtkWidget*, GdkEventConfigure* pEvent, gp pThis->CallCallback( SALEVENT_RESIZE, NULL ); if (bSized) - pThis->TriggerPaintEvent(); + TriggerPaintEvent(); return false; } @@ -3891,8 +3891,8 @@ void GtkSalFrame::signalStyleSet( GtkWidget*, GtkStyle* pPrevious, gpointer fram // signalStyleSet does NOT usually have the gdk lock // so post user event to safely dispatch the SALEVENT_SETTINGSCHANGED // note: settings changed for multiple frames is avoided in winproc.cxx ImplHandleSettings - pThis->getDisplay()->SendInternalEvent( pThis, NULL, SALEVENT_SETTINGSCHANGED ); - pThis->getDisplay()->SendInternalEvent( pThis, NULL, SALEVENT_FONTCHANGED ); + GtkSalFrame::getDisplay()->SendInternalEvent( pThis, NULL, SALEVENT_SETTINGSCHANGED ); + GtkSalFrame::getDisplay()->SendInternalEvent( pThis, NULL, SALEVENT_FONTCHANGED ); } #if !GTK_CHECK_VERSION(3,0,0) @@ -3906,7 +3906,7 @@ void GtkSalFrame::signalStyleSet( GtkWidget*, GtkStyle* pPrevious, gpointer fram { ::Window aWin = GDK_WINDOW_XWINDOW(pWin); if( aWin != None ) - XSetWindowBackgroundPixmap( pThis->getDisplay()->GetDisplay(), + XSetWindowBackgroundPixmap( GtkSalFrame::getDisplay()->GetDisplay(), aWin, pThis->m_hBackgroundPixmap ); } @@ -3924,8 +3924,8 @@ gboolean GtkSalFrame::signalState( GtkWidget*, GdkEvent* pEvent, gpointer frame GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); if( (pThis->m_nState & GDK_WINDOW_STATE_ICONIFIED) != (pEvent->window_state.new_window_state & GDK_WINDOW_STATE_ICONIFIED ) ) { - pThis->getDisplay()->SendInternalEvent( pThis, NULL, SALEVENT_RESIZE ); - pThis->TriggerPaintEvent(); + GtkSalFrame::getDisplay()->SendInternalEvent( pThis, NULL, SALEVENT_RESIZE ); + TriggerPaintEvent(); } if( (pEvent->window_state.new_window_state & GDK_WINDOW_STATE_MAXIMIZED) && @@ -3982,7 +3982,7 @@ GtkSalFrame::IMHandler::IMHandler( GtkSalFrame* pFrame ) GtkSalFrame::IMHandler::~IMHandler() { // cancel an eventual event posted to begin preedit again - m_pFrame->getDisplay()->CancelInternalEvent( m_pFrame, &m_aInputEvent, SALEVENT_EXTTEXTINPUT ); + GtkSalFrame::getDisplay()->CancelInternalEvent( m_pFrame, &m_aInputEvent, SALEVENT_EXTTEXTINPUT ); deleteIMContext(); } @@ -4078,7 +4078,7 @@ void GtkSalFrame::IMHandler::endExtTextInput( sal_uInt16 /*nFlags*/ ) if( m_bFocused ) { // begin preedit again - m_pFrame->getDisplay()->SendInternalEvent( m_pFrame, &m_aInputEvent, SALEVENT_EXTTEXTINPUT ); + GtkSalFrame::getDisplay()->SendInternalEvent( m_pFrame, &m_aInputEvent, SALEVENT_EXTTEXTINPUT ); } } } @@ -4096,7 +4096,7 @@ void GtkSalFrame::IMHandler::focusChanged( bool bFocusIn ) { sendEmptyCommit(); // begin preedit again - m_pFrame->getDisplay()->SendInternalEvent( m_pFrame, &m_aInputEvent, SALEVENT_EXTTEXTINPUT ); + GtkSalFrame::getDisplay()->SendInternalEvent( m_pFrame, &m_aInputEvent, SALEVENT_EXTTEXTINPUT ); } } else @@ -4105,7 +4105,7 @@ void GtkSalFrame::IMHandler::focusChanged( bool bFocusIn ) gtk_im_context_focus_out( m_pIMContext ); GetGenericData()->ErrorTrapPop(); // cancel an eventual event posted to begin preedit again - m_pFrame->getDisplay()->CancelInternalEvent( m_pFrame, &m_aInputEvent, SALEVENT_EXTTEXTINPUT ); + GtkSalFrame::getDisplay()->CancelInternalEvent( m_pFrame, &m_aInputEvent, SALEVENT_EXTTEXTINPUT ); } } diff --git a/vcl/workben/mtfdemo.cxx b/vcl/workben/mtfdemo.cxx index 22629be87e4c..e7da7a91724b 100644 --- a/vcl/workben/mtfdemo.cxx +++ b/vcl/workben/mtfdemo.cxx @@ -70,7 +70,7 @@ class DemoMtfApp : public Application VclPtr<DemoMtfWin> mpWin; OUString maFileName; - void showHelp() + static void showHelp() { fprintf(stderr, "Usage: mtfdemo --help | FILE\n"); fprintf(stderr, "A VCL test app that displays Windows metafiles\n"); diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index 50f388f5d2d8..8f3f4d4c6596 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -112,7 +112,7 @@ public: virtual void dispose() SAL_OVERRIDE; void parseList( const OString& rList ); - OString processCommand( const OString& rCommand ); + static OString processCommand( const OString& rCommand ); DECL_LINK( ListHdl, Button* ); DECL_LINK( SelectHdl, ListBox* ); diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index eee51b3f1636..db73f57fe3d5 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -167,10 +167,10 @@ public: static std::vector<Rectangle> partition(const RenderContext &rCtx, int nX, int nY) { - return rCtx.mpDemoRenderer->partition(rCtx.maSize, nX, nY); + return DemoRenderer::partition(rCtx.maSize, nX, nY); } - std::vector<Rectangle> partition(Size aSize, int nX, int nY) + static std::vector<Rectangle> partition(Size aSize, int nX, int nY) { Rectangle r; std::vector<Rectangle> aRegions; @@ -210,7 +210,7 @@ public: } } - void drawBackground(OutputDevice &rDev, const Rectangle& r) + static void drawBackground(OutputDevice &rDev, const Rectangle& r) { rDev.Erase(); Gradient aGradient; @@ -353,7 +353,7 @@ public: } } - void drawText (OutputDevice &rDev, Rectangle r, bool bClip, bool bArabicText, bool bRotate) + static void drawText (OutputDevice &rDev, Rectangle r, bool bClip, bool bArabicText, bool bRotate) { rDev.SetClipRegion( vcl::Region(r) ); @@ -638,7 +638,7 @@ public: // Simulate Page Borders rendering - which ultimately should // be done with a shader / gradient - void SimulateBorderStretch(OutputDevice &rDev, const Rectangle& r) + static void SimulateBorderStretch(OutputDevice &rDev, const Rectangle& r) { static BitmapEx aPageShadowMask("sw/res/page-shadow-mask.png"); @@ -771,7 +771,7 @@ public: RENDER_AS_ALPHA_OUTDEV }; - void SizeAndRender(OutputDevice &rDev, const Rectangle& r, RenderType eType, + static void SizeAndRender(OutputDevice &rDev, const Rectangle& r, RenderType eType, const RenderContext &rCtx) { ScopedVclPtr<VirtualDevice> pNested; @@ -941,7 +941,7 @@ public: } } - BitmapEx AlphaRecovery(OutputDevice &rDev, Point aPt, BitmapEx &aSrc) + static BitmapEx AlphaRecovery(OutputDevice &rDev, Point aPt, BitmapEx &aSrc) { // Compositing onto 2x colors beyond our control ScopedVclPtrInstance< VirtualDevice > aWhite; @@ -1557,7 +1557,7 @@ class DemoPopup : public FloatingWindow class DemoApp : public Application { - int showHelp(DemoRenderer &rRenderer) + static int showHelp(DemoRenderer &rRenderer) { fprintf(stderr,"vcldemo - a VCL test app\n"); fprintf(stderr," --help - print this text\n"); |