remove unnecessary iostream includes

qgis · Nov 26, 2011 · 0a49c8c · 0a49c8c
1 parent 7ef04f6
commit 0a49c8c
Show file tree

Hide file tree

Showing 22 changed files with 20 additions and 50 deletions.
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"