diff options
Diffstat (limited to 'vcl/unx/generic')
-rw-r--r-- | vcl/unx/generic/app/gendisp.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/app/i18n_cb.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/app/i18n_ic.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/app/wmadaptor.cxx | 8 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.hxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/fontmanager/fontconfig.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salbmp.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/xrender_peer.hxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/glyphs/glyphcache.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/print/genprnpsp.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/generic/print/genpspgraphics.cxx | 8 | ||||
-rw-r--r-- | vcl/unx/generic/printer/cupsmgr.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 6 |
15 files changed, 30 insertions, 30 deletions
diff --git a/vcl/unx/generic/app/gendisp.cxx b/vcl/unx/generic/app/gendisp.cxx index 0c7e00bc0a12..c1cd5a23112e 100644 --- a/vcl/unx/generic/app/gendisp.cxx +++ b/vcl/unx/generic/app/gendisp.cxx @@ -97,7 +97,7 @@ void SalGenericDisplay::SendInternalEvent( SalFrame* pFrame, void* pData, SalEve PostUserEvent(); // wakeup the concrete mainloop } -void SalGenericDisplay::CancelInternalEvent( SalFrame* pFrame, void* pData, SalEvent nEvent ) +void SalGenericDisplay::CancelInternalEvent( SalFrame const * pFrame, void const * pData, SalEvent nEvent ) { osl::MutexGuard g( m_aEventGuard ); if( ! m_aUserEvents.empty() ) diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx index 9b8a51a693f3..361c6d032689 100644 --- a/vcl/unx/generic/app/i18n_cb.cxx +++ b/vcl/unx/generic/app/i18n_cb.cxx @@ -225,7 +225,7 @@ Preedit_InsertText(preedit_text_t *pText, XIMText *pInsertText, int where) // Handle the change of attributes in a preedit_draw_callback void -Preedit_UpdateAttributes ( preedit_text_t* ptext, XIMFeedback* feedback, +Preedit_UpdateAttributes ( preedit_text_t* ptext, XIMFeedback const * feedback, int from, int amount ) { if ( (from + amount) > (int)ptext->nLength ) diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx index ec2f1a5fbf7d..3def7932dbc7 100644 --- a/vcl/unx/generic/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -361,7 +361,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : // unmap it the hard way void -SalI18N_InputContext::Unmap( SalFrame* pFrame ) +SalI18N_InputContext::Unmap( SalFrame const * pFrame ) { if ( maContext != nullptr ) { @@ -590,7 +590,7 @@ SalI18N_InputContext::SetICFocus( SalFrame* pFocusFrame ) } void -SalI18N_InputContext::UnsetICFocus( SalFrame* pFrame ) +SalI18N_InputContext::UnsetICFocus( SalFrame const * pFrame ) { I18NStatus& rStatus( I18NStatus::get() ); if( rStatus.getParent() == pFrame ) diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index 85152168aa3c..701c4ffbb3a4 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -1731,7 +1731,7 @@ void GnomeWMAdaptor::enableAlwaysOnTop( X11SalFrame* pFrame, bool bEnable ) cons /* * WMAdaptor::changeReferenceFrame */ -void WMAdaptor::changeReferenceFrame( X11SalFrame* pFrame, X11SalFrame* pReferenceFrame ) const +void WMAdaptor::changeReferenceFrame( X11SalFrame* pFrame, X11SalFrame const * pReferenceFrame ) const { if( ! ( pFrame->nStyle_ & SalFrameStyleFlags::PLUG ) && ! pFrame->IsOverrideRedirect() @@ -2228,7 +2228,7 @@ void NetWMAdaptor::setUserTime( X11SalFrame* i_pFrame, long i_nUserTime ) const /* * WMAdaptor::setPID */ -void WMAdaptor::setPID( X11SalFrame* i_pFrame ) const +void WMAdaptor::setPID( X11SalFrame const * i_pFrame ) const { if( m_aWMAtoms[NET_WM_PID] ) { @@ -2248,14 +2248,14 @@ void WMAdaptor::setPID( X11SalFrame* i_pFrame ) const /* * WMAdaptor::setClientMachine */ -void WMAdaptor::setClientMachine( X11SalFrame* i_pFrame ) const +void WMAdaptor::setClientMachine( X11SalFrame const * i_pFrame ) const { OString aWmClient( OUStringToOString( GetGenericData()->GetHostname(), RTL_TEXTENCODING_ASCII_US ) ); XTextProperty aClientProp = { reinterpret_cast<unsigned char *>(const_cast<char *>(aWmClient.getStr())), XA_STRING, 8, sal::static_int_cast<unsigned long>( aWmClient.getLength() ) }; XSetWMClientMachine( m_pDisplay, i_pFrame->GetShellWindow(), &aClientProp ); } -void WMAdaptor::answerPing( X11SalFrame* i_pFrame, XClientMessageEvent* i_pEvent ) const +void WMAdaptor::answerPing( X11SalFrame const * i_pFrame, XClientMessageEvent const * i_pEvent ) const { if( m_aWMAtoms[NET_WM_PING] && i_pEvent->message_type == m_aWMAtoms[ WM_PROTOCOLS ] && diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index a4d08b8da1d0..5738e2140238 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -1878,7 +1878,7 @@ bool SelectionManager::handleReceivePropertyNotify( XPropertyEvent& rNotify ) return bHandled; } -bool SelectionManager::handleSendPropertyNotify( XPropertyEvent& rNotify ) +bool SelectionManager::handleSendPropertyNotify( XPropertyEvent const & rNotify ) { osl::MutexGuard aGuard( m_aMutex ); diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index 1aac1ab253a4..12d57a47b378 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -369,7 +369,7 @@ namespace x11 { // handle various events bool handleSelectionRequest( XSelectionRequestEvent& rRequest ); - bool handleSendPropertyNotify( XPropertyEvent& rNotify ); + bool handleSendPropertyNotify( XPropertyEvent const & rNotify ); bool handleReceivePropertyNotify( XPropertyEvent& rNotify ); bool handleSelectionNotify( XSelectionEvent& rNotify ); bool handleDragEvent( XEvent& rMessage ); diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index 3fc0ed875b47..65e5be8c244e 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -83,7 +83,7 @@ public: void clear(); public: - FcResult LocalizedElementFromPattern(FcPattern* pPattern, FcChar8 **family, + FcResult LocalizedElementFromPattern(FcPattern const * pPattern, FcChar8 **family, const char *elementtype, const char *elementlangtype); //to-do, make private and add some cleaner accessor methods std::unordered_map< OString, OString, OStringHash > m_aFontNameToLocalized; @@ -329,7 +329,7 @@ void FontCfgWrapper::cacheLocalizedFontNames(const FcChar8 *origfontname, const m_aLocalizedToCanonical[OString(reinterpret_cast<const char*>(bestfontname))] = OString(reinterpret_cast<const char*>(origfontname)); } -FcResult FontCfgWrapper::LocalizedElementFromPattern(FcPattern* pPattern, FcChar8 **element, +FcResult FontCfgWrapper::LocalizedElementFromPattern(FcPattern const * pPattern, FcChar8 **element, const char *elementtype, const char *elementlangtype) { /* e. g.: ^ FC_FAMILY ^ FC_FAMILYLANG */ FcChar8 *origelement; diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx index 7d9a1d1db526..760d03336849 100644 --- a/vcl/unx/generic/gdi/salbmp.cxx +++ b/vcl/unx/generic/gdi/salbmp.cxx @@ -403,7 +403,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( } XImage* X11SalBitmap::ImplCreateXImage( - SalDisplay *pSalDisp, + SalDisplay const *pSalDisp, SalX11Screen nScreen, long nDepth, const SalTwoRect& rTwoRect @@ -627,7 +627,7 @@ ImplSalDDB* X11SalBitmap::ImplGetDDB( } if( mpCache ) - mpCache->ImplRemove( const_cast<X11SalBitmap*>(this) ); + mpCache->ImplRemove( this ); SalTwoRect aTwoRect( rTwoRect ); if( aTwoRect.mnSrcX < 0 ) @@ -1111,7 +1111,7 @@ void ImplSalBitmapCache::ImplAdd( X11SalBitmap* pBmp ) maBmpList.push_back( new ImplBmpObj( pBmp ) ); } -void ImplSalBitmapCache::ImplRemove( X11SalBitmap* pBmp ) +void ImplSalBitmapCache::ImplRemove( X11SalBitmap const * pBmp ) { for( BmpList_impl::iterator it = maBmpList.begin(); diff --git a/vcl/unx/generic/gdi/xrender_peer.hxx b/vcl/unx/generic/gdi/xrender_peer.hxx index d7387b9f69a1..ff1d7cc963d8 100644 --- a/vcl/unx/generic/gdi/xrender_peer.hxx +++ b/vcl/unx/generic/gdi/xrender_peer.hxx @@ -46,7 +46,7 @@ public: XRenderPictFormat* FindStandardFormat(int nFormat) const; // the methods below are thin wrappers for the XRENDER API - XRenderPictFormat* FindVisualFormat( Visual* ) const; + XRenderPictFormat* FindVisualFormat( Visual const * ) const; Picture CreatePicture( Drawable, const XRenderPictFormat*, unsigned long nDrawable, const XRenderPictureAttributes* ) const; void ChangePicture( Picture, unsigned long nValueMask, @@ -74,7 +74,7 @@ inline XRenderPictFormat* XRenderPeer::FindStandardFormat(int nFormat) const return XRenderFindStandardFormat(mpDisplay, nFormat); } -inline XRenderPictFormat* XRenderPeer::FindVisualFormat( Visual* pVisual ) const +inline XRenderPictFormat* XRenderPeer::FindVisualFormat( Visual const * pVisual ) const { return XRenderFindVisualFormat ( mpDisplay, pVisual ); } diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index 6950d3b354ea..36ddf3df64cd 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -490,7 +490,7 @@ FreetypeFont::~FreetypeFont() } -void FreetypeFont::GetFontMetric(ImplFontMetricDataRef& rxTo) const +void FreetypeFont::GetFontMetric(ImplFontMetricDataRef const & rxTo) const { rxTo->FontAttributes::operator =(mpFontInfo->GetFontAttributes()); diff --git a/vcl/unx/generic/glyphs/glyphcache.cxx b/vcl/unx/generic/glyphs/glyphcache.cxx index 82bdc64bd12d..5ca4abed98fe 100644 --- a/vcl/unx/generic/glyphs/glyphcache.cxx +++ b/vcl/unx/generic/glyphs/glyphcache.cxx @@ -276,7 +276,7 @@ void GlyphCache::GarbageCollect() } } -inline void GlyphCache::UsingGlyph( GlyphData& rGlyphData ) +inline void GlyphCache::UsingGlyph( GlyphData const & rGlyphData ) { rGlyphData.SetLruValue( mnLruIndex++ ); } diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index bef1a71fea1d..40a12e5e6aa1 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -366,7 +366,7 @@ static bool createPdf( const OUString& rToFile, const OUString& rFromFile, const */ void SalGenericInstance::configurePspInfoPrinter(PspSalInfoPrinter *pPrinter, - SalPrinterQueueInfo* pQueueInfo, ImplJobSetup* pJobSetup) + SalPrinterQueueInfo const * pQueueInfo, ImplJobSetup* pJobSetup) { if( pJobSetup ) { @@ -1268,7 +1268,7 @@ class PrinterUpdate static void doUpdate(); DECL_STATIC_LINK( PrinterUpdate, UpdateTimerHdl, Timer*, void ); public: - static void update(SalGenericInstance &rInstance); + static void update(SalGenericInstance const &rInstance); static void jobStarted() { nActiveJobs++; } static void jobEnded(); }; @@ -1296,7 +1296,7 @@ IMPL_STATIC_LINK_NOARG( PrinterUpdate, UpdateTimerHdl, Timer*, void ) pPrinterUpdateIdle->Start(); } -void PrinterUpdate::update(SalGenericInstance &rInstance) +void PrinterUpdate::update(SalGenericInstance const &rInstance) { if( Application::GetSettings().GetMiscSettings().GetDisablePrinting() ) return; diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx index 9d9de0f446e0..1ebf35aefca0 100644 --- a/vcl/unx/generic/print/genpspgraphics.cxx +++ b/vcl/unx/generic/print/genpspgraphics.cxx @@ -69,8 +69,8 @@ private: Scanline mpScanAccess; sal_PtrDiff mnScanOffset; - sal_uInt32 ColorOf (BitmapColor& rColor) const; - sal_uInt8 GrayOf (BitmapColor& rColor) const; + sal_uInt32 ColorOf (BitmapColor const & rColor) const; + sal_uInt8 GrayOf (BitmapColor const & rColor) const; public: @@ -174,7 +174,7 @@ SalPrinterBmp::GetDepth () const } sal_uInt32 -SalPrinterBmp::ColorOf (BitmapColor& rColor) const +SalPrinterBmp::ColorOf (BitmapColor const & rColor) const { if (rColor.IsIndex()) return ColorOf (mpBmpBuffer->maPalette[rColor.GetIndex()]); @@ -185,7 +185,7 @@ SalPrinterBmp::ColorOf (BitmapColor& rColor) const } sal_uInt8 -SalPrinterBmp::GrayOf (BitmapColor& rColor) const +SalPrinterBmp::GrayOf (BitmapColor const & rColor) const { if (rColor.IsIndex()) return GrayOf (mpBmpBuffer->maPalette[rColor.GetIndex()]); diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index 440f33e0edba..d96a85c4a38d 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -88,7 +88,7 @@ struct GetPPDAttribs unref(); } - OString waitResult( TimeValue *pDelay ) + OString waitResult( TimeValue const *pDelay ) { m_pSyncMutex->release(); diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index cbe1ecbd7367..8140019c7e27 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -102,7 +102,7 @@ static ::Window hPresentationWindow = None, hPresFocusWindow = None; static ::std::list< ::Window > aPresentationReparentList; static int nVisibleFloats = 0; -static void doReparentPresentationDialogues( SalDisplay* pDisplay ) +static void doReparentPresentationDialogues( SalDisplay const * pDisplay ) { GetGenericData()->ErrorTrapPush(); while( !aPresentationReparentList.empty() ) @@ -308,7 +308,7 @@ static void CreateNetWmAppIcon( sal_uInt16 nIcon, NetWmIconData& netwm_icon ) netwm_icon.resize( pos ); } -static bool lcl_SelectAppIconPixmap( SalDisplay *pDisplay, SalX11Screen nXScreen, +static bool lcl_SelectAppIconPixmap( SalDisplay const *pDisplay, SalX11Screen nXScreen, sal_uInt16 nIcon, sal_uInt16 iconSize, Pixmap& icon_pixmap, Pixmap& icon_mask, NetWmIconData& netwm_icon) { @@ -3314,7 +3314,7 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent ) return True; } -long X11SalFrame::HandleFocusEvent( XFocusChangeEvent *pEvent ) +long X11SalFrame::HandleFocusEvent( XFocusChangeEvent const *pEvent ) { // ReflectionX in Windows mode changes focus while mouse is grabbed if( nVisibleFloats > 0 && GetDisplay()->getWMAdaptor()->getWindowManagerName() == "ReflectionX Windows" ) |