summaryrefslogtreecommitdiff
path: root/vcl
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
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')
-rw-r--r--vcl/generic/glyphs/gcach_ftyp.cxx2
-rw-r--r--vcl/generic/glyphs/gcach_layout.cxx4
-rw-r--r--vcl/inc/fontsubset.hxx4
-rw-r--r--vcl/inc/generic/glyphcache.hxx2
-rw-r--r--vcl/inc/salframe.hxx2
-rw-r--r--vcl/inc/unx/gtk/atkbridge.hxx4
-rw-r--r--vcl/inc/unx/gtk/gtkframe.hxx4
-rw-r--r--vcl/osx/salframe.cxx2
-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
-rw-r--r--vcl/source/filter/ixpm/xpmread.cxx2
-rw-r--r--vcl/source/filter/ixpm/xpmread.hxx2
-rw-r--r--vcl/source/font/PhysicalFontCollection.cxx2
-rw-r--r--vcl/source/fontsubset/cff.cxx60
-rw-r--r--vcl/source/fontsubset/list.cxx2
-rw-r--r--vcl/source/fontsubset/ttcr.cxx8
-rw-r--r--vcl/source/fontsubset/ttcr.hxx6
-rw-r--r--vcl/source/fontsubset/xlat.cxx8
-rw-r--r--vcl/source/gdi/bmpfast.cxx2
-rw-r--r--vcl/unx/generic/app/saldata.cxx6
-rw-r--r--vcl/unx/generic/gdi/cairotextrender.cxx2
-rw-r--r--vcl/unx/gtk/a11y/atkbridge.cxx2
-rw-r--r--vcl/unx/gtk/a11y/atkfactory.cxx6
-rw-r--r--vcl/unx/gtk/a11y/atkfactory.hxx2
-rw-r--r--vcl/unx/gtk/a11y/atkhypertext.cxx2
-rw-r--r--vcl/unx/gtk/a11y/atkutil.cxx6
-rw-r--r--vcl/unx/gtk/a11y/atkutil.hxx2
-rw-r--r--vcl/unx/gtk/a11y/atkwindow.cxx4
-rw-r--r--vcl/unx/gtk/a11y/atkwindow.hxx4
-rw-r--r--vcl/unx/gtk/a11y/atkwrapper.cxx2
-rw-r--r--vcl/unx/gtk/a11y/atkwrapper.hxx2
-rw-r--r--vcl/unx/gtk/app/gtkinst.cxx4
-rw-r--r--vcl/unx/gtk/app/gtksys.cxx2
-rw-r--r--vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx4
-rw-r--r--vcl/unx/gtk/window/gloactiongroup.cxx2
-rw-r--r--vcl/unx/gtk/window/glomenu.cxx2
-rw-r--r--vcl/unx/gtk/window/gtksalframe.cxx2
-rw-r--r--vcl/unx/kde/fpicker/kdefilepicker.hxx6
-rw-r--r--vcl/unx/kde/salnativewidgets-kde.cxx8
-rw-r--r--vcl/win/source/gdi/salnativewidgets-luna.cxx8
-rw-r--r--vcl/win/source/gdi/winlayout.hxx2
44 files changed, 113 insertions, 113 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index e7c73023452c..d6a2116321f8 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -980,7 +980,7 @@ void ServerFont::InitGlyphData( sal_GlyphId aGlyphId, GlyphData& rGD ) const
FT_Done_Glyph( pGlyphFT );
}
-bool ServerFont::GetAntialiasAdvice( void ) const
+bool ServerFont::GetAntialiasAdvice() const
{
if( GetFontSelData().mbNonAntialiased || (mnPrioAntiAlias<=0) )
return false;
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx
index 4f98620893e8..4a17997b6de2 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -270,7 +270,7 @@ static hb_bool_t getGlyphContourPoint(hb_font_t* /*font*/, void* pFontData,
return ret;
}
-static hb_font_funcs_t* getFontFuncs(void)
+static hb_font_funcs_t* getFontFuncs()
{
static hb_font_funcs_t* funcs = hb_font_funcs_create();
@@ -296,7 +296,7 @@ static unsigned int unicodeDecomposeCompatibility(hb_unicode_funcs_t* /*ufuncs*/
return 0;
}
-static hb_unicode_funcs_t* getUnicodeFuncs(void)
+static hb_unicode_funcs_t* getUnicodeFuncs()
{
static hb_unicode_funcs_t* ufuncs = hb_unicode_funcs_create(hb_icu_get_unicode_funcs());
hb_unicode_funcs_set_decompose_compatibility_func(ufuncs, unicodeDecomposeCompatibility, NULL, NULL);
diff --git a/vcl/inc/fontsubset.hxx b/vcl/inc/fontsubset.hxx
index c571658f01e4..a92b70519638 100644
--- a/vcl/inc/fontsubset.hxx
+++ b/vcl/inc/fontsubset.hxx
@@ -32,8 +32,8 @@ namespace vcl { struct _TrueTypeFont; } ///< SFT's idea of a TTF font
class VCL_DLLPUBLIC FontSubsetInfo
{
public:
- explicit FontSubsetInfo( void );
- virtual ~FontSubsetInfo( void );
+ explicit FontSubsetInfo();
+ virtual ~FontSubsetInfo();
enum FontType {
NO_FONT = 0,
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index ae9e30b9c59a..c7c21233646b 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -200,7 +200,7 @@ public:
sal_GlyphId GetRawGlyphIndex( sal_UCS4, sal_UCS4 = 0 ) const;
sal_GlyphId FixupGlyphIndex( sal_GlyphId aGlyphId, sal_UCS4 ) const;
bool GetGlyphOutline( sal_GlyphId aGlyphId, ::basegfx::B2DPolyPolygon& ) const;
- bool GetAntialiasAdvice( void ) const;
+ bool GetAntialiasAdvice() const;
bool GetGlyphBitmap1( sal_GlyphId aGlyphId, RawBitmap& ) const;
bool GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& ) const;
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index 6bbcb29f658f..6d54ca9a0864 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -166,7 +166,7 @@ public:
virtual void SetPointerPos( long nX, long nY ) = 0;
// flush output buffer
- virtual void Flush( void) = 0;
+ virtual void Flush() = 0;
virtual void Flush( const Rectangle& );
// flush output buffer, wait till outstanding operations are done
virtual void Sync() = 0;
diff --git a/vcl/inc/unx/gtk/atkbridge.hxx b/vcl/inc/unx/gtk/atkbridge.hxx
index 480ce917fc5e..7efe4c6cb4d8 100644
--- a/vcl/inc/unx/gtk/atkbridge.hxx
+++ b/vcl/inc/unx/gtk/atkbridge.hxx
@@ -22,8 +22,8 @@
#include <vclpluginapi.h>
-bool VCLPLUG_GTK_PUBLIC InitAtkBridge(void);
-void VCLPLUG_GTK_PUBLIC DeInitAtkBridge(void);
+bool VCLPLUG_GTK_PUBLIC InitAtkBridge();
+void VCLPLUG_GTK_PUBLIC DeInitAtkBridge();
#endif
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 2eb0634cc51d..58b9aa5e563d 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -365,7 +365,7 @@ public:
virtual void SetTitle( const OUString& rTitle ) SAL_OVERRIDE;
virtual void SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE;
virtual void SetMenu( SalMenu *pSalMenu ) SAL_OVERRIDE;
- SalMenu* GetMenu( void );
+ SalMenu* GetMenu();
virtual void DrawMenuBar() SAL_OVERRIDE;
void EnsureAppMenuWatch();
@@ -457,7 +457,7 @@ public:
extern "C" {
-GType ooo_fixed_get_type( void );
+GType ooo_fixed_get_type();
} // extern "C"
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index da85f00ca705..beb188df8de0 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -863,7 +863,7 @@ void AquaSalFrame::SetPointerPos( long nX, long nY )
CGDisplayMoveCursorToPoint( mainDisplayID, aPoint );
}
-void AquaSalFrame::Flush( void )
+void AquaSalFrame::Flush()
{
if( !(mbGraphics && mpGraphics && mpNSView && mbShown) )
return;
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 )
diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx
index 05d4d0f146bf..338069b0b2b1 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -539,7 +539,7 @@ bool XPMReader::ImplGetPara ( sal_uLong nNumb )
// mnStringSize contains the size of the string read.
// Comments like '//' and '/*....*/' are skipped.
-bool XPMReader::ImplGetString( void )
+bool XPMReader::ImplGetString()
{
sal_uInt8 sID[] = "/* XPM */";
sal_uInt8* pString = mpStringBuf;
diff --git a/vcl/source/filter/ixpm/xpmread.hxx b/vcl/source/filter/ixpm/xpmread.hxx
index 88e4c608cd7b..0c9b9d314446 100644
--- a/vcl/source/filter/ixpm/xpmread.hxx
+++ b/vcl/source/filter/ixpm/xpmread.hxx
@@ -84,7 +84,7 @@ private:
sal_uLong mnParaSize;
sal_uInt8* mpPara;
- bool ImplGetString( void );
+ bool ImplGetString();
bool ImplGetColor( sal_uLong );
bool ImplGetScanLine( sal_uLong );
bool ImplGetColSub( sal_uInt8* );
diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx
index f1050353d673..4295566ff59d 100644
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -115,7 +115,7 @@ void PhysicalFontCollection::Clear()
mbMatchData = false;
}
-void PhysicalFontCollection::InitGenericGlyphFallback( void ) const
+void PhysicalFontCollection::InitGenericGlyphFallback() const
{
// normalized family names of fonts suited for glyph fallback
// if a font is available related fonts can be ignored
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index 0d8fb69971c7..2b477609ee59 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -323,7 +323,7 @@ public:
static const int NMAXTRANS = 32; // see CFF.appendixB
public:
explicit CffSubsetterContext( const U8* pBasePtr, int nBaseLen);
- ~CffSubsetterContext( void);
+ ~CffSubsetterContext();
bool initialCffRead();
bool emitAsType1( class Type1Emitter&,
@@ -335,10 +335,10 @@ public:
protected:
int convert2Type1Ops( CffLocal*, const U8* pType2Ops, int nType2Len, U8* pType1Ops);
private:
- void convertOneTypeOp( void);
- void convertOneTypeEsc( void);
+ void convertOneTypeOp();
+ void convertOneTypeEsc();
void callType2Subr( bool bGlobal, int nSubrNumber);
- sal_Int32 getReadOfs( void) const { return (sal_Int32)(mpReadPtr - mpBasePtr);}
+ sal_Int32 getReadOfs() const { return (sal_Int32)(mpReadPtr - mpBasePtr);}
const U8* mpBasePtr;
const U8* mpBaseEnd;
@@ -363,14 +363,14 @@ private:
CffLocal maCffLocal[256];
CffLocal* mpCffLocal;
- void readDictOp( void);
- RealType readRealVal( void);
+ void readDictOp();
+ RealType readRealVal();
const char* getString( int nStringID);
int getFDSelect( int nGlyphIndex) const;
int getGlyphSID( int nGlyphIndex) const;
const char* getGlyphName( int nGlyphIndex);
- void read2push( void);
+ void read2push();
void writeType1Val( ValType);
void writeTypeOp( int nTypeOp);
void writeTypeEsc( int nTypeOp);
@@ -382,18 +382,18 @@ public: // TODO: is public really needed?
// accessing the value stack
// TODO: add more checks
void push( ValType nVal) { mnValStack[ mnStackIdx++] = nVal;}
- ValType popVal( void) { return ((mnStackIdx>0) ? mnValStack[ --mnStackIdx] : 0);}
+ ValType popVal() { return ((mnStackIdx>0) ? mnValStack[ --mnStackIdx] : 0);}
ValType getVal( int nIndex) const { return mnValStack[ nIndex];}
- int popInt( void);
- int size( void) const { return mnStackIdx;}
- void clear( void) { mnStackIdx = 0;}
+ int popInt();
+ int size() const { return mnStackIdx;}
+ void clear() { mnStackIdx = 0;}
// accessing the charstring hints
void addHints( bool bVerticalHints);
// accessing other charstring specifics
- bool hasCharWidth( void) const { return (maCharWidth > 0);}
- ValType getCharWidth( void) const { return maCharWidth;}
+ bool hasCharWidth() const { return (maCharWidth > 0);}
+ ValType getCharWidth() const { return maCharWidth;}
void setNominalWidth( ValType aWidth) { mpCffLocal->maNominalWidth = aWidth;}
void setDefaultWidth( ValType aWidth) { mpCffLocal->maDefaultWidth = aWidth;}
void updateWidth( bool bUseFirstVal);
@@ -433,12 +433,12 @@ CffSubsetterContext::CffSubsetterContext( const U8* pBasePtr, int nBaseLen)
mpCffLocal = &maCffLocal[0];
}
-CffSubsetterContext::~CffSubsetterContext( void)
+CffSubsetterContext::~CffSubsetterContext()
{
// TODO: delete[] maCffLocal;
}
-inline int CffSubsetterContext::popInt( void)
+inline int CffSubsetterContext::popInt()
{
const ValType aVal = popVal();
const int nInt = static_cast<int>(aVal);
@@ -504,7 +504,7 @@ void CffSubsetterContext::setCharStringType( int nVal)
}
}
-void CffSubsetterContext::readDictOp( void)
+void CffSubsetterContext::readDictOp()
{
ValType nVal = 0;
const U8 c = *mpReadPtr;
@@ -758,7 +758,7 @@ void CffSubsetterContext::writeCurveTo( int nStackPos,
writeTypeOp( TYPE1OP::RCURVETO );
}
-void CffSubsetterContext::convertOneTypeOp( void)
+void CffSubsetterContext::convertOneTypeOp()
{
const int nType2Op = *(mpReadPtr++);
@@ -983,7 +983,7 @@ void CffSubsetterContext::convertOneTypeOp( void)
}
}
-void CffSubsetterContext::convertOneTypeEsc( void)
+void CffSubsetterContext::convertOneTypeEsc()
{
const int nType2Esc = *(mpReadPtr++);
ValType* pTop = &mnValStack[ mnStackIdx-1];
@@ -1393,7 +1393,7 @@ void CffSubsetterContext::seekIndexEnd( int nIndexBase)
}
// initialize FONTDICT specific values
-CffLocal::CffLocal( void)
+CffLocal::CffLocal()
: mnPrivDictBase( 0)
, mnPrivDictSize( 0)
, mnLocalSubrOffs( 0)
@@ -1419,7 +1419,7 @@ CffLocal::CffLocal( void)
maFamilyOtherBlues.clear();
}
-CffGlobal::CffGlobal( void)
+CffGlobal::CffGlobal()
: mnNameIdxBase( 0)
, mnNameIdxCount( 0)
, mnStringIdxBase( 0)
@@ -1713,14 +1713,14 @@ class Type1Emitter
{
public:
explicit Type1Emitter( FILE* pOutFile, bool bPfbSubset = true);
- ~Type1Emitter( void);
+ ~Type1Emitter();
void setSubsetName( const char* );
size_t emitRawData( const char* pData, size_t nLength) const;
- void emitAllRaw( void);
- void emitAllHex( void);
- void emitAllCrypted( void);
- int tellPos( void) const;
+ void emitAllRaw();
+ void emitAllHex();
+ void emitAllCrypted();
+ int tellPos() const;
size_t updateLen( int nTellPos, size_t nLength);
void emitValVector( const char* pLineHead, const char* pLineTail, const ValVector&);
private:
@@ -1747,7 +1747,7 @@ Type1Emitter::Type1Emitter( FILE* pOutFile, bool bPfbSubset)
maSubsetName[0] = '\0';
}
-Type1Emitter::~Type1Emitter( void)
+Type1Emitter::~Type1Emitter()
{
if( !mpFileOut)
return;
@@ -1764,7 +1764,7 @@ void Type1Emitter::setSubsetName( const char* pSubsetName)
maSubsetName[sizeof(maSubsetName)-1] = '\0';
}
-int Type1Emitter::tellPos( void) const
+int Type1Emitter::tellPos() const
{
int nTellPos = ftell( mpFileOut);
return nTellPos;
@@ -1794,7 +1794,7 @@ inline size_t Type1Emitter::emitRawData(const char* pData, size_t nLength) const
return fwrite( pData, 1, nLength, mpFileOut);
}
-inline void Type1Emitter::emitAllRaw( void)
+inline void Type1Emitter::emitAllRaw()
{
// writeout raw data
assert( (mpPtr - maBuffer) < (int)sizeof(maBuffer));
@@ -1803,7 +1803,7 @@ inline void Type1Emitter::emitAllRaw( void)
mpPtr = maBuffer;
}
-inline void Type1Emitter::emitAllHex( void)
+inline void Type1Emitter::emitAllHex()
{
assert( (mpPtr - maBuffer) < (int)sizeof(maBuffer));
for( const char* p = maBuffer; p < mpPtr;) {
@@ -1829,7 +1829,7 @@ inline void Type1Emitter::emitAllHex( void)
mpPtr = maBuffer;
}
-void Type1Emitter::emitAllCrypted( void)
+void Type1Emitter::emitAllCrypted()
{
// apply t1crypt
for( char* p = maBuffer; p < mpPtr; ++p) {
diff --git a/vcl/source/fontsubset/list.cxx b/vcl/source/fontsubset/list.cxx
index e9cbe5dc5b26..6578183ebe0e 100644
--- a/vcl/source/fontsubset/list.cxx
+++ b/vcl/source/fontsubset/list.cxx
@@ -82,7 +82,7 @@ static lnode *appendPrim(list pThis, void *el)
}
/*- public methods */
-list listNewEmpty(void) /*- default ctor */
+list listNewEmpty() /*- default ctor */
{
list pThis = static_cast<list>(rtl_allocateMemory(sizeof(struct _list)));
assert(pThis != 0);
diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx
index a2230391c7bf..813b5f65356a 100644
--- a/vcl/source/fontsubset/ttcr.cxx
+++ b/vcl/source/fontsubset/ttcr.cxx
@@ -961,7 +961,7 @@ TrueTypeTable *TrueTypeTableNew_hhea(sal_Int16 ascender,
return table;
}
-TrueTypeTable *TrueTypeTableNew_loca(void)
+TrueTypeTable *TrueTypeTableNew_loca()
{
TrueTypeTable* table = static_cast<TrueTypeTable*>(smalloc(sizeof(TrueTypeTable)));
table->data = smalloc(sizeof(tdata_loca));
@@ -990,7 +990,7 @@ TrueTypeTable *TrueTypeTableNew_maxp( const sal_uInt8* maxp, int size)
return table;
}
-TrueTypeTable *TrueTypeTableNew_glyf(void)
+TrueTypeTable *TrueTypeTableNew_glyf()
{
TrueTypeTable* table = static_cast<TrueTypeTable*>(smalloc(sizeof(TrueTypeTable)));
list l = listNewEmpty();
@@ -1006,7 +1006,7 @@ TrueTypeTable *TrueTypeTableNew_glyf(void)
return table;
}
-TrueTypeTable *TrueTypeTableNew_cmap(void)
+TrueTypeTable *TrueTypeTableNew_cmap()
{
TrueTypeTable* table = static_cast<TrueTypeTable*>(smalloc(sizeof(TrueTypeTable)));
table_cmap* cmap = static_cast<table_cmap*>(smalloc(sizeof(table_cmap)));
@@ -1527,7 +1527,7 @@ _inline sal_uInt32 mkTag(sal_uInt8 a, sal_uInt8 b, sal_uInt8 c, sal_uInt8 d) {
return (a << 24) | (b << 16) | (c << 8) | d;
}
-int main(void)
+int main()
{
TrueTypeCreator *ttcr;
sal_uInt8 *t1, *t2, *t3, *t4, *t5, *t6, *t7;
diff --git a/vcl/source/fontsubset/ttcr.hxx b/vcl/source/fontsubset/ttcr.hxx
index ab4b2f32d879..fe24fff5a443 100644
--- a/vcl/source/fontsubset/ttcr.hxx
+++ b/vcl/source/fontsubset/ttcr.hxx
@@ -145,7 +145,7 @@ namespace vcl
*
* INTERNAL: gets called only from ProcessTables();
*/
- TrueTypeTable *TrueTypeTableNew_loca(void);
+ TrueTypeTable *TrueTypeTableNew_loca();
/**
* Creates a new 'maxp' table based on an existing maxp table.
@@ -158,12 +158,12 @@ namespace vcl
/**
* Creates a new empty 'glyf' table.
*/
- TrueTypeTable *TrueTypeTableNew_glyf(void);
+ TrueTypeTable *TrueTypeTableNew_glyf();
/**
* Creates a new empty 'cmap' table.
*/
- TrueTypeTable *TrueTypeTableNew_cmap(void);
+ TrueTypeTable *TrueTypeTableNew_cmap();
/**
* Creates a new 'name' table. If n != 0 the table gets populated by
diff --git a/vcl/source/fontsubset/xlat.cxx b/vcl/source/fontsubset/xlat.cxx
index 3509ada02af1..53daa33bf744 100644
--- a/vcl/source/fontsubset/xlat.cxx
+++ b/vcl/source/fontsubset/xlat.cxx
@@ -28,8 +28,8 @@ namespace {
class ConverterCache
{
public:
- explicit ConverterCache( void );
- ~ConverterCache( void );
+ explicit ConverterCache();
+ ~ConverterCache();
sal_uInt16 convertOne( int nSelect, sal_Unicode );
void convertStr( int nSelect, const sal_Unicode* pSrc, sal_uInt16* pDst, int nCount );
protected:
@@ -39,7 +39,7 @@ private:
rtl_UnicodeToTextContext maContexts[ MAX_CVT_SELECT+1 ];
};
-ConverterCache::ConverterCache( void)
+ConverterCache::ConverterCache()
{
for( int i = 0; i <= MAX_CVT_SELECT; ++i)
{
@@ -48,7 +48,7 @@ ConverterCache::ConverterCache( void)
}
}
-ConverterCache::~ConverterCache( void)
+ConverterCache::~ConverterCache()
{
for( int i = 0; i <= MAX_CVT_SELECT; ++i)
{
diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index eba1f92d2e31..10348c9029f2 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -32,7 +32,7 @@ class BasePixelPtr
public:
BasePixelPtr( PIXBYTE* p = NULL ) : mpPixel( p ) {}
void SetRawPtr( PIXBYTE* pRawPtr ) { mpPixel = pRawPtr; }
- PIXBYTE* GetRawPtr( void ) const { return mpPixel; }
+ PIXBYTE* GetRawPtr() const { return mpPixel; }
void AddByteOffset( int nByteOffset ) { mpPixel += nByteOffset; }
protected:
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index bbb9aba7c2e0..d8e9644f8167 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -290,11 +290,11 @@ void X11SalData::Init()
pXLib_->Init();
}
-void X11SalData::initNWF( void )
+void X11SalData::initNWF()
{
}
-void X11SalData::deInitNWF( void )
+void X11SalData::deInitNWF()
{
}
@@ -420,7 +420,7 @@ void SalXLib::Init()
}
extern "C" {
-void EmitFontpathWarning( void )
+void EmitFontpathWarning()
{
static Bool bOnce = False;
if ( !bOnce )
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index 24c79db313c7..24192da59ac1 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -100,7 +100,7 @@ bool CairoTextRender::setFont( const FontSelectPattern *pEntry, int nFallbackLev
ImplFontOptions* GetFCFontOptions( const ImplFontAttributes& rFontAttributes, int nSize);
-void ImplServerFontEntry::HandleFontOptions( void )
+void ImplServerFontEntry::HandleFontOptions()
{
if( !mpServerFont )
return;
diff --git a/vcl/unx/gtk/a11y/atkbridge.cxx b/vcl/unx/gtk/a11y/atkbridge.cxx
index c82b1e18ddb2..e3ffdc668c09 100644
--- a/vcl/unx/gtk/a11y/atkbridge.cxx
+++ b/vcl/unx/gtk/a11y/atkbridge.cxx
@@ -25,7 +25,7 @@
#include "atkwindow.hxx"
#include <stdio.h>
-bool InitAtkBridge(void)
+bool InitAtkBridge()
{
#if !GTK_CHECK_VERSION(3,0,0)
const char* pVersion = atk_get_toolkit_version();
diff --git a/vcl/unx/gtk/a11y/atkfactory.cxx b/vcl/unx/gtk/a11y/atkfactory.cxx
index d3cb30ad94c4..fb0cc7741799 100644
--- a/vcl/unx/gtk/a11y/atkfactory.cxx
+++ b/vcl/unx/gtk/a11y/atkfactory.cxx
@@ -49,7 +49,7 @@ atk_noop_object_wrapper_class_init(AtkNoOpObjectClass *klass)
}
static GType
-atk_noop_object_wrapper_get_type(void)
+atk_noop_object_wrapper_get_type()
{
static GType type = 0;
@@ -93,7 +93,7 @@ atk_noop_object_wrapper_new()
*/
static GType
-wrapper_factory_get_accessible_type(void)
+wrapper_factory_get_accessible_type()
{
return atk_object_wrapper_get_type();
}
@@ -148,7 +148,7 @@ wrapper_factory_class_init( AtkObjectFactoryClass *klass )
}
GType
-wrapper_factory_get_type (void)
+wrapper_factory_get_type()
{
static GType t = 0;
diff --git a/vcl/unx/gtk/a11y/atkfactory.hxx b/vcl/unx/gtk/a11y/atkfactory.hxx
index dcd6f84938a5..c7a8add0b0d6 100644
--- a/vcl/unx/gtk/a11y/atkfactory.hxx
+++ b/vcl/unx/gtk/a11y/atkfactory.hxx
@@ -26,7 +26,7 @@
extern "C" {
-GType wrapper_factory_get_type (void);
+GType wrapper_factory_get_type();
} // extern "C"
diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx b/vcl/unx/gtk/a11y/atkhypertext.cxx
index 909ee30a8063..9b01e6b5bf5e 100644
--- a/vcl/unx/gtk/a11y/atkhypertext.cxx
+++ b/vcl/unx/gtk/a11y/atkhypertext.cxx
@@ -155,7 +155,7 @@ hyper_link_class_init (AtkHyperlinkClass *klass)
}
static GType
-hyper_link_get_type (void)
+hyper_link_get_type()
{
static GType type = 0;
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index 5ffa45a4c03c..c7a1221cd340 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -683,7 +683,7 @@ static Link g_aEventListenerLink( NULL, WindowEventHandler );
extern "C" {
static G_CONST_RETURN gchar *
-ooo_atk_util_get_toolkit_name (void)
+ooo_atk_util_get_toolkit_name()
{
return "VCL";
}
@@ -691,7 +691,7 @@ ooo_atk_util_get_toolkit_name (void)
/*****************************************************************************/
static G_CONST_RETURN gchar *
-ooo_atk_util_get_toolkit_version (void)
+ooo_atk_util_get_toolkit_version()
{
return LIBO_VERSION_DOTTED;
}
@@ -722,7 +722,7 @@ ooo_atk_util_class_init (AtkUtilClass *)
/*****************************************************************************/
GType
-ooo_atk_util_get_type (void)
+ooo_atk_util_get_type()
{
static GType type = 0;
diff --git a/vcl/unx/gtk/a11y/atkutil.hxx b/vcl/unx/gtk/a11y/atkutil.hxx
index f61a4bd1c595..89cb61aeed33 100644
--- a/vcl/unx/gtk/a11y/atkutil.hxx
+++ b/vcl/unx/gtk/a11y/atkutil.hxx
@@ -24,7 +24,7 @@
#define OOO_TYPE_ATK_UTIL ooo_atk_util_get_type()
-GType ooo_atk_util_get_type (void);
+GType ooo_atk_util_get_type();
#endif
diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx
index 84ef89198fe9..2e0bcdc5f055 100644
--- a/vcl/unx/gtk/a11y/atkwindow.cxx
+++ b/vcl/unx/gtk/a11y/atkwindow.cxx
@@ -273,7 +273,7 @@ ooo_window_wrapper_class_init (AtkObjectClass *klass, gpointer)
/*****************************************************************************/
GType
-ooo_window_wrapper_get_type (void)
+ooo_window_wrapper_get_type()
{
static GType type = 0;
@@ -310,7 +310,7 @@ ooo_window_wrapper_get_type (void)
return type;
}
-void restore_gail_window_vtable (void)
+void restore_gail_window_vtable()
{
AtkObjectClass *atk_class;
gpointer data;
diff --git a/vcl/unx/gtk/a11y/atkwindow.hxx b/vcl/unx/gtk/a11y/atkwindow.hxx
index 40dd4e83a256..f2cdbee7b46f 100644
--- a/vcl/unx/gtk/a11y/atkwindow.hxx
+++ b/vcl/unx/gtk/a11y/atkwindow.hxx
@@ -24,8 +24,8 @@
#define OOO_TYPE_WINDOW_WRAPPER ooo_window_wrapper_get_type()
-GType ooo_window_wrapper_get_type (void);
-void restore_gail_window_vtable (void);
+GType ooo_window_wrapper_get_type();
+void restore_gail_window_vtable();
#endif
diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index e2fc450d2918..30cfa9c05074 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -656,7 +656,7 @@ atk_object_wrapper_init (AtkObjectWrapper *wrapper,
} // extern "C"
GType
-atk_object_wrapper_get_type (void)
+atk_object_wrapper_get_type()
{
static GType type = 0;
diff --git a/vcl/unx/gtk/a11y/atkwrapper.hxx b/vcl/unx/gtk/a11y/atkwrapper.hxx
index 5886674f1d1d..95625ad4bca8 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.hxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.hxx
@@ -72,7 +72,7 @@ struct _AtkObjectWrapperClass
AtkObjectClass aParentClass;
};
-GType atk_object_wrapper_get_type (void) G_GNUC_CONST;
+GType atk_object_wrapper_get_type() G_GNUC_CONST;
AtkObject * atk_object_wrapper_ref(
const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible,
bool create = true );
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index 8bce06f6cce8..dec58ca8088e 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -46,12 +46,12 @@
extern "C"
{
#define GET_YIELD_MUTEX() static_cast<GtkYieldMutex*>(GetSalData()->m_pInstance->GetYieldMutex())
- static void GdkThreadsEnter( void )
+ static void GdkThreadsEnter()
{
GtkYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
pYieldMutex->ThreadsEnter();
}
- static void GdkThreadsLeave( void )
+ static void GdkThreadsLeave()
{
GtkYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
pYieldMutex->ThreadsLeave();
diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index bda7c4a605d9..f1142210cf3e 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.cxx
@@ -107,7 +107,7 @@ GtkSalSystem::countScreenMonitors()
// Including gdkx.h kills us with the Window / XWindow conflict
extern "C" {
#if GTK_CHECK_VERSION(3,0,0)
- GType gdk_x11_display_get_type (void);
+ GType gdk_x11_display_get_type();
#endif
int gdk_x11_screen_get_screen_number (GdkScreen *screen);
}
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index c7acbbc548ae..6f67c29ae8aa 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -490,7 +490,7 @@ inline void NW_gtk_border_set_from_border( GtkBorder& aDst, const GtkBorder * pS
/*********************************************************
* Initialize GTK and local stuff
*********************************************************/
-void GtkData::initNWF( void )
+void GtkData::initNWF()
{
ImplSVData* pSVData = ImplGetSVData();
@@ -563,7 +563,7 @@ void GtkData::initNWF( void )
/*********************************************************
* Release GTK and local stuff
*********************************************************/
-void GtkData::deInitNWF( void )
+void GtkData::deInitNWF()
{
for( unsigned int i = 0; i < gWidgetData.size(); i++ )
{
diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx b/vcl/unx/gtk/window/gloactiongroup.cxx
index 69dea4054880..23307fd2a8df 100644
--- a/vcl/unx/gtk/window/gloactiongroup.cxx
+++ b/vcl/unx/gtk/window/gloactiongroup.cxx
@@ -49,7 +49,7 @@ G_DEFINE_TYPE (GLOAction, g_lo_action, G_TYPE_OBJECT);
#endif
GLOAction*
-g_lo_action_new (void)
+g_lo_action_new()
{
return G_LO_ACTION (g_object_new (G_TYPE_LO_ACTION, NULL));
}
diff --git a/vcl/unx/gtk/window/glomenu.cxx b/vcl/unx/gtk/window/glomenu.cxx
index 871692045590..caa314351287 100644
--- a/vcl/unx/gtk/window/glomenu.cxx
+++ b/vcl/unx/gtk/window/glomenu.cxx
@@ -165,7 +165,7 @@ g_lo_menu_insert_in_section (GLOMenu *menu,
}
GLOMenu *
-g_lo_menu_new (void)
+g_lo_menu_new()
{
return G_LO_MENU( g_object_new (G_TYPE_LO_MENU, NULL) );
}
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 78d561554831..3a1cae108573 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -1712,7 +1712,7 @@ void GtkSalFrame::SetMenu( SalMenu* pSalMenu )
m_pSalMenu = pSalMenu;
}
-SalMenu* GtkSalFrame::GetMenu( void )
+SalMenu* GtkSalFrame::GetMenu()
{
return m_pSalMenu;
}
diff --git a/vcl/unx/kde/fpicker/kdefilepicker.hxx b/vcl/unx/kde/fpicker/kdefilepicker.hxx
index b586ae9a4489..819d0ecfb01f 100644
--- a/vcl/unx/kde/fpicker/kdefilepicker.hxx
+++ b/vcl/unx/kde/fpicker/kdefilepicker.hxx
@@ -102,17 +102,17 @@ protected:
QString addExtension( const QString &rFileName ) const;
void setIsSave( bool bIsSave ) { m_bIsSave = bIsSave; }
- bool isSave( void ) const { return m_bIsSave; }
+ bool isSave() const { return m_bIsSave; }
void setIsExecuting( bool bIsExecuting ) { m_bIsExecuting = bIsExecuting; }
- bool isExecuting( void ) const { return m_bIsExecuting; }
+ bool isExecuting() const { return m_bIsExecuting; }
bool isSupportedProtocol( const QString &rProtocol ) const;
KURL mostLocalURL( const KURL &rURL ) const;
QString localCopy( const QString &rFileName ) const;
void setCanNotifySelection( bool bCanNotifySelection ) { m_bCanNotifySelection = bCanNotifySelection; }
- bool canNotifySelection( void ) const { return m_bCanNotifySelection; }
+ bool canNotifySelection() const { return m_bCanNotifySelection; }
protected slots:
// Qt3 moc does not really understand #ifdef and would process both slots,
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index bd3dbaa4a4e0..aa873b8eb892 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -287,13 +287,13 @@ class WidgetPainter
@see m_pPushButton
*/
- WidgetPainter( void );
+ WidgetPainter();
/** Destructor.
Destruct all the cached widgets.
*/
- virtual ~WidgetPainter( void );
+ virtual ~WidgetPainter();
/** Paints the specified widget to the X window.
@@ -444,7 +444,7 @@ class WidgetPainter
static QRect region2QRect( const Rectangle& rControlRegion );
};
-WidgetPainter::WidgetPainter( void )
+WidgetPainter::WidgetPainter()
: m_pPushButton( NULL ),
m_pRadioButton( NULL ),
m_pCheckBox( NULL ),
@@ -476,7 +476,7 @@ WidgetPainter::WidgetPainter( void )
{
}
-WidgetPainter::~WidgetPainter( void )
+WidgetPainter::~WidgetPainter()
{
delete m_pPushButton, m_pPushButton = NULL;
delete m_pRadioButton, m_pRadioButton = NULL;
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index e7b8899e595a..c680e4b65bcd 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -91,7 +91,7 @@ public:
HRESULT DrawThemeBackground( HTHEME hTheme, HDC hdc, int iPartId, int iStateId, const RECT *pRect, const RECT *pClipRect );
HRESULT DrawThemeText( HTHEME hTheme, HDC hdc, int iPartId, int iStateId, LPCWSTR pszText, int iCharCount, DWORD dwTextFlags, DWORD dwTextFlags2, const RECT *pRect );
HRESULT GetThemePartSize( HTHEME hTheme, HDC hdc, int iPartId, int iStateId, RECT *prc, THEMESIZE eSize, SIZE *psz );
- BOOL IsThemeActive( void );
+ BOOL IsThemeActive();
};
static VisualStylesAPI vsAPI;
@@ -174,7 +174,7 @@ HRESULT VisualStylesAPI::GetThemePartSize( HTHEME hTheme, HDC hdc, int iPartId,
return S_FALSE;
}
-BOOL VisualStylesAPI::IsThemeActive( void )
+BOOL VisualStylesAPI::IsThemeActive()
{
if(lpfnIsThemeActive)
return (*lpfnIsThemeActive) ();
@@ -185,7 +185,7 @@ BOOL VisualStylesAPI::IsThemeActive( void )
/*********************************************************
* Initialize XP theming and local stuff
*********************************************************/
-void SalData::initNWF( void )
+void SalData::initNWF()
{
ImplSVData* pSVData = ImplGetSVData();
@@ -196,7 +196,7 @@ void SalData::initNWF( void )
// *********************************************************
// * Release theming handles
// ********************************************************
-void SalData::deInitNWF( void )
+void SalData::deInitNWF()
{
ThemeMap::iterator iter = aThemeMap.begin();
while( iter != aThemeMap.end() )
diff --git a/vcl/win/source/gdi/winlayout.hxx b/vcl/win/source/gdi/winlayout.hxx
index 188b9539cbd7..196b8e941f19 100644
--- a/vcl/win/source/gdi/winlayout.hxx
+++ b/vcl/win/source/gdi/winlayout.hxx
@@ -43,7 +43,7 @@ public:
WinLayout(HDC, const ImplWinFontData&, ImplWinFontEntry&, bool bUseOpenGL);
virtual void InitFont() const;
void SetFontScale( float f ) { mfFontScale = f; }
- HFONT DisableFontScaling( void) const;
+ HFONT DisableFontScaling() const;
SCRIPT_CACHE& GetScriptCache() const;