[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang vcl/inc vcl/osx vcl/quartz vcl/source
Stephan Bergmann
sbergman at redhat.com
Thu Aug 31 09:08:39 UTC 2017
compilerplugins/clang/constparams.cxx | 2 ++
vcl/inc/osx/a11yfocustracker.hxx | 2 +-
vcl/inc/osx/salobj.h | 2 +-
vcl/inc/quartz/salgdi.h | 2 +-
vcl/inc/sft.hxx | 2 +-
vcl/osx/HtmlFmtFlt.cxx | 2 +-
vcl/osx/HtmlFmtFlt.hxx | 2 +-
vcl/osx/PictToBmpFlt.cxx | 4 ++--
vcl/osx/PictToBmpFlt.hxx | 4 ++--
vcl/osx/a11yfocustracker.cxx | 2 +-
vcl/osx/printaccessoryview.mm | 6 +++---
vcl/osx/salobj.cxx | 2 +-
vcl/osx/salprn.cxx | 2 +-
vcl/quartz/ctfonts.cxx | 2 +-
vcl/source/fontsubset/sft.cxx | 2 +-
15 files changed, 20 insertions(+), 18 deletions(-)
New commits:
commit 20b11e8dc40a1d467dcc3dd0fa7bedde72a292bf
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 31 11:02:38 2017 +0200
...in which Johnny returns from the fair for real
and finds loplugin:constparams adapted to ObjCIvarRefExpr also
Change-Id: Ib803cd80b01ad7a0fa07bddb77a873bb323a50c0
diff --git a/compilerplugins/clang/constparams.cxx b/compilerplugins/clang/constparams.cxx
index f170552ba6de..0a52ba1c7726 100644
--- a/compilerplugins/clang/constparams.cxx
+++ b/compilerplugins/clang/constparams.cxx
@@ -493,6 +493,8 @@ bool ConstParams::checkIfCanBeConst(const Stmt* stmt, const ParmVarDecl* parmVar
return false;
} else if (isa<CXXDependentScopeMemberExpr>(parent)) {
return false;
+ } else if (isa<ObjCIvarRefExpr>(parent)) {
+ return checkIfCanBeConst(parent, parmVarDecl);
}
parent->dump();
parmVarDecl->dump();
commit a5d4179ecf35b4cd4c7d869e06932340cd24e982
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 31 11:01:22 2017 +0200
loplugin:constparams: vcl (macOS)
Change-Id: I993ab0021d0a0bee8e78975bba180355d2bfb19c
diff --git a/vcl/inc/osx/a11yfocustracker.hxx b/vcl/inc/osx/a11yfocustracker.hxx
index 9852b511680d..59f2e579c5e9 100644
--- a/vcl/inc/osx/a11yfocustracker.hxx
+++ b/vcl/inc/osx/a11yfocustracker.hxx
@@ -60,7 +60,7 @@ protected:
void toolbox_highlight_on(vcl::Window *pWindow);
// received a TOOLBOX_HIGHLIGHTOFF event for this window
- void toolbox_highlight_off(vcl::Window *pWindow);
+ void toolbox_highlight_off(vcl::Window const *pWindow);
// received a TABPAGE_ACTIVATE event for this window
void tabpage_activated(vcl::Window *pWindow);
diff --git a/vcl/inc/osx/salobj.h b/vcl/inc/osx/salobj.h
index c5d4465b2dca..25a59cf85702 100644
--- a/vcl/inc/osx/salobj.h
+++ b/vcl/inc/osx/salobj.h
@@ -51,7 +51,7 @@ public:
void setClippedPosSize();
- AquaSalObject( AquaSalFrame* pFrame, SystemWindowData* pWinData );
+ AquaSalObject( AquaSalFrame* pFrame, SystemWindowData const * pWinData );
virtual ~AquaSalObject() override;
virtual void ResetClipRegion() override;
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 6d29fccb1d6a..12356fb57767 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -88,7 +88,7 @@ public:
CoreTextStyle( const FontSelectPattern& );
~CoreTextStyle( void );
- void GetFontMetric( ImplFontMetricDataRef& ) const;
+ void GetFontMetric( ImplFontMetricDataRef const & ) const;
bool GetGlyphBoundRect(const GlyphItem&, tools::Rectangle&) const;
bool GetGlyphOutline(const GlyphItem&, basegfx::B2DPolyPolygon&) const;
hb_font_t* GetHbFont() const { return mpHbFont; }
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index 76234a9bc0fc..546e97e4cf52 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -423,7 +423,7 @@ namespace vcl
* @return glyph ID, if the character is missing in the font, the return value is 0.
* @ingroup sft
*/
- sal_uInt16 MapChar(TrueTypeFont *ttf, sal_uInt16 ch);
+ sal_uInt16 MapChar(TrueTypeFont const *ttf, sal_uInt16 ch);
#endif
/**
diff --git a/vcl/osx/HtmlFmtFlt.cxx b/vcl/osx/HtmlFmtFlt.cxx
index e068a45b4142..8431a5513a04 100644
--- a/vcl/osx/HtmlFmtFlt.cxx
+++ b/vcl/osx/HtmlFmtFlt.cxx
@@ -78,7 +78,7 @@ const std::string TAG_END_HTML = std::string("</html>");
const std::string TAG_BODY = std::string("<body");
const std::string TAG_END_BODY = std::string("</body");
-Sequence<sal_Int8> SAL_CALL TextHtmlToHTMLFormat(Sequence<sal_Int8>& aTextHtml)
+Sequence<sal_Int8> SAL_CALL TextHtmlToHTMLFormat(Sequence<sal_Int8> const & aTextHtml)
{
OSL_ASSERT(aTextHtml.getLength() > 0);
diff --git a/vcl/osx/HtmlFmtFlt.hxx b/vcl/osx/HtmlFmtFlt.hxx
index 38ee4c4face8..650d5ba5ff9d 100644
--- a/vcl/osx/HtmlFmtFlt.hxx
+++ b/vcl/osx/HtmlFmtFlt.hxx
@@ -24,7 +24,7 @@
/* Transform plain HTML into the format expected by MS Office.
*/
-css::uno::Sequence<sal_Int8> TextHtmlToHTMLFormat(css::uno::Sequence<sal_Int8>& aTextHtml);
+css::uno::Sequence<sal_Int8> TextHtmlToHTMLFormat(css::uno::Sequence<sal_Int8> const & aTextHtml);
/* Transform the MS Office HTML format into plain HTML.
*/
diff --git a/vcl/osx/PictToBmpFlt.cxx b/vcl/osx/PictToBmpFlt.cxx
index df321c364073..796a119811ba 100644
--- a/vcl/osx/PictToBmpFlt.cxx
+++ b/vcl/osx/PictToBmpFlt.cxx
@@ -25,7 +25,7 @@
#include "PictToBmpFlt.hxx"
-bool ImageToPNG( css::uno::Sequence<sal_Int8>& rImgData,
+bool ImageToPNG( css::uno::Sequence<sal_Int8> const & rImgData,
css::uno::Sequence<sal_Int8>& rPngData)
{
NSData* pData = [NSData dataWithBytesNoCopy: const_cast<sal_Int8 *>(rImgData.getConstArray()) length: rImgData.getLength() freeWhenDone: 0];
@@ -46,7 +46,7 @@ bool ImageToPNG( css::uno::Sequence<sal_Int8>& rImgData,
return (nPngSize > 0);
}
-bool PNGToImage( css::uno::Sequence<sal_Int8>& rPngData,
+bool PNGToImage( css::uno::Sequence<sal_Int8> const & rPngData,
css::uno::Sequence<sal_Int8>& rImgData,
NSBitmapImageFileType eOutFormat
)
diff --git a/vcl/osx/PictToBmpFlt.hxx b/vcl/osx/PictToBmpFlt.hxx
index 5e2671f7e22e..027bd178bc3a 100644
--- a/vcl/osx/PictToBmpFlt.hxx
+++ b/vcl/osx/PictToBmpFlt.hxx
@@ -26,10 +26,10 @@
#include <Cocoa/Cocoa.h>
#include <postmac.h>
-bool ImageToPNG( css::uno::Sequence<sal_Int8>& rImgData,
+bool ImageToPNG( css::uno::Sequence<sal_Int8> const & rImgData,
css::uno::Sequence<sal_Int8>& rPngData);
-bool PNGToImage( css::uno::Sequence<sal_Int8>& rPngData,
+bool PNGToImage( css::uno::Sequence<sal_Int8> const & rPngData,
css::uno::Sequence<sal_Int8>& rImgData,
NSBitmapImageFileType eOutFormat);
diff --git a/vcl/osx/a11yfocustracker.cxx b/vcl/osx/a11yfocustracker.cxx
index dc42f3e30ff6..fdc00b78b2b0 100644
--- a/vcl/osx/a11yfocustracker.cxx
+++ b/vcl/osx/a11yfocustracker.cxx
@@ -173,7 +173,7 @@ void AquaA11yFocusTracker::toolbox_highlight_on(vcl::Window *pWindow)
notify_toolbox_item_focus(static_cast <ToolBox *> (pWindow));
}
-void AquaA11yFocusTracker::toolbox_highlight_off(vcl::Window *pWindow)
+void AquaA11yFocusTracker::toolbox_highlight_off(vcl::Window const *pWindow)
{
ToolBox* pToolBoxParent = dynamic_cast< ToolBox * >( pWindow->GetParent() );
diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm
index 9c8f684c4275..c0f882f4abc5 100644
--- a/vcl/osx/printaccessoryview.mm
+++ b/vcl/osx/printaccessoryview.mm
@@ -653,7 +653,7 @@ static void addSubgroup( NSView* pCurParent, long& rCurY, const rtl::OUString& r
rCurY = aTextRect.origin.y - 5;
}
-static void addBool( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachOffset,
+static void addBool( NSView* pCurParent, long rCurX, long& rCurY, long nAttachOffset,
const rtl::OUString& rText, bool bEnabled,
const rtl::OUString& rProperty, bool bValue,
std::vector<ColumnItem >& rRightColumn,
@@ -696,7 +696,7 @@ static void addBool( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
rCurY = aCheckRect.origin.y - 5;
}
-static void addRadio( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachOffset,
+static void addRadio( NSView* pCurParent, long rCurX, long& rCurY, long nAttachOffset,
const rtl::OUString& rText,
const rtl::OUString& rProperty, Sequence<rtl::OUString> const & rChoices, sal_Int32 nSelectValue,
std::vector<ColumnItem >& rLeftColumn,
@@ -832,7 +832,7 @@ static void addList( NSView* pCurParent, long& rCurX, long& rCurY, long /*nAttac
rCurY = aBtnRect.origin.y - 5;
}
-static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachOffset,
+static void addEdit( NSView* pCurParent, long rCurX, long& rCurY, long nAttachOffset,
const rtl::OUString& rCtrlType,
const rtl::OUString& rText,
const rtl::OUString& rProperty, const PropertyValue* pValue,
diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx
index 957f017363fc..b8435d3b4368 100644
--- a/vcl/osx/salobj.cxx
+++ b/vcl/osx/salobj.cxx
@@ -29,7 +29,7 @@
#include <AppKit/NSOpenGLView.h>
-AquaSalObject::AquaSalObject( AquaSalFrame* pFrame, SystemWindowData* pWindowData ) :
+AquaSalObject::AquaSalObject( AquaSalFrame* pFrame, SystemWindowData const * pWindowData ) :
mpFrame( pFrame ),
mnClipX( -1 ),
mnClipY( -1 ),
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index 7d48ffa99d16..2f8a84ed6c92 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -328,7 +328,7 @@ void AquaSalInfoPrinter::GetPageInfo( const ImplJobSetup*,
}
}
-static Size getPageSize( vcl::PrinterController& i_rController, sal_Int32 i_nPage )
+static Size getPageSize( vcl::PrinterController const & i_rController, sal_Int32 i_nPage )
{
Size aPageSize;
uno::Sequence< PropertyValue > aPageParms( i_rController.getPageParameters( i_nPage ) );
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index e235c5d223b9..9c2acbd2de01 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -110,7 +110,7 @@ CoreTextStyle::~CoreTextStyle()
hb_font_destroy( mpHbFont );
}
-void CoreTextStyle::GetFontMetric( ImplFontMetricDataRef& rxFontMetric ) const
+void CoreTextStyle::GetFontMetric( ImplFontMetricDataRef const & rxFontMetric ) const
{
// get the matching CoreText font handle
// TODO: is it worth it to cache the CTFontRef in SetFont() and reuse it here?
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 027e0c4238bd..2f44b0fbcdf2 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2288,7 +2288,7 @@ int CreateT42FromTTGlyphs(TrueTypeFont *ttf,
}
#if defined(_WIN32) || defined(MACOSX) || defined(IOS)
-sal_uInt16 MapChar(TrueTypeFont *ttf, sal_uInt16 ch)
+sal_uInt16 MapChar(TrueTypeFont const *ttf, sal_uInt16 ch)
{
switch (ttf->cmapType) {
case CMAP_MS_Symbol:
More information about the Libreoffice-commits
mailing list