fix windows build

git-svn-id: http://svn.osgeo.org/qgis/trunk@11991 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 7, 2009 · 3b3ca67 · 3b3ca67
1 parent 6d6df28
commit 3b3ca67
Show file tree

Hide file tree

Showing 8 changed files with 338 additions and 343 deletions.
diff --git a/src/analysis/interpolation/Bezier3D.cc b/src/analysis/interpolation/Bezier3D.cc
@@ -15,7 +15,7 @@
  ***************************************************************************/
 
 #include "Bezier3D.h"
-#include <iostream>
+#include "qgslogger.h"
 
 
 void Bezier3D::calcFirstDer( float t, Vector3D* v )
@@ -31,7 +31,7 @@ void Bezier3D::calcFirstDer( float t, Vector3D* v )
       return;
     }
 
-    for ( int n = 1;n <= int( mControlPoly->count() - 1 );n++ )
+    for ( int n = 1; n <= int( mControlPoly->count() - 1 ); n++ )
     {
       double bernst = MathUtils::calcBernsteinPoly( mControlPoly->count() - 2, n - 1, t );
       v->setX( v->getX() + (( *mControlPoly )[n]->getX() - ( *mControlPoly )[n-1]->getX() )*bernst );
@@ -45,7 +45,7 @@ void Bezier3D::calcFirstDer( float t, Vector3D* v )
 
   else
   {
-    std::cout << "warning: null pointer in Bezier3D::calcFirstDer" << std::endl << std::flush;
+    QgsDebugMsg( "warning: null pointer" );
   }
 }
 
@@ -58,7 +58,7 @@ void Bezier3D::calcPoint( float t, Point3D* p )
     p->setY( 0 );
     p->setZ( 0 );
 
-    for ( int n = 1;n <= int( mControlPoly->count() );n++ )
+    for ( int n = 1; n <= int( mControlPoly->count() ); n++ )
     {
       double bernst = MathUtils::calcBernsteinPoly( mControlPoly->count() - 1, n - 1, t );
       p->setX( p->getX() + ( *mControlPoly )[n-1]->getX()*bernst );
@@ -69,7 +69,7 @@ void Bezier3D::calcPoint( float t, Point3D* p )
 
   else
   {
-    std::cout << "warning: null pointer in Bezier3D::calcPoint" << std::endl << std::flush;
+    QgsDebugMsg( "warning: null pointer" );
   }
 }
 
@@ -86,7 +86,7 @@ void Bezier3D::calcSecDer( float t, Vector3D* v )
       return;
     }
 
-    for ( int n = 1;n <= int( mControlPoly->count() - 2 );n++ )
+    for ( int n = 1; n <= int( mControlPoly->count() - 2 ); n++ )
     {
       double bernst = MathUtils::calcBernsteinPoly( mControlPoly->count() - 3, n - 1, t );
       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 )
 
   else
   {
-    std::cout << "warning: null pointer in Bezier3D::calcSecDer" << std::endl << std::flush;
+    QgsDebugMsg( "warning: null pointer" );
   }
 }
 
@@ -110,20 +110,20 @@ void Bezier3D::changeDirection()//does this work correctli? more testing is need
   if ( mControlPoly )
   {
     Point3D** pointer = new Point3D*[mControlPoly->count()];//create an array to temporarily store pointer to the control points
-    for ( uint i = 0;i < mControlPoly->count();i++ )//store the points
+    for ( int i = 0; i < mControlPoly->count(); i++ )//store the points
     {
       pointer[i] = ( *mControlPoly )[i];
     }
 
-    for ( uint i = 0;i < mControlPoly->count();i++ )
+    for ( int i = 0; i < mControlPoly->count(); i++ )
     {
       mControlPoly->insert( i, pointer[( mControlPoly->count()-1 )-i] );
     }
   }
 
   else
   {
-    std::cout << "warning: null pointer in Bezier3D::changeDirection" << std::endl << std::flush;
+    QgsDebugMsg( "warning: null pointer" );
   }
 }
 

diff --git a/src/analysis/interpolation/Bezier3D.h b/src/analysis/interpolation/Bezier3D.h
@@ -17,11 +17,10 @@
 #ifndef BEZIER3D_H
 #define BEZIER3D_H
 
-using namespace std;
-
 #include "ParametricLine.h"
 #include "Vector3D.h"
 #include "MathUtils.h"
+#include "qgslogger.h"
 
 /**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.*/
 class ANALYSIS_EXPORT Bezier3D: public ParametricLine
@@ -86,12 +85,12 @@ inline Bezier3D::~Bezier3D()
 
 inline void Bezier3D::add( ParametricLine* pl )
 {
-  cout << "Error!!!!! A Bezier-curve can not be parent of a ParametricLine." << endl;
+  QgsDebugMsg( "Error!!!!! A Bezier-curve can not be parent of a ParametricLine." );
 }
 
 inline void Bezier3D::remove( int i )
 {
-  cout << "Error!!!!! A Bezier-curve has no Childs to remove." << endl;
+  QgsDebugMsg( "Error!!!!! A Bezier-curve has no Childs to remove." );
 }
 
 //-----------------------------------------------setters and getters---------------------------------------------------------------
@@ -127,10 +126,4 @@ inline void Bezier3D::setControlPoly( QVector<Point3D*>* cp )
   mDegree = mControlPoly->count() - 1;
 }
 
-#endif
-
-
-
-
-
-
+#endif