Skip to content

Commit 7f7f61e

Browse files
jef-njef-n
committedJan 7, 2012
fix windows build and some warnings
·
ltr-3_40Before-merge-new_vector_api
1 parent cb1eb2a commit 7f7f61e

File tree

6 files changed

+19
-16
lines changed

6 files changed

+19
-16
lines changed
 

‎src/core/qgsexpression.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ class CORE_EXPORT QgsExpression
210210

211211
class Visitor; // visitor interface is defined below
212212

213-
class Node
213+
class CORE_EXPORT Node
214214
{
215215
public:
216216
virtual ~Node() {}
@@ -231,7 +231,7 @@ class CORE_EXPORT QgsExpression
231231
virtual void accept( Visitor& v ) = 0;
232232
};
233233

234-
class NodeList
234+
class CORE_EXPORT NodeList
235235
{
236236
public:
237237
NodeList() {}
@@ -245,7 +245,7 @@ class CORE_EXPORT QgsExpression
245245
QList<Node*> mList;
246246
};
247247

248-
class NodeUnaryOperator : public Node
248+
class CORE_EXPORT NodeUnaryOperator : public Node
249249
{
250250
public:
251251
NodeUnaryOperator( UnaryOperator op, Node* operand ) : mOp( op ), mOperand( operand ) {}
@@ -266,7 +266,7 @@ class CORE_EXPORT QgsExpression
266266
Node* mOperand;
267267
};
268268

269-
class NodeBinaryOperator : public Node
269+
class CORE_EXPORT NodeBinaryOperator : public Node
270270
{
271271
public:
272272
NodeBinaryOperator( BinaryOperator op, Node* opLeft, Node* opRight ) : mOp( op ), mOpLeft( opLeft ), mOpRight( opRight ) {}
@@ -293,7 +293,7 @@ class CORE_EXPORT QgsExpression
293293
Node* mOpRight;
294294
};
295295

296-
class NodeInOperator : public Node
296+
class CORE_EXPORT NodeInOperator : public Node
297297
{
298298
public:
299299
NodeInOperator( Node* node, NodeList* list, bool notin = false ) : mNode( node ), mList( list ), mNotIn( notin ) {}
@@ -316,7 +316,7 @@ class CORE_EXPORT QgsExpression
316316
bool mNotIn;
317317
};
318318

319-
class NodeFunction : public Node
319+
class CORE_EXPORT NodeFunction : public Node
320320
{
321321
public:
322322
NodeFunction( int fnIndex, NodeList* args ): mFnIndex( fnIndex ), mArgs( args ) {}
@@ -339,7 +339,7 @@ class CORE_EXPORT QgsExpression
339339
NodeList* mArgs;
340340
};
341341

342-
class NodeLiteral : public Node
342+
class CORE_EXPORT NodeLiteral : public Node
343343
{
344344
public:
345345
NodeLiteral( QVariant value ) : mValue( value ) {}
@@ -357,7 +357,7 @@ class CORE_EXPORT QgsExpression
357357
QVariant mValue;
358358
};
359359

360-
class NodeColumnRef : public Node
360+
class CORE_EXPORT NodeColumnRef : public Node
361361
{
362362
public:
363363
NodeColumnRef( QString name ) : mName( name ), mIndex( -1 ) {}
@@ -376,7 +376,7 @@ class CORE_EXPORT QgsExpression
376376
int mIndex;
377377
};
378378

379-
class WhenThen
379+
class CORE_EXPORT WhenThen
380380
{
381381
public:
382382
WhenThen( Node* whenExp, Node* thenExp ) : mWhenExp( whenExp ), mThenExp( thenExp ) {}
@@ -388,7 +388,7 @@ class CORE_EXPORT QgsExpression
388388
};
389389
typedef QList<WhenThen*> WhenThenList;
390390

391-
class NodeCondition : public Node
391+
class CORE_EXPORT NodeCondition : public Node
392392
{
393393
public:
394394
NodeCondition( WhenThenList* conditions, Node* elseExp = NULL ) : mConditions( *conditions ), mElseExp( elseExp ) { delete conditions; }
@@ -410,7 +410,7 @@ class CORE_EXPORT QgsExpression
410410

411411
/** support for visitor pattern - algorithms dealing with the expressions
412412
may be implemented without modifying the Node classes */
413-
class Visitor
413+
class CORE_EXPORT Visitor
414414
{
415415
public:
416416
virtual ~Visitor() {}

‎src/providers/wfs/qgswfsprovider.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2355,7 +2355,10 @@ void QgsWFSProvider::appendSupportedOperations( const QDomElement& operationsEle
23552355
//initialization for getRenderedOnly option
23562356
//(formerly "Only request features overlapping the current view extent")
23572357
bool QgsWFSProvider::initGetRenderedOnly( const QgsRectangle rect )
2358-
{ //find our layer
2358+
{
2359+
Q_UNUSED( rect );
2360+
2361+
//find our layer
23592362
QMap<QString, QgsMapLayer*> layers = QgsMapLayerRegistry::instance()->mapLayers();
23602363
QMap<QString, QgsMapLayer*>::const_iterator layersIt = layers.begin();
23612364
for ( ; layersIt != layers.end() ; ++layersIt )

‎src/providers/wfs/qgswfsutils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class QgsExpressionOGCVisitor : public QgsExpression::Visitor
9191
mResult = true;
9292
}
9393

94-
void visit( QgsExpression::NodeCondition* n ) { mResult = false; }
94+
void visit( QgsExpression::NodeCondition* n ) { Q_UNUSED( n ); mResult = false; }
9595

9696
protected:
9797
QDomDocument mDoc;

‎src/ui/qgsoptionsbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@
521521
<attribute name="title">
522522
<string>GDAL</string>
523523
</attribute>
524-
<layout class="QGridLayout" name="gridLayout">
524+
<layout class="QGridLayout" name="gridLayout_27">
525525
<item row="0" column="0">
526526
<widget class="QGroupBox" name="groupBox_13">
527527
<property name="title">

‎src/ui/qgsprojectpropertiesbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@
382382
<height>538</height>
383383
</rect>
384384
</property>
385-
<layout class="QGridLayout" name="gridLayout">
385+
<layout class="QGridLayout" name="gridLayout_7">
386386
<item row="0" column="0" colspan="2">
387387
<widget class="QGroupBox" name="grpWMSServiceCapabilities">
388388
<property name="title">

‎src/ui/qgsvectorlayerpropertiesbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@
548548
<attribute name="title">
549549
<string>Metadata</string>
550550
</attribute>
551-
<layout class="QGridLayout" name="gridLayout">
551+
<layout class="QGridLayout" name="gridLayout_15">
552552
<item row="0" column="0">
553553
<widget class="QLabel" name="mLayerTitleLabel">
554554
<property name="text">

0 commit comments

Comments
 (0)
Please sign in to comment.