fix windows build

This commit is contained in:
Juergen E. Fischer 2011-07-03 16:07:45 +02:00
parent 71443b1206
commit 8eb7664b21
2 changed files with 4 additions and 4 deletions

0
src/app/qgsfieldcalculator.cpp Executable file → Normal file
View File

8
src/core/symbology-ng/qgssvgcache.h Normal file → Executable file
View File

@ -27,7 +27,7 @@ class QDomElement;
class QImage; class QImage;
class QPicture; class QPicture;
struct QgsSvgCacheEntry struct CORE_EXPORT QgsSvgCacheEntry
{ {
QgsSvgCacheEntry(); QgsSvgCacheEntry();
QgsSvgCacheEntry( const QString& file, double size, double outlineWidth, double widthScaleFactor, double rasterScaleFctor, const QColor& fill, const QColor& outline ); QgsSvgCacheEntry( const QString& file, double size, double outlineWidth, double widthScaleFactor, double rasterScaleFctor, const QColor& fill, const QColor& outline );
@ -58,7 +58,7 @@ struct QgsSvgCacheEntry
/**A cache for images / pictures derived from svg files. This class supports parameter replacement in svg files /**A cache for images / pictures derived from svg files. This class supports parameter replacement in svg files
according to the svg params specification (http://www.w3.org/TR/2009/WD-SVGParamPrimer-20090616/). Supported are according to the svg params specification (http://www.w3.org/TR/2009/WD-SVGParamPrimer-20090616/). Supported are
the parameters 'fill-color', 'pen-color', 'outline-width', 'stroke-width'. E.g. <circle fill="param(fill-color red)" stroke="param(pen-color black)" stroke-width="param(outline-width 1)"*/ the parameters 'fill-color', 'pen-color', 'outline-width', 'stroke-width'. E.g. <circle fill="param(fill-color red)" stroke="param(pen-color black)" stroke-width="param(outline-width 1)"*/
class QgsSvgCache class CORE_EXPORT QgsSvgCache
{ {
public: public:
@ -73,7 +73,7 @@ class QgsSvgCache
/**Tests if an svg file contains parameters for fill, outline color, outline width. If yes, possible default values are returned. If there are several /**Tests if an svg file contains parameters for fill, outline color, outline width. If yes, possible default values are returned. If there are several
default values in the svg file, only the first one is considered*/ default values in the svg file, only the first one is considered*/
void containsParams( const QString& path, bool& hasFillParam, QColor& defaultFillColor, bool& hasOutlineParam, QColor& defaultOutlineColor, bool& hasOutlineWidthParam, void containsParams( const QString& path, bool& hasFillParam, QColor& defaultFillColor, bool& hasOutlineParam, QColor& defaultOutlineColor, bool& hasOutlineWidthParam,
double& defaultOutlineWidth ) const; double& defaultOutlineWidth ) const;
protected: protected:
QgsSvgCache(); QgsSvgCache();
@ -115,7 +115,7 @@ class QgsSvgCache
void replaceElemParams( QDomElement& elem, const QColor& fill, const QColor& outline, double outlineWidth ); void replaceElemParams( QDomElement& elem, const QColor& fill, const QColor& outline, double outlineWidth );
void containsElemParams( const QDomElement& elem, bool& hasFillParam, QColor& defaultFill, bool& hasOutlineParam, QColor& defaultOutline, void containsElemParams( const QDomElement& elem, bool& hasFillParam, QColor& defaultFill, bool& hasOutlineParam, QColor& defaultOutline,
bool& hasOutlineWidthParam, double& defaultOutlineWidth ) const; bool& hasOutlineWidthParam, double& defaultOutlineWidth ) const;
/**Release memory and remove cache entry from mEntryLookup*/ /**Release memory and remove cache entry from mEntryLookup*/
void removeCacheEntry( QString s, QgsSvgCacheEntry* entry ); void removeCacheEntry( QString s, QgsSvgCacheEntry* entry );