Skip to content

Commit b379671

Browse files
committed
fix windows build
1 parent b8305a7 commit b379671

File tree

5 files changed

+20
-10
lines changed

5 files changed

+20
-10
lines changed

src/analysis/network/qgsgraphanalyzer.cpp

100644100755
+3-3
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ void QgsGraphAnalyzer::shortestpath( const QgsGraph* source, int startPointIdx,
6363
const QgsGraphArc& arc = source->arc( *arcIt );
6464
double cost = arc.property( criterionNum ).toDouble() + curCost;
6565

66-
if ( cost < result[ arc.inVertex() ].first )
66+
if ( cost < result[ arc.inVertex()].first )
6767
{
68-
result[ arc.inVertex() ] = QPair< double, int >( cost, *arcIt );
68+
result[ arc.inVertex()] = QPair< double, int >( cost, *arcIt );
6969
not_begin.insert( cost, arc.inVertex() );
7070
}
7171
}
@@ -90,7 +90,7 @@ void QgsGraphAnalyzer::shortestpath( const QgsGraph* source, int startPointIdx,
9090
{
9191
const QgsGraphArc& arc = source->arc( result[i].second );
9292

93-
treeResult->addArc( source2result[ arc.outVertex() ], source2result[ i ],
93+
treeResult->addArc( source2result[ arc.outVertex()], source2result[ i ],
9494
arc.properties() );
9595
}
9696
}

src/analysis/network/qgsgraphbuilderintr.h

100644100755
+13-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,11 @@ class ANALYSIS_EXPORT QgsGraphBuilderInterface
8383
* @param pt vertex coordinate
8484
* @note id and pt are redundant. You can use pt or id to identify the vertex
8585
*/
86-
virtual void addVertex( int id, const QgsPoint &pt ) = 0;
86+
virtual void addVertex( int id, const QgsPoint &pt )
87+
{
88+
Q_UNUSED( id );
89+
Q_UNUSED( pt );
90+
}
8791

8892
/**
8993
* add arc
@@ -94,7 +98,14 @@ class ANALYSIS_EXPORT QgsGraphBuilderInterface
9498
* @param properties arc properties
9599
* @note pt1id, pt1 and pt2id, pt2 is a redundant interface. You can use vertex coordinates or their identificators.
96100
*/
97-
virtual void addArc( int pt1id, const QgsPoint& pt1, int pt2id, const QgsPoint& pt2, const QVector< QVariant >& properties ) = 0;
101+
virtual void addArc( int pt1id, const QgsPoint& pt1, int pt2id, const QgsPoint& pt2, const QVector< QVariant >& properties )
102+
{
103+
Q_UNUSED( pt1id );
104+
Q_UNUSED( pt1 );
105+
Q_UNUSED( pt2id );
106+
Q_UNUSED( pt2 );
107+
Q_UNUSED( properties );
108+
}
98109

99110
private:
100111
QgsCoordinateReferenceSystem mCrs;

src/analysis/network/qgslinevectorlayerdirector.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class QgsVectorLayer;
3131
* \class QgsLineVectorLayerDirector
3232
* \brief Determine making the graph from vector line layer
3333
*/
34-
class QgsLineVectorLayerDirector : public QgsGraphDirector
34+
class ANALYSIS_EXPORT QgsLineVectorLayerDirector : public QgsGraphDirector
3535
{
3636
public:
3737
/**

src/plugins/roadgraph/roadgraphplugin.h

-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ class RoadGraphPlugin: public QObject, public QgisPlugin
7777
double topologyToleranceFactor();
7878

7979
public slots:
80-
void render( QPainter *painter );
8180
//! init the gui
8281
virtual void initGui();
8382

src/plugins/roadgraph/shortestpathwidget.cpp

100644100755
+3-3
Original file line numberDiff line numberDiff line change
@@ -371,11 +371,11 @@ void RgShortestPathWidget::exportPath()
371371
return;
372372

373373
QgsCoordinateTransform ct( mPlugin->iface()->mapCanvas()->mapRenderer()->destinationCrs(),
374-
vl->crs() );
375-
374+
vl->crs() );
375+
376376
int startVertexIdx = path.findVertex( p1 );
377377
int stopVertexIdx = path.findVertex( p2 );
378-
378+
379379
QgsPolyline p;
380380
while ( startVertexIdx != stopVertexIdx )
381381
{

0 commit comments

Comments
 (0)