diff options
Diffstat (limited to 'vcl/unx')
25 files changed, 45 insertions, 45 deletions
diff --git a/vcl/unx/generic/app/keysymnames.cxx b/vcl/unx/generic/app/keysymnames.cxx index e39af7c63547..8e5788275263 100644 --- a/vcl/unx/generic/app/keysymnames.cxx +++ b/vcl/unx/generic/app/keysymnames.cxx @@ -41,7 +41,7 @@ namespace vcl_sal { struct KeysymNameReplacement { - KeySym aSymbol; + KeySym const aSymbol; const char* pName; }; @@ -49,7 +49,7 @@ namespace vcl_sal { { const char* pLangName; const KeysymNameReplacement* pReplacements; - int nReplacements; + int const nReplacements; }; // CAUTION CAUTION CAUTION diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 9d87117db531..bd2b9d080611 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -156,9 +156,9 @@ extern "C" srv_vendor_t sal_GetServerVendor( Display *p_display ) { typedef struct { - srv_vendor_t e_vendor; // vendor as enum + srv_vendor_t const e_vendor; // vendor as enum const char *p_name; // vendor name as returned by VendorString() - unsigned int n_len; // number of chars to compare + unsigned int const n_len; // number of chars to compare } vendor_t; const vendor_t p_vendorlist[] = { diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx index beee3216bb51..061bc32f6f59 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.hxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx @@ -43,7 +43,7 @@ namespace x11 { rtl::Reference<SelectionManager> m_xSelectionManager; ::std::vector< css::uno::Reference< css::datatransfer::clipboard::XClipboardListener > > m_aListeners; - Atom m_aSelection; + Atom const m_aSelection; X11Clipboard( SelectionManager& rManager, Atom aSelection ); diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.hxx b/vcl/unx/generic/dtrans/X11_dndcontext.hxx index 276a21fe765f..2be3c99fe77c 100644 --- a/vcl/unx/generic/dtrans/X11_dndcontext.hxx +++ b/vcl/unx/generic/dtrans/X11_dndcontext.hxx @@ -36,7 +36,7 @@ namespace x11 { class DropTargetDropContext : public ::cppu::WeakImplHelper<css::datatransfer::dnd::XDropTargetDropContext> { - ::Window m_aDropWindow; + ::Window const m_aDropWindow; rtl::Reference<SelectionManager> m_xManager; public: DropTargetDropContext( ::Window, SelectionManager& ); @@ -51,7 +51,7 @@ namespace x11 { class DropTargetDragContext : public ::cppu::WeakImplHelper<css::datatransfer::dnd::XDropTargetDragContext> { - ::Window m_aDropWindow; + ::Window const m_aDropWindow; rtl::Reference<SelectionManager> m_xManager; public: DropTargetDragContext( ::Window, SelectionManager& ); @@ -65,7 +65,7 @@ namespace x11 { class DragSourceContext : public ::cppu::WeakImplHelper<css::datatransfer::dnd::XDragSourceContext> { - ::Window m_aDropWindow; + ::Window const m_aDropWindow; rtl::Reference<SelectionManager> m_xManager; public: DragSourceContext( ::Window, SelectionManager& ); diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 5e1c1b3754be..38a2822e049a 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -113,7 +113,7 @@ struct NativeTypeEntry Atom nAtom; const char* pType; // Mime encoding on our side const char* pNativeType; // string corresponding to nAtom for the case of nAtom being uninitialized - int nFormat; // the corresponding format + int const nFormat; // the corresponding format }; // the convention for Xdnd is mime types as specified by the corresponding diff --git a/vcl/unx/generic/dtrans/X11_transferable.hxx b/vcl/unx/generic/dtrans/X11_transferable.hxx index 5c4c77824521..f2a5b67b665c 100644 --- a/vcl/unx/generic/dtrans/X11_transferable.hxx +++ b/vcl/unx/generic/dtrans/X11_transferable.hxx @@ -31,7 +31,7 @@ namespace x11 { class X11Transferable : public ::cppu::WeakImplHelper< css::datatransfer::XTransferable > { SelectionManager& m_rManager; - Atom m_aSelection; + Atom const m_aSelection; public: X11Transferable( SelectionManager& rManager, Atom selection ); virtual ~X11Transferable() override; diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx index 336bb815e3d2..b2e3862cefdb 100644 --- a/vcl/unx/generic/fontmanager/fontmanager.cxx +++ b/vcl/unx/generic/fontmanager/fontmanager.cxx @@ -858,8 +858,8 @@ FontFamily PrintFontManager::matchFamilyName( const OUString& rFamily ) { typedef struct { const char* mpName; - sal_uInt16 mnLength; - FontFamily meType; + sal_uInt16 const mnLength; + FontFamily const meType; } family_t; #define InitializeClass( p, a ) p, sizeof(p) - 1, a diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx index 2c5261fb75b2..edac964b8336 100644 --- a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx +++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx @@ -39,8 +39,8 @@ namespace cairo { explicit X11SysData( const SystemEnvData& ); void* pDisplay; // the relevant display connection - long hDrawable; // a drawable - void* pVisual; // the visual in use + long const hDrawable; // a drawable + void* const pVisual; // the visual in use int nScreen; // the current screen of the drawable void* pRenderFormat; // render format for drawable }; @@ -48,8 +48,8 @@ namespace cairo { /// RAII wrapper for a pixmap struct X11Pixmap { - void* mpDisplay; // the relevant display connection - long mhDrawable; // a drawable + void* const mpDisplay; // the relevant display connection + long const mhDrawable; // a drawable X11Pixmap( long hDrawable, void* pDisplay ) : mpDisplay(pDisplay), @@ -64,8 +64,8 @@ namespace cairo { class X11Surface : public Surface { const X11SysData maSysData; - X11PixmapSharedPtr mpPixmap; - CairoSurfaceSharedPtr mpSurface; + X11PixmapSharedPtr const mpPixmap; + CairoSurfaceSharedPtr const mpSurface; X11Surface( const X11SysData& rSysData, const X11PixmapSharedPtr& rPixmap, const CairoSurfaceSharedPtr& pSurface ); diff --git a/vcl/unx/generic/gdi/xrender_peer.hxx b/vcl/unx/generic/gdi/xrender_peer.hxx index 785292223489..492924889595 100644 --- a/vcl/unx/generic/gdi/xrender_peer.hxx +++ b/vcl/unx/generic/gdi/xrender_peer.hxx @@ -38,7 +38,7 @@ private: XRenderPeer(); void InitRenderLib(); - Display* mpDisplay; + Display* const mpDisplay; XRenderPictFormat* mpStandardFormatA8; public: diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index 6fb0c7e8b21d..4a65c2b4b6b4 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -756,7 +756,7 @@ private: mpFlagAry; FT_Vector maPosition; - sal_uInt16 mnMaxPoints; + sal_uInt16 const mnMaxPoints; sal_uInt16 mnPoints; sal_uInt16 mnPoly; bool bHasOffline; diff --git a/vcl/unx/generic/print/bitmap_gfx.cxx b/vcl/unx/generic/print/bitmap_gfx.cxx index b11b8a728f95..b34bdfd511d9 100644 --- a/vcl/unx/generic/print/bitmap_gfx.cxx +++ b/vcl/unx/generic/print/bitmap_gfx.cxx @@ -61,7 +61,7 @@ class HexEncoder : public ByteEncoder { private: - osl::File* mpFile; + osl::File* const mpFile; sal_uInt32 mnColumn; sal_uInt32 mnOffset; sal_Char mpFileBuffer[nBufferSize + 16]; @@ -127,7 +127,7 @@ class Ascii85Encoder : public ByteEncoder { private: - osl::File* mpFile; + osl::File* const mpFile; sal_uInt32 mnByte; sal_uInt8 mpByteBuffer[4]; @@ -277,9 +277,9 @@ private: std::array<LZWCTreeNode, 4096> mpTable; // LZW compression data LZWCTreeNode* mpPrefix; // the compression is as same as the TIFF compression - sal_uInt16 mnDataSize; - sal_uInt16 mnClearCode; - sal_uInt16 mnEOICode; + sal_uInt16 const mnDataSize; + sal_uInt16 const mnClearCode; + sal_uInt16 const mnEOICode; sal_uInt16 mnTableSize; sal_uInt16 mnCodeSize; sal_uInt32 mnOffset; diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index 19d38d65341d..8ccbfafb75a0 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -976,8 +976,8 @@ struct PDFNewJobParameters struct PDFPrintFile { - OUString maTmpURL; - PDFNewJobParameters maParameters; + OUString const maTmpURL; + PDFNewJobParameters const maParameters; PDFPrintFile( const OUString& i_rURL, const PDFNewJobParameters& i_rNewParameters ) : maTmpURL( i_rURL ) diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx index 3a8f951ea03a..f74ecffdb990 100644 --- a/vcl/unx/generic/print/genpspgraphics.cxx +++ b/vcl/unx/generic/print/genpspgraphics.cxx @@ -521,7 +521,7 @@ void GenPspGraphics::invert(long,long,long,long,SalInvert) class ImplPspFontData : public FreetypeFontFace { private: - sal_IntPtr mnFontId; + sal_IntPtr const mnFontId; public: explicit ImplPspFontData( const psp::FastPrintFontInfo& ); diff --git a/vcl/unx/generic/print/glyphset.hxx b/vcl/unx/generic/print/glyphset.hxx index 7c058dd3fc16..52f7052bd710 100644 --- a/vcl/unx/generic/print/glyphset.hxx +++ b/vcl/unx/generic/print/glyphset.hxx @@ -40,8 +40,8 @@ class GlyphSet { private: - sal_Int32 mnFontID; - bool mbVertical; + sal_Int32 const mnFontID; + bool const mbVertical; OString maBaseName; typedef std::unordered_map< sal_GlyphId, sal_uInt8 > glyph_map_t; diff --git a/vcl/unx/generic/print/prtsetup.hxx b/vcl/unx/generic/print/prtsetup.hxx index d9f2f67df911..0685f80aa2b9 100644 --- a/vcl/unx/generic/print/prtsetup.hxx +++ b/vcl/unx/generic/print/prtsetup.hxx @@ -36,7 +36,7 @@ class RTSDialog : public weld::GenericDialogController ::psp::PrinterInfo m_aJobData; // some resources - OUString m_aInvalidString; + OUString const m_aInvalidString; bool m_bDataModified; // controls diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index 127bbf1b3670..8ac756342f37 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -959,8 +959,8 @@ struct SystemCommandParameters const char* pPrintCommand; const char* pForeToken; const char* pAftToken; - unsigned int nForeTokenCount; - tokenHandler pHandler; + unsigned int const nForeTokenCount; + tokenHandler const pHandler; }; #if ! (defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD)) diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx b/vcl/unx/gtk/a11y/atkhypertext.cxx index d566f441eee5..348d400cab1d 100644 --- a/vcl/unx/gtk/a11y/atkhypertext.cxx +++ b/vcl/unx/gtk/a11y/atkhypertext.cxx @@ -26,7 +26,7 @@ using namespace ::com::sun::star; // ---------------------- AtkHyperlink ---------------------- typedef struct { - AtkHyperlink atk_hyper_link; + AtkHyperlink const atk_hyper_link; uno::Reference< accessibility::XAccessibleHyperlink > xLink; } HyperLink; diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx index 5582215b8cb4..018a755fd234 100644 --- a/vcl/unx/gtk/a11y/atktextattributes.cxx +++ b/vcl/unx/gtk/a11y/atktextattributes.cxx @@ -1303,7 +1303,7 @@ AtkAttributeSet* attribute_set_prepend_tracked_change_formatchange( AtkAttribute struct AtkTextAttrMapping { const char * name; - TextPropertyValueFunc toPropertyValue; + TextPropertyValueFunc const toPropertyValue; }; const AtkTextAttrMapping g_TextAttrMap[] = diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx index e72275e77466..63a9cc53a118 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.cxx +++ b/vcl/unx/gtk/a11y/atkwrapper.cxx @@ -697,8 +697,8 @@ typedef GType (* GetGIfaceType ) (void); } const struct { const char *name; - GInterfaceInitFunc aInit; - GetGIfaceType aGetGIfaceType; + GInterfaceInitFunc const aInit; + GetGIfaceType const aGetGIfaceType; const uno::Type & (*aGetUnoType) (); } aTypeTable[] = { // re-location heaven: diff --git a/vcl/unx/gtk/a11y/atkwrapper.hxx b/vcl/unx/gtk/a11y/atkwrapper.hxx index 381f3c074fdf..ef33397fa48c 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.hxx +++ b/vcl/unx/gtk/a11y/atkwrapper.hxx @@ -46,7 +46,7 @@ namespace com { namespace sun { namespace star { namespace accessibility { struct AtkObjectWrapper { - AtkObject aParent; + AtkObject const aParent; AtkObject* mpOrig; //if we're a GtkDrawingArea acting as a custom LibreOffice widget, this is the toolkit default impl css::uno::Reference<css::accessibility::XAccessible> mpAccessible; @@ -77,7 +77,7 @@ struct AtkObjectWrapperClass #if GTK_CHECK_VERSION(3,0,0) GtkWidgetAccessibleClass aParentClass; #else - AtkObjectClass aParentClass; + AtkObjectClass const aParentClass; #endif }; diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx index d951bb3aa542..d5db18d6fcf4 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx @@ -202,8 +202,8 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base gulong mHID_Preview; GtkWidget* m_pPreview; GtkFileFilter* m_pPseudoFilter; - sal_Int32 m_PreviewImageWidth; - sal_Int32 m_PreviewImageHeight; + sal_Int32 const m_PreviewImageWidth; + sal_Int32 const m_PreviewImageHeight; GtkWidget *getWidget( sal_Int16 nControlId, GType *pType = nullptr); diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx index b31d21aa656c..a8e6f247acd4 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx @@ -79,7 +79,7 @@ class RunDialog : { private: osl::Mutex maLock; - GtkWidget *mpDialog; + GtkWidget * const mpDialog; bool mbTerminateDesktop; css::uno::Reference<css::awt::XExtendedToolkit> mxToolkit; css::uno::Reference<css::frame::XDesktop> mxDesktop; diff --git a/vcl/unx/gtk/fpicker/resourceprovider.cxx b/vcl/unx/gtk/fpicker/resourceprovider.cxx index 2ced7277066c..745521ac596a 100644 --- a/vcl/unx/gtk/fpicker/resourceprovider.cxx +++ b/vcl/unx/gtk/fpicker/resourceprovider.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds; static const struct { - sal_Int32 ctrlId; + sal_Int32 const ctrlId; const char *resId; } CtrlIdToResIdTable[] = { { CHECKBOX_AUTOEXTENSION, STR_FPICKER_AUTO_EXTENSION }, diff --git a/vcl/unx/gtk/glomenu.cxx b/vcl/unx/gtk/glomenu.cxx index 06dadee7c59d..4ba8f3f8587c 100644 --- a/vcl/unx/gtk/glomenu.cxx +++ b/vcl/unx/gtk/glomenu.cxx @@ -17,7 +17,7 @@ struct GLOMenu { - GMenuModel parent_instance; + GMenuModel const parent_instance; GArray *items; }; diff --git a/vcl/unx/gtk3/cairo_gtk3_cairo.hxx b/vcl/unx/gtk3/cairo_gtk3_cairo.hxx index 1f9333191c63..f333702761b0 100644 --- a/vcl/unx/gtk3/cairo_gtk3_cairo.hxx +++ b/vcl/unx/gtk3/cairo_gtk3_cairo.hxx @@ -24,7 +24,7 @@ namespace cairo { class Gtk3Surface : public Surface { const GtkSalGraphics* mpGraphics; - cairo_t* cr; + cairo_t* const cr; CairoSurfaceSharedPtr mpSurface; public: /// takes over ownership of passed cairo_surface |