src/analysis/interpolation/DualEdgeTriangulation.h

@@ -23,12 +23,10 @@
 #include <QList>
 #include "MathUtils.h"
 #include "TriangleInterpolator.h"
-//#include <qapp.h>
 #include <QColor>
 #include <QFile>
 #include <QTextStream>
 #include <QMessageBox>
-#include <iostream>
 #include <cfloat>
 #include <QBuffer>
 #include <QStringList>

src/analysis/interpolation/Node.h

@@ -18,7 +18,6 @@
 #define NODE_H
 
 #include "Point3D.h"
-#include <iostream>
 
 /**Node is a class used by Line3D. It represents a node in the single directed linked list. Associated Point3D objects are deleted when the node is deleted.*/
 class ANALYSIS_EXPORT Node

src/analysis/interpolation/ParametricLine.cc

@@ -15,75 +15,74 @@
  ***************************************************************************/
 
 #include "ParametricLine.h"
-#include <iostream>
-
+#include <qgslogger.h>
 
 void ParametricLine::add( ParametricLine* pl )
 {
   Q_UNUSED( pl );
-  std::cout << "warning, derive a class from ParametricLine" << std::endl;
+  QgsDebugMsg( "warning, derive a class from ParametricLine" );
 }
 
 void ParametricLine::calcFirstDer( float t, Vector3D* v )
 {
   Q_UNUSED( t );
   Q_UNUSED( v );
-  std::cout << "warning, derive a class from ParametricLine" << std::endl;
+  QgsDebugMsg( "warning, derive a class from ParametricLine");
 }
 
 void ParametricLine::calcSecDer( float t, Vector3D* v )
 {
   Q_UNUSED( t );
   Q_UNUSED( v );
-  std::cout << "warning, derive a class from ParametricLine" << std::endl;
+  QgsDebugMsg( "warning, derive a class from ParametricLine");
 }
 
 void ParametricLine::calcPoint( float t, Point3D *p )
 {
   Q_UNUSED( t );
   Q_UNUSED( p );
-  std::cout << "warning, derive a class from ParametricLine" << std::endl;
+  QgsDebugMsg( "warning, derive a class from ParametricLine");
 }
 
 ParametricLine* ParametricLine::getParent() const
 {
-  std::cout << "warning, derive a class from ParametricLine" << std::endl;
+  QgsDebugMsg( "warning, derive a class from ParametricLine");
   return 0;
 }
 
 void ParametricLine::remove( int i )
 {
   Q_UNUSED( i );
-  std::cout << "warning, derive a class from ParametricLine" << std::endl;
+  QgsDebugMsg( "warning, derive a class from ParametricLine");
 }
 
 void ParametricLine::setControlPoly( QVector<Point3D*>* cp )
 {
   Q_UNUSED( cp );
-  std::cout << "warning, derive a class from ParametricLine" << std::endl;
+  QgsDebugMsg( "warning, derive a class from ParametricLine");
 }
 
 void ParametricLine::setParent( ParametricLine* paral )
 {
   Q_UNUSED( paral );
-  std::cout << "warning, derive a class from ParametricLine" << std::endl;
+  QgsDebugMsg( "warning, derive a class from ParametricLine");
 }
 
 int ParametricLine::getDegree() const
 {
-  std::cout << "warning, derive a class from ParametricLine" << std::endl;
+  QgsDebugMsg( "warning, derive a class from ParametricLine");
   return mDegree;
 }
 
 const Point3D* ParametricLine::getControlPoint( int number ) const
 {
   Q_UNUSED( number );
-  std::cout << "warning, derive a class from ParametricLine" << std::endl;
+  QgsDebugMsg( "warning, derive a class from ParametricLine");
   return 0;
 }
 
 const QVector<Point3D*>* ParametricLine::getControlPoly() const
 {
-  std::cout << "warning, derive a class from ParametricLine" << std::endl;
+  QgsDebugMsg( "warning, derive a class from ParametricLine");
   return 0;
 }

src/analysis/interpolation/Point3D.h

@@ -18,7 +18,6 @@
 #define POINT3D_H
 
 #include <cmath>
-#include <iostream>
 
 /**Point3D is a class to represent a three dimensional point*/
 class ANALYSIS_EXPORT Point3D

src/app/CMakeLists.txt

@@ -124,6 +124,7 @@ SET(QGIS_APP_SRCS
   legend/qgslegendsymbologygroup.cpp
   legend/qgslegendsymbologyitem.cpp
   legend/qgslegendvectorsymbologyitem.cpp
+  legend/qgslayerorder.cpp
 
   ogr/qgsogrhelperfunctions.cpp
   ogr/qgsopenvectorlayerdialog.cpp
@@ -238,6 +239,7 @@ SET (QGIS_APP_MOC_HDRS
   legend/qgslegend.h
   legend/qgsapplegendinterface.h
   legend/qgslegendlayer.h
+  legend/qgslayerorder.h
 
   ogr/qgsopenvectorlayerdialog.h
   ogr/qgsnewogrconnection.h