r19594 by jghali - #12778, patch 04/17 backport: fix a series of warnings from clang
scribus-commit
scribus-commit at lists.scribus.net
Fri Oct 17 22:33:13 UTC 2014
Author: jghali
Date: Fri Oct 17 22:33:13 2014
New Revision: 19594
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19594
Log:
#12778, patch 04/17 backport: fix a series of warnings from clang
Modified:
branches/Version14x/Scribus/scribus/plugins/import/wmf/wmfhandle.h
Modified: branches/Version14x/Scribus/scribus/plugins/import/wmf/wmfhandle.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19594&path=/branches/Version14x/Scribus/scribus/plugins/import/wmf/wmfhandle.h
==============================================================================
--- branches/Version14x/Scribus/scribus/plugins/import/wmf/wmfhandle.h (original)
+++ branches/Version14x/Scribus/scribus/plugins/import/wmf/wmfhandle.h Fri Oct 17 22:33:13 2014
@@ -15,65 +15,62 @@
class WmfObjHandle
{
public:
- virtual void apply( WMFContext& p ) = 0;
+ virtual void apply( WMFContext& p ) = 0;
+ virtual ~WmfObjHandle() {};
};
class WmfObjBrushHandle: public WmfObjHandle
{
public:
- virtual void apply( WMFContext& p );
- QBrush brush;
- virtual ~WmfObjBrushHandle() {};
+ virtual void apply( WMFContext& p );
+ QBrush brush;
};
class WmfObjPenHandle: public WmfObjHandle
{
public:
- virtual void apply( WMFContext& p );
- QPen pen;
- virtual ~WmfObjPenHandle() {};
+ virtual void apply( WMFContext& p );
+ QPen pen;
};
class WmfObjPatternBrushHandle: public WmfObjHandle
{
public:
- virtual void apply( WMFContext& p );
- QBrush brush;
- QPixmap image;
- virtual ~WmfObjPatternBrushHandle() {};
+ virtual void apply( WMFContext& p );
+ QBrush brush;
+ QPixmap image;
};
class WmfObjFontHandle: public WmfObjHandle
{
public:
- virtual void apply( WMFContext& p );
+ virtual void apply( WMFContext& p );
int charset;
- QFont font;
- double rotation;
+ QFont font;
+ double rotation;
WmfObjFontHandle() { charset = 1; rotation = 0.0; }
- virtual ~WmfObjFontHandle() {};
};
void WmfObjBrushHandle::apply( WMFContext& p )
{
- p.setBrush( brush );
+ p.setBrush( brush );
}
void WmfObjPenHandle::apply( WMFContext& p )
{
- p.setPen( pen );
+ p.setPen( pen );
}
void WmfObjPatternBrushHandle::apply( WMFContext& p )
{
- p.setBrush( brush );
+ p.setBrush( brush );
}
void WmfObjFontHandle::apply( WMFContext& p )
{
p.setTextCharset( charset );
p.setTextRotation( rotation );
- p.setFont( font );
+ p.setFont( font );
}
#endif
More information about the scribus-commit
mailing list