summaryrefslogtreecommitdiff
path: root/vcl/quartz
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-14 12:44:47 +0200
committerNoel Grandin <noel@peralex.com>2015-04-15 11:47:12 +0200
commit71b809959bb8f775d83dc52628448bb8b8322b28 (patch)
treef9aa4308050eb7d55611068602c0cf0e3c1b3690 /vcl/quartz
parent135907f2061550624ee1859745d94eee01849070 (diff)
remove unnecessary use of void in function declarations
ie. void f(void); becomes void f(); I used the following command to make the changes: git grep -lP '\(\s*void\s*\)' -- *.cxx \ | xargs perl -pi -w -e 's/(\w+)\s*\(\s*void\s*\)/$1\(\)/g;' and ran it for both .cxx and .hxx files. Change-Id: I314a1b56e9c14d10726e32841736b0ad5eef8ddd
Diffstat (limited to 'vcl/quartz')
-rw-r--r--vcl/quartz/CTRunData.hxx2
-rw-r--r--vcl/quartz/ctfonts.cxx8
-rw-r--r--vcl/quartz/ctfonts.hxx2
-rw-r--r--vcl/quartz/ctlayout.cxx14
-rw-r--r--vcl/quartz/salgdi.cxx4
5 files changed, 15 insertions, 15 deletions
diff --git a/vcl/quartz/CTRunData.hxx b/vcl/quartz/CTRunData.hxx
index 40c2a0a5ddd3..915146773c7e 100644
--- a/vcl/quartz/CTRunData.hxx
+++ b/vcl/quartz/CTRunData.hxx
@@ -34,7 +34,7 @@ public:
const CFIndex* m_pStringIndices;
CGPoint* m_pAdjPositions;
CTRunData(CTRunRef pRun, int start);
- ~CTRunData(void);
+ ~CTRunData();
};
#endif /* NDef CTRunData_Included */
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index 7b47cfc0f857..584ceaa4a6be 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -109,7 +109,7 @@ CoreTextStyle::CoreTextStyle( const FontSelectPattern& rFSD )
#endif
}
-CoreTextStyle::~CoreTextStyle( void )
+CoreTextStyle::~CoreTextStyle()
{
if( mpStyleDict )
CFRelease( mpStyleDict );
@@ -218,7 +218,7 @@ bool CoreTextStyle::GetGlyphOutline( sal_GlyphId aGlyphId, basegfx::B2DPolyPolyg
return true;
}
-PhysicalFontFace* CoreTextFontData::Clone( void ) const
+PhysicalFontFace* CoreTextFontData::Clone() const
{
return new CoreTextFontData( *this);
}
@@ -432,7 +432,7 @@ CoreTextFontData* SystemFontList::GetFontDataFromId( sal_IntPtr nFontId ) const
return (*it).second;
}
-bool SystemFontList::Init( void )
+bool SystemFontList::Init()
{
// enumerate available system fonts
static const int nMaxDictEntries = 8;
@@ -450,7 +450,7 @@ bool SystemFontList::Init( void )
return true;
}
-SystemFontList* GetCoretextFontList( void )
+SystemFontList* GetCoretextFontList()
{
SystemFontList* pList = new SystemFontList();
if( !pList->Init() ) {
diff --git a/vcl/quartz/ctfonts.hxx b/vcl/quartz/ctfonts.hxx
index e4b536d0ff52..b896c6a9150e 100644
--- a/vcl/quartz/ctfonts.hxx
+++ b/vcl/quartz/ctfonts.hxx
@@ -26,7 +26,7 @@
#endif
#include "sallayout.hxx"
-SystemFontList* GetCoretextFontList(void);
+SystemFontList* GetCoretextFontList();
ImplDevFontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef, bool* );
#endif // INCLUDED_VCL_QUARTZ_CTFONTS_HXX
diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index d9c823def393..b9d4f1b99b2c 100644
--- a/vcl/quartz/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
@@ -31,7 +31,7 @@ class CTLayout : public SalLayout
{
public:
explicit CTLayout( const CoreTextStyle* );
- virtual ~CTLayout( void );
+ virtual ~CTLayout();
virtual bool LayoutText( ImplLayoutArgs& ) SAL_OVERRIDE;
virtual void AdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE;
@@ -48,15 +48,15 @@ public:
virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const SAL_OVERRIDE;
virtual bool GetBoundRect( SalGraphics&, Rectangle& ) const SAL_OVERRIDE;
- virtual void InitFont( void) const SAL_OVERRIDE;
+ virtual void InitFont() const SAL_OVERRIDE;
virtual void MoveGlyph( int nStart, long nNewXPos ) SAL_OVERRIDE;
virtual void DropGlyph( int nStart ) SAL_OVERRIDE;
virtual void Simplify( bool bIsBase ) SAL_OVERRIDE;
private:
void drawCTLine(AquaSalGraphics& rAquaGraphics, CTLineRef ctline, const CoreTextStyle* const pStyle) const;
- CGPoint GetTextDrawPosition(void) const;
- bool CacheGlyphLayout(void) const;
+ CGPoint GetTextDrawPosition() const;
+ bool CacheGlyphLayout() const;
void ApplyDXArray( ImplLayoutArgs& rArgs);
const CoreTextStyle* const mpTextStyle;
@@ -312,7 +312,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
// We continue using GetDrawPosition() for non-right aligned text, to minimize
// any unforeseen side effects.
-CGPoint CTLayout::GetTextDrawPosition(void) const
+CGPoint CTLayout::GetTextDrawPosition() const
{
CGFloat fPosX, fPosY;
@@ -587,7 +587,7 @@ void CTLayout::DrawText( SalGraphics& rGraphics ) const
drawCTLine(rAquaGraphics, mpCTLine, mpTextStyle);
}
-bool CTLayout::CacheGlyphLayout(void) const // eew!
+bool CTLayout::CacheGlyphLayout() const // eew!
{
m_vRunData.release();
if(!mpCTLine)
@@ -891,7 +891,7 @@ void CTLayout::MoveGlyph( int /*nStart*/, long /*nNewXPos*/ ) {}
void CTLayout::DropGlyph( int /*nStart*/ ) {}
void CTLayout::Simplify( bool /*bIsBase*/ ) {}
-SalLayout* CoreTextStyle::GetTextLayout( void ) const
+SalLayout* CoreTextStyle::GetTextLayout() const
{
return new CTLayout( this);
}
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index 898e58d64c7a..99e10e8ec515 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -177,7 +177,7 @@ bool CoreTextFontData::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilit
return !rFontCapabilities.maUnicodeRange.empty() || !rFontCapabilities.maCodePageRange.empty();
}
-void CoreTextFontData::ReadOs2Table( void ) const
+void CoreTextFontData::ReadOs2Table() const
{
// read this only once per font
if( mbOs2Read )
@@ -204,7 +204,7 @@ void CoreTextFontData::ReadOs2Table( void ) const
// TODO: also analyze panose info, etc.
}
-void CoreTextFontData::ReadMacCmapEncoding( void ) const
+void CoreTextFontData::ReadMacCmapEncoding() const
{
// read this only once per font
if( mbCmapEncodingRead )