[Libreoffice-commits] core.git: include/vcl vcl/headless vcl/inc vcl/source vcl/unx
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Jan 23 09:44:18 UTC 2019
include/vcl/BitmapGaussianSeparableBlurFilter.hxx | 2 -
include/vcl/accel.hxx | 4 +-
include/vcl/splitwin.hxx | 2 -
include/vcl/virdev.hxx | 2 -
include/vcl/weld.hxx | 2 -
vcl/headless/svpgdi.cxx | 2 -
vcl/headless/svpinst.cxx | 2 -
vcl/inc/graphic/Manager.hxx | 2 -
vcl/inc/headless/svpgdi.hxx | 2 -
vcl/inc/headless/svpinst.hxx | 2 -
vcl/inc/impfontmetricdata.hxx | 2 -
vcl/inc/implimagetree.hxx | 2 -
vcl/inc/listbox.hxx | 2 -
vcl/inc/sallayout.hxx | 2 -
vcl/source/app/salvtables.cxx | 4 +-
vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx | 2 -
vcl/source/control/imp_listbox.cxx | 2 -
vcl/source/edit/textdoc.cxx | 2 -
vcl/source/edit/textdoc.hxx | 2 -
vcl/source/font/fontmetric.cxx | 2 -
vcl/source/gdi/CommonSalLayout.cxx | 2 -
vcl/source/gdi/impvect.cxx | 2 -
vcl/source/graphic/Manager.cxx | 2 -
vcl/source/image/ImplImageTree.cxx | 2 -
vcl/source/window/dialog.cxx | 2 -
vcl/source/window/menuitemlist.cxx | 2 -
vcl/source/window/menuitemlist.hxx | 2 -
vcl/source/window/splitwin.cxx | 2 -
vcl/source/window/syswin.cxx | 6 ++--
vcl/source/window/winproc.cxx | 4 +-
vcl/unx/generic/print/genpspgraphics.cxx | 4 +-
vcl/unx/gtk3/gtk3gtkinst.cxx | 22 ++++++++--------
32 files changed, 48 insertions(+), 48 deletions(-)
New commits:
commit d010dd58e8afd7e135c7479dcabd6986eadb664f
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Jan 23 09:08:24 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Jan 23 10:43:50 2019 +0100
loplugin:constparams in vcl
Change-Id: Icf1a952fbe190fd6c4efd89364136aa2b48050e3
Reviewed-on: https://gerrit.libreoffice.org/66767
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/vcl/BitmapGaussianSeparableBlurFilter.hxx b/include/vcl/BitmapGaussianSeparableBlurFilter.hxx
index 51e4b934fdb9..c3814e69bb95 100644
--- a/include/vcl/BitmapGaussianSeparableBlurFilter.hxx
+++ b/include/vcl/BitmapGaussianSeparableBlurFilter.hxx
@@ -36,7 +36,7 @@ public:
private:
double const mfRadius;
- static bool convolutionPass(Bitmap& rBitmap, Bitmap& aNewBitmap,
+ static bool convolutionPass(const Bitmap& rBitmap, Bitmap& aNewBitmap,
BitmapReadAccess const* pReadAcc, int aNumberOfContributions,
const double* pWeights, int const* pPixels, const int* pCount);
diff --git a/include/vcl/accel.hxx b/include/vcl/accel.hxx
index 6e0681825625..397d0adbfdbe 100644
--- a/include/vcl/accel.hxx
+++ b/include/vcl/accel.hxx
@@ -78,8 +78,8 @@ public:
Accelerator& operator=( const Accelerator& rAccel );
- static bool ToggleMnemonicsOnHierarchy(const CommandEvent& rCEvent, vcl::Window *pWindow);
- static void GenerateAutoMnemonicsOnHierarchy(vcl::Window* pWindow);
+ static bool ToggleMnemonicsOnHierarchy(const CommandEvent& rCEvent, const vcl::Window *pWindow);
+ static void GenerateAutoMnemonicsOnHierarchy(const vcl::Window* pWindow);
};
#endif // INCLUDED_VCL_ACCEL_HXX
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index 711954920c7f..022695e3f2f6 100644
--- a/include/vcl/splitwin.hxx
+++ b/include/vcl/splitwin.hxx
@@ -104,7 +104,7 @@ private:
static SAL_DLLPRIVATE sal_uInt16 ImplTestSplit( ImplSplitSet* pSet, const Point& rPos,
long& rMouseOff, ImplSplitSet** ppFoundSet, sal_uInt16& rFoundPos,
bool bRows );
- static SAL_DLLPRIVATE sal_uInt16 ImplTestSplit( SplitWindow* pWindow, const Point& rPos,
+ static SAL_DLLPRIVATE sal_uInt16 ImplTestSplit( const SplitWindow* pWindow, const Point& rPos,
long& rMouseOff, ImplSplitSet** ppFoundSet, sal_uInt16& rFoundPos );
SAL_DLLPRIVATE void ImplDrawSplitTracking(const Point& rPos);
diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx
index 48bd4ff4c507..7e9ba25dfca1 100644
--- a/include/vcl/virdev.hxx
+++ b/include/vcl/virdev.hxx
@@ -34,7 +34,7 @@ class VCL_DLLPUBLIC VirtualDevice : public OutputDevice
friend class Application;
friend class ::OutputDevice;
friend class Printer;
- friend cairo_surface_t* get_underlying_cairo_surface(VirtualDevice&);
+ friend cairo_surface_t* get_underlying_cairo_surface(const VirtualDevice&);
public:
// reference device modes for different compatibility levels
enum class RefDevMode { NONE = 0,
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index dfb99158acac..91e77ce216a4 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -893,7 +893,7 @@ class VCL_DLLPUBLIC EntryTreeView : virtual public ComboBox
private:
DECL_DLLPRIVATE_LINK(ClickHdl, weld::TreeView&, void);
DECL_DLLPRIVATE_LINK(ModifyHdl, weld::Entry&, void);
- void EntryModifyHdl(weld::Entry& rEntry);
+ void EntryModifyHdl(const weld::Entry& rEntry);
protected:
std::unique_ptr<Entry> m_xEntry;
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index ace3e53ed3ef..5f389b8468f2 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1628,7 +1628,7 @@ void SvpSalGraphics::drawBitmap(const SalTwoRect& rTR, const SalBitmap& rSourceB
copySource(rTR, source);
}
-void SvpSalGraphics::drawBitmap(const SalTwoRect& rTR, BitmapBuffer* pBuffer, cairo_operator_t eOp)
+void SvpSalGraphics::drawBitmap(const SalTwoRect& rTR, const BitmapBuffer* pBuffer, cairo_operator_t eOp)
{
cairo_surface_t* source = createCairoSurface( pBuffer );
copyWithOperator(rTR, source, eOp);
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 6562f26d5dbc..c88238665758 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -253,7 +253,7 @@ std::unique_ptr<SalVirtualDevice> SvpSalInstance::CreateVirtualDevice( SalGraphi
return pNew;
}
-cairo_surface_t* get_underlying_cairo_surface(VirtualDevice& rDevice)
+cairo_surface_t* get_underlying_cairo_surface(const VirtualDevice& rDevice)
{
return static_cast<SvpSalVirtualDevice*>(rDevice.mpVirDev.get())->GetSurface();
}
diff --git a/vcl/inc/graphic/Manager.hxx b/vcl/inc/graphic/Manager.hxx
index 88d57229f9e2..f6f24b47db6f 100644
--- a/vcl/inc/graphic/Manager.hxx
+++ b/vcl/inc/graphic/Manager.hxx
@@ -43,7 +43,7 @@ private:
Manager();
- void registerGraphic(std::shared_ptr<ImpGraphic>& rImpGraphic, OUString const& rsContext);
+ void registerGraphic(const std::shared_ptr<ImpGraphic>& rImpGraphic, OUString const& rsContext);
DECL_LINK(SwapOutTimerHandler, Timer*, void);
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 9ba284300a37..e62c508d0863 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -242,7 +242,7 @@ public:
virtual void drawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap ) override;
void drawBitmap( const SalTwoRect& rPosAry,
- BitmapBuffer* pBuffer,
+ const BitmapBuffer* pBuffer,
cairo_operator_t eOp );
virtual void drawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index b331c5cbcbad..3dbdf10f1e57 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -194,7 +194,7 @@ inline void SvpSalInstance::deregisterFrame( SalFrame* pFrame )
eraseFrame( pFrame );
}
-VCL_DLLPUBLIC cairo_surface_t* get_underlying_cairo_surface(VirtualDevice& rDevice);
+VCL_DLLPUBLIC cairo_surface_t* get_underlying_cairo_surface(const VirtualDevice& rDevice);
#endif // INCLUDED_VCL_INC_HEADLESS_SVPINST_HXX
diff --git a/vcl/inc/impfontmetricdata.hxx b/vcl/inc/impfontmetricdata.hxx
index 1c9b14a5098f..73beb59722db 100644
--- a/vcl/inc/impfontmetricdata.hxx
+++ b/vcl/inc/impfontmetricdata.hxx
@@ -97,7 +97,7 @@ public:
int nUPEM);
private:
- bool ShouldUseWinMetrics(vcl::TTGlobalFontInfo& rInfo);
+ bool ShouldUseWinMetrics(const vcl::TTGlobalFontInfo& rInfo);
// font instance attributes from the font request
long const mnHeight; // Font size
diff --git a/vcl/inc/implimagetree.hxx b/vcl/inc/implimagetree.hxx
index 1e81aba8fac8..4c23f3a2637f 100644
--- a/vcl/inc/implimagetree.hxx
+++ b/vcl/inc/implimagetree.hxx
@@ -133,7 +133,7 @@ private:
void createStyle();
- IconCache &getIconCache(ImageRequestParameters& rParameters);
+ IconCache &getIconCache(const ImageRequestParameters& rParameters);
bool iconCacheLookup(ImageRequestParameters& rParameters);
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index 8591d9696764..a13714bf1910 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -74,7 +74,7 @@ struct ImplEntryType
}
/// Computes maStr's text layout (glyphs), cached in maStrGlyphs.
- SalLayoutGlyphs* GetTextGlyphs(OutputDevice* pOutputDevice);
+ SalLayoutGlyphs* GetTextGlyphs(const OutputDevice* pOutputDevice);
};
class ImplEntryList
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index cd2b02f105aa..7e94242b4808 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -197,7 +197,7 @@ private:
GenericSalLayout( const GenericSalLayout& ) = delete;
GenericSalLayout& operator=( const GenericSalLayout& ) = delete;
- void ApplyDXArray(ImplLayoutArgs&);
+ void ApplyDXArray(const ImplLayoutArgs&);
void Justify(DeviceCoordinate nNewWidth);
void ApplyAsianKerning(const OUString& rStr);
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 4c343f85d53d..e1087b4f311c 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -591,13 +591,13 @@ namespace
return Image(StockImage::Yes, rImage);
}
- Image createImage(VirtualDevice& rDevice)
+ Image createImage(const VirtualDevice& rDevice)
{
return Image(rDevice.GetBitmapEx(Point(), rDevice.GetOutputSizePixel()));
}
void insert_to_menu(PopupMenu* pMenu, int pos, const OUString& rId, const OUString& rStr,
- const OUString* pIconName, VirtualDevice* pImageSurface, bool bCheck)
+ const OUString* pIconName, const VirtualDevice* pImageSurface, bool bCheck)
{
const auto nCount = pMenu->GetItemCount();
const sal_uInt16 nLastId = nCount ? pMenu->GetItemId(nCount-1) : 0;
diff --git a/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx b/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx
index 990a3f090056..71888f43ca25 100644
--- a/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx
+++ b/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx
@@ -83,7 +83,7 @@ BitmapEx BitmapGaussianSeparableBlurFilter::execute(BitmapEx const& rBitmapEx) c
return BitmapEx();
}
-bool BitmapGaussianSeparableBlurFilter::convolutionPass(Bitmap& rBitmap, Bitmap& aNewBitmap,
+bool BitmapGaussianSeparableBlurFilter::convolutionPass(const Bitmap& rBitmap, Bitmap& aNewBitmap,
BitmapReadAccess const* pReadAcc,
int aNumberOfContributions,
const double* pWeights, int const* pPixels,
diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx
index 41750ae91eca..1a059785994a 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -604,7 +604,7 @@ struct ImplEntryMetrics
long nImgHeight;
};
-SalLayoutGlyphs* ImplEntryType::GetTextGlyphs(OutputDevice* pOutputDevice)
+SalLayoutGlyphs* ImplEntryType::GetTextGlyphs(const OutputDevice* pOutputDevice)
{
if (maStrGlyphs.IsValid())
// Use pre-calculated result.
diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx
index b8908f0ee6c7..bca776388ee0 100644
--- a/vcl/source/edit/textdoc.cxx
+++ b/vcl/source/edit/textdoc.cxx
@@ -495,7 +495,7 @@ TextPaM TextDoc::InsertParaBreak( const TextPaM& rPaM )
return aPaM;
}
-TextPaM TextDoc::ConnectParagraphs( TextNode* pLeft, TextNode* pRight )
+TextPaM TextDoc::ConnectParagraphs( TextNode* pLeft, const TextNode* pRight )
{
sal_Int32 nPrevLen = pLeft->GetText().getLength();
pLeft->Append( *pRight );
diff --git a/vcl/source/edit/textdoc.hxx b/vcl/source/edit/textdoc.hxx
index 0130a2377f43..4bd67fc5e25d 100644
--- a/vcl/source/edit/textdoc.hxx
+++ b/vcl/source/edit/textdoc.hxx
@@ -112,7 +112,7 @@ public:
TextPaM InsertText( const TextPaM& rPaM, const OUString& rStr );
TextPaM InsertParaBreak( const TextPaM& rPaM );
- TextPaM ConnectParagraphs( TextNode* pLeft, TextNode* pRight );
+ TextPaM ConnectParagraphs( TextNode* pLeft, const TextNode* pRight );
sal_Int32 GetTextLen( const sal_Unicode* pSep, const TextSelection* pSel = nullptr ) const;
OUString GetText( const sal_Unicode* pSep ) const;
diff --git a/vcl/source/font/fontmetric.cxx b/vcl/source/font/fontmetric.cxx
index 5a5dec974c9f..36d9f7d727eb 100644
--- a/vcl/source/font/fontmetric.cxx
+++ b/vcl/source/font/fontmetric.cxx
@@ -395,7 +395,7 @@ void ImplFontMetricData::ImplInitFlags( const OutputDevice* pDev )
SetFullstopCenteredFlag( bCentered );
}
-bool ImplFontMetricData::ShouldUseWinMetrics(vcl::TTGlobalFontInfo& rInfo)
+bool ImplFontMetricData::ShouldUseWinMetrics(const vcl::TTGlobalFontInfo& rInfo)
{
if (utl::ConfigManager::IsFuzzing())
return false;
diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx
index 21d4d1c22ad3..291178af2c6e 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -616,7 +616,7 @@ void GenericSalLayout::GetCharWidths(DeviceCoordinate* pCharWidths) const
// * For any RTL glyph that has DX adjustment, insert enough Kashidas to
// fill in the added space.
-void GenericSalLayout::ApplyDXArray(ImplLayoutArgs& rArgs)
+void GenericSalLayout::ApplyDXArray(const ImplLayoutArgs& rArgs)
{
if (rArgs.mpDXArray == nullptr)
return;
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index 2b959aee204b..896182663dca 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -44,7 +44,7 @@
#define VECT_POLY_OUTLINE_INNER 4UL
#define VECT_POLY_OUTLINE_OUTER 8UL
-static void VECT_MAP( std::unique_ptr<long []> & pMapIn, std::unique_ptr<long []>& pMapOut, long nVal )
+static void VECT_MAP( const std::unique_ptr<long []> & pMapIn, const std::unique_ptr<long []>& pMapOut, long nVal )
{
pMapIn[nVal] = (nVal * 4) + 1;
pMapOut[nVal] = pMapIn[nVal] + 5;
diff --git a/vcl/source/graphic/Manager.cxx b/vcl/source/graphic/Manager.cxx
index 98ef80eebddc..c5408a62bce0 100644
--- a/vcl/source/graphic/Manager.cxx
+++ b/vcl/source/graphic/Manager.cxx
@@ -108,7 +108,7 @@ IMPL_LINK(Manager, SwapOutTimerHandler, Timer*, pTimer, void)
pTimer->Start();
}
-void Manager::registerGraphic(std::shared_ptr<ImpGraphic>& pImpGraphic,
+void Manager::registerGraphic(const std::shared_ptr<ImpGraphic>& pImpGraphic,
OUString const& /*rsContext*/)
{
// make some space first
diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx
index b6ea1196c054..ae8e29e353eb 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -485,7 +485,7 @@ void ImplImageTree::createStyle()
}
/// Find an icon cache for the right scale factor
-ImplImageTree::IconCache &ImplImageTree::getIconCache(ImageRequestParameters& rParameters)
+ImplImageTree::IconCache &ImplImageTree::getIconCache(const ImageRequestParameters& rParameters)
{
IconSet &rSet = getCurrentIconSet();
auto it = rSet.maScaledIconCaches.find(rParameters.mnScalePercentage);
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 312608347af9..af49c58ba7f7 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -199,7 +199,7 @@ vcl::Window * lastLogicalChildOfParent(const vcl::Window *pTopLevel)
return const_cast<vcl::Window *>(pChild);
}
-void Accelerator::GenerateAutoMnemonicsOnHierarchy(vcl::Window* pWindow)
+void Accelerator::GenerateAutoMnemonicsOnHierarchy(const vcl::Window* pWindow)
{
MnemonicGenerator aMnemonicGenerator;
vcl::Window* pGetChild;
diff --git a/vcl/source/window/menuitemlist.cxx b/vcl/source/window/menuitemlist.cxx
index 62127940e4e1..e05672510b7a 100644
--- a/vcl/source/window/menuitemlist.cxx
+++ b/vcl/source/window/menuitemlist.cxx
@@ -39,7 +39,7 @@ MenuItemData::~MenuItemData()
pSubMenu.disposeAndClear();
}
-SalLayoutGlyphs* MenuItemData::GetTextGlyphs(OutputDevice* pOutputDevice)
+SalLayoutGlyphs* MenuItemData::GetTextGlyphs(const OutputDevice* pOutputDevice)
{
if (aTextGlyphs.IsValid())
// Use pre-calculated result.
diff --git a/vcl/source/window/menuitemlist.hxx b/vcl/source/window/menuitemlist.hxx
index 3d91ef498489..a41dc9eaef2c 100644
--- a/vcl/source/window/menuitemlist.hxx
+++ b/vcl/source/window/menuitemlist.hxx
@@ -92,7 +92,7 @@ struct MenuItemData
~MenuItemData();
/// Computes aText's text layout (glyphs), cached in aTextGlyphs.
- SalLayoutGlyphs* GetTextGlyphs(OutputDevice* pOutputDevice);
+ SalLayoutGlyphs* GetTextGlyphs(const OutputDevice* pOutputDevice);
bool HasCheck() const
{
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index ed5b9621990a..f2201341d781 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -1033,7 +1033,7 @@ sal_uInt16 SplitWindow::ImplTestSplit( ImplSplitSet* pSet, const Point& rPos,
return 0;
}
-sal_uInt16 SplitWindow::ImplTestSplit( SplitWindow* pWindow, const Point& rPos,
+sal_uInt16 SplitWindow::ImplTestSplit( const SplitWindow* pWindow, const Point& rPos,
long& rMouseOff, ImplSplitSet** ppFoundSet, sal_uInt16& rFoundPos )
{
// Resizable SplitWindow should be treated different
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 7869b92a08a0..f743186ebebf 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -113,7 +113,7 @@ void SystemWindow::dispose()
Window::dispose();
}
-static void ImplHandleControlAccelerator( vcl::Window* pWindow, bool bShow )
+static void ImplHandleControlAccelerator( const vcl::Window* pWindow, bool bShow )
{
Control *pControl = dynamic_cast<Control*>(pWindow->ImplGetWindow());
if (pControl && pControl->GetText().indexOf('~') != -1)
@@ -125,7 +125,7 @@ static void ImplHandleControlAccelerator( vcl::Window* pWindow, bool bShow )
namespace
{
- void processChildren(vcl::Window *pParent, bool bShowAccel)
+ void processChildren(const vcl::Window *pParent, bool bShowAccel)
{
// go through its children
vcl::Window* pChild = firstLogicalChildOfParent(pParent);
@@ -157,7 +157,7 @@ namespace
}
}
-bool Accelerator::ToggleMnemonicsOnHierarchy(const CommandEvent& rCEvent, vcl::Window *pWindow)
+bool Accelerator::ToggleMnemonicsOnHierarchy(const CommandEvent& rCEvent, const vcl::Window *pWindow)
{
if (rCEvent.GetCommand() == CommandEventId::ModKeyChange && ImplGetSVData()->maNWFData.mbAutoAccel)
{
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index f58ea591b922..8fdfdede0bcd 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1869,13 +1869,13 @@ static void DelayedCloseEventLink( void* pCEvent, void* )
delete pEv;
}
-static void ImplHandleClose( vcl::Window* pWindow )
+static void ImplHandleClose( const vcl::Window* pWindow )
{
ImplSVData* pSVData = ImplGetSVData();
bool bWasPopup = false;
if( pWindow->ImplIsFloatingWindow() &&
- static_cast<FloatingWindow*>(pWindow)->ImplIsInPrivatePopupMode() )
+ static_cast<const FloatingWindow*>(pWindow)->ImplIsInPrivatePopupMode() )
{
bWasPopup = true;
}
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx
index e40b9fd5cc82..7bbe59575b36 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -537,7 +537,7 @@ ImplPspFontData::ImplPspFontData(const psp::FastPrintFontInfo& rInfo)
class PspSalLayout : public GenericSalLayout
{
public:
- PspSalLayout(psp::PrinterGfx&, FreetypeFont& rFont);
+ PspSalLayout(psp::PrinterGfx&, const FreetypeFont& rFont);
void InitFont() const final override;
@@ -551,7 +551,7 @@ private:
bool mbArtBold;
};
-PspSalLayout::PspSalLayout(::psp::PrinterGfx& rGfx, FreetypeFont& rFont)
+PspSalLayout::PspSalLayout(::psp::PrinterGfx& rGfx, const FreetypeFont& rFont)
: GenericSalLayout(*rFont.GetFontInstance())
, mrPrinterGfx(rGfx)
{
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 9b8741578b28..c6b4553d2bbd 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1184,7 +1184,7 @@ namespace
return OString(pStr, pStr ? strlen(pStr) : 0);
}
- KeyEvent GtkToVcl(GdkEventKey& rEvent)
+ KeyEvent GtkToVcl(const GdkEventKey& rEvent)
{
sal_uInt16 nKeyCode = GtkSalFrame::GetKeyCode(rEvent.keyval);
if (nKeyCode == 0)
@@ -1553,7 +1553,7 @@ public:
m_aSizeAllocateHdl.Call(Size(nWidth, nHeight));
}
- gboolean signal_key(GdkEventKey* pEvent)
+ gboolean signal_key(const GdkEventKey* pEvent)
{
if (pEvent->type == GDK_KEY_PRESS && m_aKeyPressHdl.IsSet())
{
@@ -1740,7 +1740,7 @@ namespace
return load_icon_by_name(rIconName, sIconTheme, sUILang);
}
- GdkPixbuf* load_icon_from_surface(VirtualDevice& rDevice)
+ GdkPixbuf* load_icon_from_surface(const VirtualDevice& rDevice)
{
Size aSize(rDevice.GetOutputSizePixel());
cairo_surface_t* surface = get_underlying_cairo_surface(rDevice);
@@ -1749,7 +1749,7 @@ namespace
return gdk_pixbuf_get_from_surface(surface, 0, 0, aSize.Width() * m_fXScale, aSize.Height() * m_fYScale);
}
- GtkWidget* image_new_from_virtual_device(VirtualDevice& rImageSurface)
+ GtkWidget* image_new_from_virtual_device(const VirtualDevice& rImageSurface)
{
GtkWidget* pImage = nullptr;
if (gtk_check_version(3, 20, 0) == nullptr)
@@ -1839,7 +1839,7 @@ public:
}
void insert_item(int pos, const OUString& rId, const OUString& rStr,
- const OUString* pIconName, VirtualDevice* pImageSurface,
+ const OUString* pIconName, const VirtualDevice* pImageSurface,
bool bCheck)
{
GtkWidget* pImage = nullptr;
@@ -3983,7 +3983,7 @@ private:
pThis->grab_broken(pEvent);
}
- void grab_broken(GdkEventGrabBroken *event)
+ void grab_broken(const GdkEventGrabBroken *event)
{
if (event->grab_window == nullptr)
{
@@ -4037,7 +4037,7 @@ private:
return pThis->key_press(pEvent);
}
- bool key_press(GdkEventKey* pEvent)
+ bool key_press(const GdkEventKey* pEvent)
{
if (pEvent->keyval == GDK_KEY_Escape)
{
@@ -4756,7 +4756,7 @@ namespace
return found;
}
- void insert_row(GtkListStore* pListStore, GtkTreeIter& iter, int pos, const OUString* pId, const OUString& rText, const OUString* pIconName, VirtualDevice* pDevice)
+ void insert_row(GtkListStore* pListStore, GtkTreeIter& iter, int pos, const OUString* pId, const OUString& rText, const OUString* pIconName, const VirtualDevice* pDevice)
{
if (!pIconName && !pDevice)
{
@@ -4943,7 +4943,7 @@ private:
}
void insert_row(GtkTreeIter& iter, GtkTreeIter* parent, int pos, const OUString* pId, const OUString* pText,
- const OUString* pIconName, VirtualDevice* pDevice, const OUString* pExpanderName)
+ const OUString* pIconName, const VirtualDevice* pDevice, const OUString* pExpanderName)
{
gtk_tree_store_insert_with_values(m_pTreeStore, &iter, parent, pos,
m_nTextCol, !pText ? nullptr : OUStringToOString(*pText, RTL_TEXTENCODING_UTF8).getStr(),
@@ -6409,7 +6409,7 @@ private:
SolarMutexGuard aGuard;
return pThis->signal_motion(pEvent);
}
- bool signal_motion(GdkEventMotion* pEvent)
+ bool signal_motion(const GdkEventMotion* pEvent)
{
Point aPos(pEvent->x, pEvent->y);
if (AllSettings::GetLayoutRTL())
@@ -6775,7 +6775,7 @@ private:
return pThis->signal_key_press(pEvent);
}
- bool signal_key_press(GdkEventKey* pEvent)
+ bool signal_key_press(const GdkEventKey* pEvent)
{
KeyEvent aKEvt(GtkToVcl(*pEvent));
More information about the Libreoffice-commits
mailing list