Skip to content

Commit 3b3ca67

Browse files
author
jef
committedNov 7, 2009
fix windows build
git-svn-id: http://svn.osgeo.org/qgis/trunk@11991 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 6d6df28 commit 3b3ca67

File tree

8 files changed

+338
-343
lines changed

8 files changed

+338
-343
lines changed
 

‎src/analysis/interpolation/Bezier3D.cc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
***************************************************************************/
1616

1717
#include "Bezier3D.h"
18-
#include <iostream>
18+
#include "qgslogger.h"
1919

2020

2121
void Bezier3D::calcFirstDer( float t, Vector3D* v )
@@ -31,7 +31,7 @@ void Bezier3D::calcFirstDer( float t, Vector3D* v )
3131
return;
3232
}
3333

34-
for ( int n = 1;n <= int( mControlPoly->count() - 1 );n++ )
34+
for ( int n = 1; n <= int( mControlPoly->count() - 1 ); n++ )
3535
{
3636
double bernst = MathUtils::calcBernsteinPoly( mControlPoly->count() - 2, n - 1, t );
3737
v->setX( v->getX() + (( *mControlPoly )[n]->getX() - ( *mControlPoly )[n-1]->getX() )*bernst );
@@ -45,7 +45,7 @@ void Bezier3D::calcFirstDer( float t, Vector3D* v )
4545

4646
else
4747
{
48-
std::cout << "warning: null pointer in Bezier3D::calcFirstDer" << std::endl << std::flush;
48+
QgsDebugMsg( "warning: null pointer" );
4949
}
5050
}
5151

@@ -58,7 +58,7 @@ void Bezier3D::calcPoint( float t, Point3D* p )
5858
p->setY( 0 );
5959
p->setZ( 0 );
6060

61-
for ( int n = 1;n <= int( mControlPoly->count() );n++ )
61+
for ( int n = 1; n <= int( mControlPoly->count() ); n++ )
6262
{
6363
double bernst = MathUtils::calcBernsteinPoly( mControlPoly->count() - 1, n - 1, t );
6464
p->setX( p->getX() + ( *mControlPoly )[n-1]->getX()*bernst );
@@ -69,7 +69,7 @@ void Bezier3D::calcPoint( float t, Point3D* p )
6969

7070
else
7171
{
72-
std::cout << "warning: null pointer in Bezier3D::calcPoint" << std::endl << std::flush;
72+
QgsDebugMsg( "warning: null pointer" );
7373
}
7474
}
7575

@@ -86,7 +86,7 @@ void Bezier3D::calcSecDer( float t, Vector3D* v )
8686
return;
8787
}
8888

89-
for ( int n = 1;n <= int( mControlPoly->count() - 2 );n++ )
89+
for ( int n = 1; n <= int( mControlPoly->count() - 2 ); n++ )
9090
{
9191
double bernst = MathUtils::calcBernsteinPoly( mControlPoly->count() - 3, n - 1, t );
9292
v->setX( v->getX() + (( *mControlPoly )[n+1]->getX() - 2*( *mControlPoly )[n]->getX() + ( *mControlPoly )[n-1]->getX() )*bernst );
@@ -100,7 +100,7 @@ void Bezier3D::calcSecDer( float t, Vector3D* v )
100100

101101
else
102102
{
103-
std::cout << "warning: null pointer in Bezier3D::calcSecDer" << std::endl << std::flush;
103+
QgsDebugMsg( "warning: null pointer" );
104104
}
105105
}
106106

@@ -110,20 +110,20 @@ void Bezier3D::changeDirection()//does this work correctli? more testing is need
110110
if ( mControlPoly )
111111
{
112112
Point3D** pointer = new Point3D*[mControlPoly->count()];//create an array to temporarily store pointer to the control points
113-
for ( uint i = 0;i < mControlPoly->count();i++ )//store the points
113+
for ( int i = 0; i < mControlPoly->count(); i++ )//store the points
114114
{
115115
pointer[i] = ( *mControlPoly )[i];
116116
}
117117

118-
for ( uint i = 0;i < mControlPoly->count();i++ )
118+
for ( int i = 0; i < mControlPoly->count(); i++ )
119119
{
120120
mControlPoly->insert( i, pointer[( mControlPoly->count()-1 )-i] );
121121
}
122122
}
123123

124124
else
125125
{
126-
std::cout << "warning: null pointer in Bezier3D::changeDirection" << std::endl << std::flush;
126+
QgsDebugMsg( "warning: null pointer" );
127127
}
128128
}
129129

‎src/analysis/interpolation/Bezier3D.h

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@
1717
#ifndef BEZIER3D_H
1818
#define BEZIER3D_H
1919

20-
using namespace std;
21-
2220
#include "ParametricLine.h"
2321
#include "Vector3D.h"
2422
#include "MathUtils.h"
23+
#include "qgslogger.h"
2524

2625
/**Class Bezier3D represents a bezier curve, represented by control points. Parameter t is running from 0 to 1. The class is capable to calculate the curve point and the first two derivatives belonging to t.*/
2726
class ANALYSIS_EXPORT Bezier3D: public ParametricLine
@@ -86,12 +85,12 @@ inline Bezier3D::~Bezier3D()
8685

8786
inline void Bezier3D::add( ParametricLine* pl )
8887
{
89-
cout << "Error!!!!! A Bezier-curve can not be parent of a ParametricLine." << endl;
88+
QgsDebugMsg( "Error!!!!! A Bezier-curve can not be parent of a ParametricLine." );
9089
}
9190

9291
inline void Bezier3D::remove( int i )
9392
{
94-
cout << "Error!!!!! A Bezier-curve has no Childs to remove." << endl;
93+
QgsDebugMsg( "Error!!!!! A Bezier-curve has no Childs to remove." );
9594
}
9695

9796
//-----------------------------------------------setters and getters---------------------------------------------------------------
@@ -127,10 +126,4 @@ inline void Bezier3D::setControlPoly( QVector<Point3D*>* cp )
127126
mDegree = mControlPoly->count() - 1;
128127
}
129128

130-
#endif
131-
132-
133-
134-
135-
136-
129+
#endif

‎src/analysis/interpolation/CloughTocherInterpolator.cc

Lines changed: 265 additions & 262 deletions
Large diffs are not rendered by default.

‎src/analysis/interpolation/NormVecDecorator.cc

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@
1515
***************************************************************************/
1616

1717
#include "NormVecDecorator.h"
18+
#include "qgslogger.h"
1819

1920
NormVecDecorator::~NormVecDecorator()
2021
{
2122
//remove all the normals
2223
if ( mNormVec->count() > 0 )
2324
{
24-
for ( unsigned int i = 0; i < mNormVec->count();i++ )
25+
for ( int i = 0; i < mNormVec->count(); i++ )
2526
{
2627
delete( *mNormVec )[i];
2728
}
@@ -45,7 +46,7 @@ int NormVecDecorator::addPoint( Point3D* p )
4546

4647
if ( pointno == -100 )//a numerical error occured
4748
{
48-
//cout << "warning, numerical error in NormVecDecorator::addPoint" << endl << flush;
49+
// QgsDebugMsg("warning, numerical error");
4950
return -100;
5051
}
5152

@@ -73,6 +74,8 @@ int NormVecDecorator::addPoint( Point3D* p )
7374
}
7475
return pointno;
7576
}
77+
78+
return -1;
7679
}
7780

7881
bool NormVecDecorator::calcNormal( double x, double y, Vector3D* result )
@@ -90,7 +93,7 @@ bool NormVecDecorator::calcNormal( double x, double y, Vector3D* result )
9093
}
9194
else
9295
{
93-
cout << "warning, null pointer in NormVecDecorator::calcNormal" << endl << flush;
96+
QgsDebugMsg( "warning, null pointer" );
9497
return false;
9598
}
9699
}
@@ -125,7 +128,7 @@ bool NormVecDecorator::calcNormalForPoint( double x, double y, int point, Vector
125128

126129
if ((( vlist->count() ) % 4 ) != 0 )//number of items in vlist has to be a multiple of 4
127130
{
128-
cout << "warning, wrong number of items in vlist in NormVecDecorator::calcNormalForPoint" << endl << flush;
131+
QgsDebugMsg( "warning, wrong number of items in vlist" );
129132
return false;
130133
}
131134

@@ -138,7 +141,7 @@ bool NormVecDecorator::calcNormalForPoint( double x, double y, int point, Vector
138141
numberofruns++;
139142
if ( numberofruns > limit )
140143
{
141-
cout << "warning, a probable endless loop is detected in NormVecDecorator::calcNormalForPoint" << endl << flush;
144+
QgsDebugMsg( "warning, a probable endless loop is detected" );
142145
return false;
143146
}
144147

@@ -185,7 +188,7 @@ bool NormVecDecorator::calcNormalForPoint( double x, double y, int point, Vector
185188
{
186189
if ( pointfound == false )//the point with coordinates x, y was in no triangle
187190
{
188-
cout << "warning: point (x,y) was in no triangle (NormVecDecorator::calcNormalForPoint)" << endl << flush;
191+
QgsDebugMsg( "warning: point (x,y) was in no triangle" );
189192
return false;
190193
}
191194
result->standardise();
@@ -220,7 +223,7 @@ bool NormVecDecorator::calcNormalForPoint( double x, double y, int point, Vector
220223

221224
else
222225
{
223-
cout << "warning, null pointer in NormVecDecorator::calcNormalForPoint" << endl << flush;
226+
QgsDebugMsg( "warning, null pointer" );
224227
return false;
225228
}
226229

@@ -242,7 +245,7 @@ bool NormVecDecorator::calcPoint( double x, double y, Point3D* result )
242245
}
243246
else
244247
{
245-
cout << "warning, null pointer in NormVecDecorator::calcNormal" << endl << flush;
248+
QgsDebugMsg( "warning, null pointer" );
246249
return false;
247250
}
248251
}
@@ -273,7 +276,7 @@ bool NormVecDecorator::getTriangle( double x, double y, Point3D* p1, Vector3D* v
273276
}
274277
else
275278
{
276-
cout << "warning, null pointer in NormVecDecorator::getTriangle(double,double,Point3D*,Vector3D*,Point3D*,Vector3D*,Point3D*,Vector3D*" << endl << flush;
279+
QgsDebugMsg( "warning, null pointer" );
277280
delete nr1;
278281
delete nr2;
279282
delete nr3;
@@ -298,7 +301,7 @@ bool NormVecDecorator::getTriangle( double x, double y, Point3D* p1, Vector3D* v
298301

299302
else
300303
{
301-
cout << "warning, null pointer in NormVecDecorator::getTriangle" << endl << flush;
304+
QgsDebugMsg( "warning, null pointer" );
302305
return false;
303306
}
304307
}
@@ -311,7 +314,7 @@ NormVecDecorator::pointState NormVecDecorator::getState( int pointno ) const
311314
}
312315
else
313316
{
314-
cout << "warning, number below 0 in NormVecDecorator::getState" << endl << flush;
317+
QgsDebugMsg( "warning, number below 0" );
315318
return mPointState->at( 0 );//just to avoid a compiler warning
316319
}
317320
}
@@ -345,14 +348,14 @@ bool NormVecDecorator::getTriangle( double x, double y, Point3D* p1, int* ptn1,
345348
}
346349
else
347350
{
348-
cout << "warning, getTriangle returned false in NormVecDecorator::getTriangle" << endl << flush;
351+
QgsDebugMsg( "warning, getTriangle returned false" );
349352
return false;
350353
}
351354

352355
}
353356
else
354357
{
355-
cout << "warning, null pointer in NormVecDecorator::getTriangle" << endl << flush;
358+
QgsDebugMsg( "warning, null pointer" );
356359
return false;
357360
}
358361
}
@@ -381,7 +384,7 @@ bool NormVecDecorator::estimateFirstDerivative( int pointno )
381384
//something went wrong in getSurroundingTriangles, set the normal to (0,0,0)
382385
if ( mNormVec->size() <= mNormVec->count() )//allocate more memory if neccessary
383386
{
384-
cout << "resizing mNormVec from " << mNormVec->size() << " to " << mNormVec->size() + 1 << endl << flush;
387+
QgsDebugMsg( QString( "resizing mNormVec from %1 to %2" ).arg( mNormVec->size() ).arg( mNormVec->size() + 1 ) );
385388
mNormVec->resize( mNormVec->size() + 1 );
386389
}
387390

@@ -401,9 +404,9 @@ bool NormVecDecorator::estimateFirstDerivative( int pointno )
401404
return false;
402405
}
403406

404-
if ((( vlist->count() ) % 4 ) != 0 )//number of items in vlist has to be a multiple of 4
407+
if (( vlist->count() % 4 ) != 0 ) //number of items in vlist has to be a multiple of 4
405408
{
406-
cout << "warning, wrong number of items in vlist in NormVecDecorator::estimateFirstDerivatives" << endl << flush;
409+
QgsDebugMsg( "warning, wrong number of items in vlist" );
407410
return false;
408411
}
409412

@@ -479,7 +482,7 @@ bool NormVecDecorator::estimateFirstDerivative( int pointno )
479482
//insert the new calculated vector
480483
if ( mNormVec->size() <= mNormVec->count() )//allocate more memory if neccessary
481484
{
482-
cout << "resizing mNormVec from " << mNormVec->size() << " to " << mNormVec->size() + 1 << endl << flush;
485+
QgsDebugMsg( QString( "resizing mNormVec from %1 to %2" ).arg( mNormVec->size() ).arg( mNormVec->size() + 1 ) );
483486
mNormVec->resize( mNormVec->size() + 1 );
484487
}
485488

@@ -499,7 +502,7 @@ bool NormVecDecorator::estimateFirstDerivative( int pointno )
499502

500503
if ( pointno >= mPointState->size() )
501504
{
502-
cout << "resizing mPointState from " << mPointState->size() << " to " << mPointState->size() + 1 << endl << flush;
505+
QgsDebugMsg( QString( "resizing mPointState from %1 to %2" ).arg( mPointState->size() ).arg( mPointState->size() + 1 ) );
503506
mPointState->resize( mPointState->size() + 1 );
504507
}
505508

@@ -511,7 +514,7 @@ bool NormVecDecorator::estimateFirstDerivative( int pointno )
511514
//weighted method of little
512515
bool NormVecDecorator::estimateFirstDerivatives()
513516
{
514-
for ( int i = 0;i < getNumberOfPoints();i++ )
517+
for ( int i = 0; i < getNumberOfPoints(); i++ )
515518
{
516519
estimateFirstDerivative( i );
517520
}
@@ -535,7 +538,7 @@ void NormVecDecorator::eliminateHorizontalTriangles()
535538
}
536539
else
537540
{
538-
cout << "warning, null pointer in NormVecDecorator::eliminateHorizontalTriangles" << endl << flush;
541+
QgsDebugMsg( "warning, null pointer" );
539542
}
540543
}
541544

@@ -547,23 +550,23 @@ void NormVecDecorator::setState( int pointno, pointState s )
547550
}
548551
else
549552
{
550-
cout << "warning, pointno>0 in NormVecDecorator::setState" << endl << flush;
553+
QgsDebugMsg( "warning, pointno>0" );
551554
}
552555
}
553556

554557
bool NormVecDecorator::swapEdge( double x, double y )
555558
{
556559
if ( mTIN )
557560
{
558-
bool b;
561+
bool b = false;
559562
if ( alreadyestimated )
560563
{
561564
QList<int>* list = getPointsAroundEdge( x, y );
562565
if ( list )
563566
{
564567
b = mTIN->swapEdge( x, y );
565568
QList<int>::iterator it;
566-
for ( it = list->begin();it != list->end();++it )
569+
for ( it = list->begin(); it != list->end(); ++it )
567570
{
568571
estimateFirstDerivative(( *it ) );
569572
}
@@ -578,7 +581,7 @@ bool NormVecDecorator::swapEdge( double x, double y )
578581
}
579582
else
580583
{
581-
cout << "warning, null pointer in NormVecDecorator::swapEdge" << endl << flush;
584+
QgsDebugMsg( "warning, null pointer" );
582585
return false;
583586
}
584587
}

‎src/analysis/interpolation/NormVecDecorator.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@
1717
#ifndef NORMVECDECORATOR_H
1818
#define NORMVECDECORATOR_H
1919

20-
using namespace std;
21-
2220
#include "TriDecorator.h"
2321
#include <TriangleInterpolator.h>
2422
#include <MathUtils.h>
23+
#include "qgslogger.h"
2524

2625
/**Decorator class which adds the functionality of estimating normals at the data points*/
2726
class ANALYSIS_EXPORT NormVecDecorator: public TriDecorator
@@ -99,7 +98,7 @@ inline Vector3D* NormVecDecorator::getNormal( int n ) const
9998
}
10099
else
101100
{
102-
cout << "warning, null pointer in NormVecDecorator::getNormal" << endl << flush;
101+
QgsDebugMsg( "warning, null pointer" );
103102
return 0;
104103
}
105104
}

‎src/analysis/interpolation/TriDecorator.cc

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
***************************************************************************/
1616

1717
#include "TriDecorator.h"
18+
#include "qgslogger.h"
1819

1920
void TriDecorator::addLine( Line3D* line, bool breakline )
2021
{
@@ -24,7 +25,7 @@ void TriDecorator::addLine( Line3D* line, bool breakline )
2425
}
2526
else
2627
{
27-
cout << "warning, null pointer in TriDecorator::addLine" << endl << flush;
28+
QgsDebugMsg( "warning, null pointer" );
2829
}
2930
}
3031

@@ -37,7 +38,7 @@ int TriDecorator::addPoint( Point3D* p )
3738
}
3839
else
3940
{
40-
cout << "warning, null pointer in TriDecorator::addPoint" << endl << flush;
41+
QgsDebugMsg( "warning, null pointer" );
4142
return 0;
4243
}
4344
}
@@ -50,7 +51,7 @@ void TriDecorator::performConsistencyTest()
5051
}
5152
else
5253
{
53-
cout << "warning, null pointer in TriDecorator::performConsistencyTest" << endl << flush;
54+
QgsDebugMsg( "warning, null pointer" );
5455
}
5556
}
5657

@@ -63,7 +64,7 @@ bool TriDecorator::calcNormal( double x, double y, Vector3D* result )
6364
}
6465
else
6566
{
66-
cout << "warning, null pointer in TriDecorator::calcNormal" << endl << flush;
67+
QgsDebugMsg( "warning, null pointer" );
6768
return false;
6869
}
6970
}
@@ -77,7 +78,7 @@ bool TriDecorator::calcPoint( double x, double y, Point3D* result )
7778
}
7879
else
7980
{
80-
cout << "warning, null pointer in TriDecorator::calcPoint" << endl << flush;
81+
QgsDebugMsg( "warning, null pointer" );
8182
return false;
8283
}
8384
}
@@ -91,7 +92,7 @@ Point3D* TriDecorator::getPoint( unsigned int i ) const
9192
}
9293
else
9394
{
94-
cout << "warning, null pointer in TriDecorator::getPoint" << endl << flush;
95+
QgsDebugMsg( "warning, null pointer" );
9596
return 0;
9697
}
9798
}
@@ -105,7 +106,7 @@ bool TriDecorator::getTriangle( double x, double y, Point3D* p1, int* n1, Point3
105106
}
106107
else
107108
{
108-
cout << "warning, null pointer in TriDecorator::getTriangle" << endl << flush;
109+
QgsDebugMsg( "warning, null pointer" );
109110
return false;
110111
}
111112
}
@@ -119,7 +120,7 @@ bool TriDecorator::getTriangle( double x, double y, Point3D* p1, Point3D* p2, Po
119120
}
120121
else
121122
{
122-
cout << "warning, null pointer in TriDecorator::getTriangle" << endl << flush;
123+
QgsDebugMsg( "warning, null pointer" );
123124
return false;
124125
}
125126
}
@@ -132,7 +133,7 @@ int TriDecorator::getNumberOfPoints() const
132133
}
133134
else
134135
{
135-
cout << "warning, null pointer in TriDecorator::getNumberOfPoints" << endl << flush;
136+
QgsDebugMsg( "warning, null pointer" );
136137
return false;
137138
}
138139
}
@@ -146,7 +147,7 @@ int TriDecorator::getOppositePoint( int p1, int p2 )
146147
}
147148
else
148149
{
149-
cout << "warning, null pointer in TriDecorator::getOppositePoint" << endl << flush;
150+
QgsDebugMsg( "warning, null pointer" );
150151
return 0;
151152
}
152153
}
@@ -160,7 +161,7 @@ QList<int>* TriDecorator::getSurroundingTriangles( int pointno )
160161
}
161162
else
162163
{
163-
cout << "warning, null pointer in TriDecorator::getSurroundingTriangles" << endl << flush;
164+
QgsDebugMsg( "warning, null pointer" );
164165
return 0;
165166
}
166167
}
@@ -174,7 +175,7 @@ double TriDecorator::getXMax() const
174175
}
175176
else
176177
{
177-
cout << "warning, null pointer in TriDecorator::getXMax" << endl << flush;
178+
QgsDebugMsg( "warning, null pointer" );
178179
return 0;
179180
}
180181
}
@@ -188,7 +189,7 @@ double TriDecorator::getXMin() const
188189
}
189190
else
190191
{
191-
cout << "warning, null pointer in TriDecorator::getXMin" << endl << flush;
192+
QgsDebugMsg( "warning, null pointer" );
192193
return 0;
193194
}
194195
}
@@ -201,7 +202,7 @@ double TriDecorator::getYMax() const
201202
}
202203
else
203204
{
204-
cout << "warning, null pointer in TriDecorator::getYMax" << endl << flush;
205+
QgsDebugMsg( "warning, null pointer" );
205206
return 0;
206207
}
207208
}
@@ -215,7 +216,7 @@ double TriDecorator::getYMin() const
215216
}
216217
else
217218
{
218-
cout << "warning, null pointer in TriDecorator::getYMin" << endl << flush;
219+
QgsDebugMsg( "warning, null pointer" );
219220
return 0;
220221
}
221222
}
@@ -228,7 +229,7 @@ void TriDecorator::setForcedCrossBehaviour( Triangulation::forcedCrossBehaviour
228229
}
229230
else
230231
{
231-
cout << "warning, null pointer in TriDecorator::setForcedCrossBehaviour" << endl << flush;
232+
QgsDebugMsg( "warning, null pointer" );
232233
}
233234
}
234235

@@ -240,7 +241,7 @@ void TriDecorator::setEdgeColor( int r, int g, int b )
240241
}
241242
else
242243
{
243-
cout << "warning, null pointer in TriDecorator::setEdgeColor" << endl << flush;
244+
QgsDebugMsg( "warning, null pointer" );
244245
}
245246
}
246247

@@ -252,7 +253,7 @@ void TriDecorator::setForcedEdgeColor( int r, int g, int b )
252253
}
253254
else
254255
{
255-
cout << "warning, null pointer in TriDecorator::setForcedEdgeColor" << endl << flush;
256+
QgsDebugMsg( "warning, null pointer" );
256257
}
257258
}
258259

@@ -264,7 +265,7 @@ void TriDecorator::setBreakEdgeColor( int r, int g, int b )
264265
}
265266
else
266267
{
267-
cout << "warning, null pointer in TriDecorator::setBreakEdgeColor" << endl << flush;
268+
QgsDebugMsg( "warning, null pointer" );
268269
}
269270
}
270271

@@ -276,7 +277,7 @@ void TriDecorator::setTriangleInterpolator( TriangleInterpolator* interpolator )
276277
}
277278
else
278279
{
279-
cout << "warning, null pointer in TriDecorator::setTriangleInterpolator" << endl << flush;
280+
QgsDebugMsg( "warning, null pointer" );
280281
}
281282
}
282283

@@ -288,7 +289,7 @@ void TriDecorator::eliminateHorizontalTriangles()
288289
}
289290
else
290291
{
291-
cout << "warning, null pointer in TriDecorator::swapHorizontalTriangles" << endl << flush;
292+
QgsDebugMsg( "warning, null pointer" );
292293
}
293294
}
294295

@@ -300,7 +301,7 @@ void TriDecorator::ruppertRefinement()
300301
}
301302
else
302303
{
303-
cout << "warning, null pointer in TriDecorator::ruppertRefinement" << endl << flush;
304+
QgsDebugMsg( "warning, null pointer" );
304305
}
305306
}
306307

@@ -313,7 +314,7 @@ bool TriDecorator::pointInside( double x, double y )
313314
}
314315
else
315316
{
316-
cout << "warning, null pointer in TriDecorator::pointInside" << endl << flush;
317+
QgsDebugMsg( "warning, null pointer" );
317318
return false;
318319
}
319320
}
@@ -327,7 +328,7 @@ bool TriDecorator::swapEdge( double x, double y )
327328
}
328329
else
329330
{
330-
cout << "warning, null pointer in TriDecorator::swapEdge" << endl << flush;
331+
QgsDebugMsg( "warning, null pointer" );
331332
return false;
332333
}
333334
}
@@ -340,7 +341,7 @@ QList<int>* TriDecorator::getPointsAroundEdge( double x, double y )
340341
}
341342
else
342343
{
343-
cout << "warning, null pointer in TriDecorator::getPointsAroundEdge" << endl << flush;
344+
QgsDebugMsg( "warning, null pointer" );
344345
return 0;
345346
}
346347
}

‎src/analysis/interpolation/TriDecorator.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
#ifndef TRIDECORATOR_H
1818
#define TRIDECORATOR_H
1919

20-
using namespace std;
21-
2220
#include "Triangulation.h"
2321

2422
/**Decorator class for Triangulations (s. Decorator pattern in Gamma et al.)*/
@@ -81,6 +79,4 @@ inline void TriDecorator::addTriangulation( Triangulation* t )
8179
mTIN = t;
8280
}
8381

84-
#endif
85-
86-
82+
#endif

‎src/plugins/gps_importer/qgsgpsplugingui.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,18 @@ class QgsGPSPluginGui : public QDialog, private Ui::QgsGPSPluginGuiBase
5858
void on_pbnDLOutput_clicked();
5959

6060
private:
61-
6261
void populateDeviceComboBox();
6362
void populateULLayerComboBox();
6463
void populateIMPBabelFormats();
6564
void populatePortComboBoxes();
65+
#if 0
6666
void populateLoadDialog();
67-
/*
6867
void populateDLDialog();
6968
void populateULDialog();
7069
void populateIMPDialog();
7170
void populateCONVDialog();
72-
*/
71+
#endif
72+
7373
private slots:
7474

7575
void on_pbnRefresh_clicked();

0 commit comments

Comments
 (0)
Please sign in to comment.