Skip to content
Permalink
Browse files

fix warnings and windows build

git-svn-id: http://svn.osgeo.org/qgis/trunk@15504 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Mar 15, 2011
1 parent c3ac6df commit e9be32a2beec01ccf8a6cffb3f6a359628b9d873
@@ -735,7 +735,6 @@ void QgsVectorLayerProperties::apply()
ds.maxScaleDenominator = -1;
}

QgsDiagramRendererV2* r = 0;
if ( mFixedSizeCheckBox->isChecked() )
{
QgsSingleCategoryDiagramRenderer* dr = new QgsSingleCategoryDiagramRenderer();
@@ -291,7 +291,7 @@ inline void QgsClipper::trimFeatureToBoundary(
unsigned int i1 = inPts.size() - 1; // start with last point

// and compare to the first point initially.
for ( unsigned int i2 = 0; i2 < inPts.size() ; ++i2 )
for ( int i2 = 0; i2 < inPts.size() ; ++i2 )
{ // look at each edge of the polygon in turn
if ( inside( inPts[i2], b ) ) // end point of edge is inside boundary
{
@@ -11,7 +11,7 @@ struct QgsDiagramSettings;
class QgsRenderContext;

/**Base class for all diagram types*/
class QgsDiagram
class CORE_EXPORT QgsDiagram
{
public:
/**Draws the diagram at the given position (in pixel coordinates)*/
@@ -24,7 +24,7 @@ class QgsDiagram
QFont scaledFont( const QgsDiagramSettings& s, const QgsRenderContext& c );
};

class QgsTextDiagram: public QgsDiagram
class CORE_EXPORT QgsTextDiagram: public QgsDiagram
{
public:
enum Shape
@@ -57,7 +57,7 @@ class QgsTextDiagram: public QgsDiagram
void lineEllipseIntersection( const QPointF& lineStart, const QPointF& lineEnd, const QPointF& ellipseMid, double r1, double r2, QList<QPointF>& result ) const;
};

class QgsPieDiagram: public QgsDiagram
class CORE_EXPORT QgsPieDiagram: public QgsDiagram
{
public:
QgsPieDiagram();
@@ -92,7 +92,7 @@ struct QgsDiagramSettings
};

/**Returns diagram settings for a feature*/
class QgsDiagramRendererV2
class CORE_EXPORT QgsDiagramRendererV2
{
public:

@@ -142,7 +142,7 @@ class QgsDiagramRendererV2
};

/**Renders the diagrams for all features with the same settings*/
class QgsSingleCategoryDiagramRenderer: public QgsDiagramRendererV2
class CORE_EXPORT QgsSingleCategoryDiagramRenderer: public QgsDiagramRendererV2
{
public:
QgsSingleCategoryDiagramRenderer();
@@ -168,7 +168,7 @@ class QgsSingleCategoryDiagramRenderer: public QgsDiagramRendererV2
QgsDiagramSettings mSettings;
};

class QgsLinearlyInterpolatedDiagramRenderer: public QgsDiagramRendererV2
class CORE_EXPORT QgsLinearlyInterpolatedDiagramRenderer: public QgsDiagramRendererV2
{
public:
QgsLinearlyInterpolatedDiagramRenderer();
@@ -74,7 +74,7 @@ class QgsLabelingEngineInterface
//! @note: this method was added in version 1.6
virtual int prepareLayer( QgsVectorLayer* layer, QSet<int>& attrIndices, QgsRenderContext& ctx ) = 0;
//! adds a diagram layer to the labeling engine
virtual int addDiagramLayer( QgsVectorLayer* layer, QgsDiagramLayerSettings& s ) {};
virtual int addDiagramLayer( QgsVectorLayer* layer, QgsDiagramLayerSettings& s ) { return 0; };
//! called for every feature
virtual void registerFeature( QgsVectorLayer* layer, QgsFeature& feat, const QgsRenderContext& context = QgsRenderContext() ) = 0;
//! called for every diagram feature
@@ -760,7 +760,7 @@ int QgsPalLabeling::addDiagramLayer( QgsVectorLayer* layer, QgsDiagramLayerSetti

s.palLayer = l;
if ( mMapRenderer->hasCrsTransformEnabled() )
s.ct = new QgsCoordinateTransform( layer->srs(), mMapRenderer->destinationSrs() );
s.ct = new QgsCoordinateTransform( layer->crs(), mMapRenderer->destinationCrs() );
else
s.ct = NULL;
s.xform = mMapRenderer->coordinateTransform();
@@ -22,6 +22,7 @@
#include "qgsvectordataprovider.h"
#include <QDomElement>
#include <QStringList>
#include "qgsvectorlayer.h"

QgsFilter::QgsFilter(): mPropertyIndex( -1 )
{
@@ -39,6 +39,7 @@ INCLUDE_DIRECTORIES(
../../core/symbology
../../gui
..
${GEOS_INCLUDE_DIR}
)

TARGET_LINK_LIBRARIES(dxf2shpconverterplugin
@@ -59,6 +59,7 @@ INCLUDE_DIRECTORIES(
../../app
..
../../providers/sqlanywhere/sqlanyconnection
${GEOS_INCLUDE_DIR}
)

TARGET_LINK_LIBRARIES(sqlanywhereplugin

0 comments on commit e9be32a

Please sign in to comment.
You can’t perform that action at this time.