remove unnecessary iostream includes

jef-n · jef-n · commit 0a49c8c1bc84 · 2011-11-26T18:57:28.000+01:00
diff --git a/src/analysis/interpolation/DualEdgeTriangulation.h b/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>
diff --git a/src/analysis/interpolation/Node.h b/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
diff --git a/src/analysis/interpolation/ParametricLine.cc b/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;
 }
diff --git a/src/analysis/interpolation/Point3D.h b/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
diff --git a/src/app/ogr/qgsnewogrconnection.cpp b/src/app/ogr/qgsnewogrconnection.cpp
@@ -14,8 +14,6 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <iostream>
-
 #include <QSettings>
 #include <QMessageBox>
 #include <QInputDialog>
diff --git a/src/app/qgsdecorationnortharrow.cpp b/src/app/qgsdecorationnortharrow.cpp
@@ -39,7 +39,6 @@ email                : tim@linfiniti.com
 #include <QFile>
 
 //non qt includes
-#include <iostream>
 #include <cmath>
 #include <cassert>
 
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
@@ -30,7 +30,6 @@
 #include <QColorDialog>
 #include <QFontDialog>
 #include <QTextEdit>
-#include <iostream>
 #include <QApplication>
 #include <QMessageBox>
 
diff --git a/src/browser/main.cpp b/src/browser/main.cpp
@@ -15,7 +15,6 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <iostream>
 #include <QLocale>
 #include <QSettings>
 #include <QTranslator>
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -37,7 +37,6 @@
 #include <QGraphicsView>
 #include <QPainter>
 #include <QSettings>
-#include <iostream>
 #include <cmath>
 
 QgsComposerMap::QgsComposerMap( QgsComposition *composition, int x, int y, int width, int height )
diff --git a/src/core/qgsmaplayerregistry.cpp b/src/core/qgsmaplayerregistry.cpp
@@ -15,8 +15,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <iostream>
-
 #include "qgsmaplayerregistry.h"
 #include "qgsmaplayer.h"
 #include "qgslogger.h"
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -17,7 +17,6 @@
 
 #include "qgspallabeling.h"
 
-#include <iostream>
 #include <list>
 
 #include <pal/pal.h>
diff --git a/src/core/qgsproviderregistry.cpp b/src/core/qgsproviderregistry.cpp
@@ -18,8 +18,6 @@
 
 #include "qgsproviderregistry.h"
 
-#include <iostream>
-
 #include <QString>
 #include <QDir>
 #include <QLibrary>
diff --git a/src/core/qgssearchtreenode.cpp b/src/core/qgssearchtreenode.cpp
@@ -25,7 +25,6 @@
 #include <QObject>
 #include <QSet>
 #include <QSettings>
-#include <iostream>
 
 #include <cmath>
 
diff --git a/src/core/spatialindex/include/tools/Tools.h b/src/core/spatialindex/include/tools/Tools.h
@@ -49,7 +49,6 @@ typedef unsigned __int64 uint64_t;
 #endif
 
 #include <assert.h>
-#include <iostream>
 #include <iomanip>
 #include <iterator>
 #include <string>
diff --git a/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp b/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp
@@ -32,9 +32,6 @@
 #include <QAction>
 #include <QFile>
 
-//non qt includes
-#include <iostream>
-
 //the gui subclass
 #include "qgsdelimitedtextplugingui.h"
 
diff --git a/src/plugins/dxf2shp_converter/dxflib/src/dl_writer.h b/src/plugins/dxf2shp_converter/dxflib/src/dl_writer.h
@@ -36,8 +36,6 @@
 #define strcasecmp(s,t) stricmp(s,t)
 #endif
 
-#include <iostream>
-
 #include "dl_attributes.h"
 #include "dl_codes.h"
 
diff --git a/src/plugins/georeferencer/qgsimagewarper.cpp b/src/plugins/georeferencer/qgsimagewarper.cpp
@@ -14,7 +14,6 @@
  ***************************************************************************/
 
 #include <cmath>
-#include <iostream>
 #include <cstdio>
 
 #include <cpl_conv.h>
diff --git a/src/plugins/gps_importer/qgsgpsdevicedialog.cpp b/src/plugins/gps_importer/qgsgpsdevicedialog.cpp
@@ -13,16 +13,14 @@
 #include "qgsgpsdevicedialog.h"
 #include "qgisgui.h"
 
-#include <iostream>
-
 #include <QMessageBox>
 #include <QSettings>
 
 
-QgsGPSDeviceDialog::QgsGPSDeviceDialog( std::map<QString, QgsGPSDevice*>&
-                                        devices ) :
-    QDialog( 0, QgisGui::ModalDialogFlags ), mDevices( devices )
-
+QgsGPSDeviceDialog::QgsGPSDeviceDialog( std::map<QString,
+                                        QgsGPSDevice*>& devices )
+   : QDialog( 0, QgisGui::ModalDialogFlags )
+   , mDevices( devices )
 {
   setupUi( this );
   setAttribute( Qt::WA_DeleteOnClose );
diff --git a/src/plugins/gps_importer/qgsgpsplugingui.cpp b/src/plugins/gps_importer/qgsgpsplugingui.cpp
@@ -24,15 +24,15 @@
 //standard includes
 #include <cassert>
 #include <cstdlib>
-#include <iostream>
-
 
 QgsGPSPluginGui::QgsGPSPluginGui( const BabelMap& importers,
                                   std::map<QString, QgsGPSDevice*>& devices,
                                   std::vector<QgsVectorLayer*> gpxMapLayers,
                                   QWidget* parent, Qt::WFlags fl )
-    : QDialog( parent, fl ), mGPXLayers( gpxMapLayers ),
-    mImporters( importers ), mDevices( devices )
+    : QDialog( parent, fl )
+    , mGPXLayers( gpxMapLayers )
+    , mImporters( importers )
+    , mDevices( devices )
 {
   setupUi( this );
   populatePortComboBoxes();
diff --git a/src/plugins/spit/qgsspit.cpp b/src/plugins/spit/qgsspit.cpp
@@ -29,8 +29,6 @@
 #include <QTableWidgetItem>
 #include <QInputDialog>
 
-#include <iostream>
-
 #include "qgsencodingfiledialog.h"
 
 #include "qgspgutil.h"
diff --git a/src/providers/gpx/qgsgpxprovider.cpp b/src/providers/gpx/qgsgpxprovider.cpp
@@ -18,7 +18,6 @@
  ***************************************************************************/
 
 #include <algorithm>
-#include <iostream>
 #include <limits>
 #include <cstring>
 #include <cmath>
diff --git a/src/providers/osm/osmhandler.cpp b/src/providers/osm/osmhandler.cpp
@@ -14,7 +14,6 @@
 
 #include "osmhandler.h"
 
-#include <iostream>
 #include <cstring>
 
 #include "qgslogger.h"

Original file line number	Diff line number	Diff line change
`@@ -15,75 +15,74 @@`
`15`	`15`	`***************************************************************************/`
`16`	`16`
`17`	`17`	`#include "ParametricLine.h"`
`18`		`-#include <iostream>`
`19`		`-`
	`18`	`+#include <qgslogger.h>`
`20`	`19`
`21`	`20`	`void ParametricLine::add( ParametricLine* pl )`
`22`	`21`	`{`
`23`	`22`	`Q_UNUSED( pl );`
`24`		`- std::cout << "warning, derive a class from ParametricLine" << std::endl;`
	`23`	`+ QgsDebugMsg( "warning, derive a class from ParametricLine" );`
`25`	`24`	`}`
`26`	`25`
`27`	`26`	`void ParametricLine::calcFirstDer( float t, Vector3D* v )`
`28`	`27`	`{`
`29`	`28`	`Q_UNUSED( t );`
`30`	`29`	`Q_UNUSED( v );`
`31`		`- std::cout << "warning, derive a class from ParametricLine" << std::endl;`
	`30`	`+ QgsDebugMsg( "warning, derive a class from ParametricLine");`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`void ParametricLine::calcSecDer( float t, Vector3D* v )`
`35`	`34`	`{`
`36`	`35`	`Q_UNUSED( t );`
`37`	`36`	`Q_UNUSED( v );`
`38`		`- std::cout << "warning, derive a class from ParametricLine" << std::endl;`
	`37`	`+ QgsDebugMsg( "warning, derive a class from ParametricLine");`
`39`	`38`	`}`
`40`	`39`
`41`	`40`	`void ParametricLine::calcPoint( float t, Point3D *p )`
`42`	`41`	`{`
`43`	`42`	`Q_UNUSED( t );`
`44`	`43`	`Q_UNUSED( p );`
`45`		`- std::cout << "warning, derive a class from ParametricLine" << std::endl;`
	`44`	`+ QgsDebugMsg( "warning, derive a class from ParametricLine");`
`46`	`45`	`}`
`47`	`46`
`48`	`47`	`ParametricLine* ParametricLine::getParent() const`
`49`	`48`	`{`
`50`		`- std::cout << "warning, derive a class from ParametricLine" << std::endl;`
	`49`	`+ QgsDebugMsg( "warning, derive a class from ParametricLine");`
`51`	`50`	`return 0;`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`void ParametricLine::remove( int i )`
`55`	`54`	`{`
`56`	`55`	`Q_UNUSED( i );`
`57`		`- std::cout << "warning, derive a class from ParametricLine" << std::endl;`
	`56`	`+ QgsDebugMsg( "warning, derive a class from ParametricLine");`
`58`	`57`	`}`
`59`	`58`
`60`	`59`	`void ParametricLine::setControlPoly( QVector<Point3D> cp )`
`61`	`60`	`{`
`62`	`61`	`Q_UNUSED( cp );`
`63`		`- std::cout << "warning, derive a class from ParametricLine" << std::endl;`
	`62`	`+ QgsDebugMsg( "warning, derive a class from ParametricLine");`
`64`	`63`	`}`
`65`	`64`
`66`	`65`	`void ParametricLine::setParent( ParametricLine* paral )`
`67`	`66`	`{`
`68`	`67`	`Q_UNUSED( paral );`
`69`		`- std::cout << "warning, derive a class from ParametricLine" << std::endl;`
	`68`	`+ QgsDebugMsg( "warning, derive a class from ParametricLine");`
`70`	`69`	`}`
`71`	`70`
`72`	`71`	`int ParametricLine::getDegree() const`
`73`	`72`	`{`
`74`		`- std::cout << "warning, derive a class from ParametricLine" << std::endl;`
	`73`	`+ QgsDebugMsg( "warning, derive a class from ParametricLine");`
`75`	`74`	`return mDegree;`
`76`	`75`	`}`
`77`	`76`
`78`	`77`	`const Point3D* ParametricLine::getControlPoint( int number ) const`
`79`	`78`	`{`
`80`	`79`	`Q_UNUSED( number );`
`81`		`- std::cout << "warning, derive a class from ParametricLine" << std::endl;`
	`80`	`+ QgsDebugMsg( "warning, derive a class from ParametricLine");`
`82`	`81`	`return 0;`
`83`	`82`	`}`
`84`	`83`
`85`	`84`	`const QVector<Point3D> ParametricLine::getControlPoly() const`
`86`	`85`	`{`
`87`		`- std::cout << "warning, derive a class from ParametricLine" << std::endl;`
	`86`	`+ QgsDebugMsg( "warning, derive a class from ParametricLine");`
`88`	`87`	`return 0;`
`89`	`88`	`}`