some more cleanup of dupicate includes

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15414 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Mar 10, 2011 · a9f4e80 · a9f4e80
1 parent d60eb78
commit a9f4e80
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 10 deletions.
diff --git a/src/app/gps/qgsgpsinformationwidget.cpp b/src/app/gps/qgsgpsinformationwidget.cpp
@@ -16,7 +16,6 @@
  ***************************************************************************/
 /*  $Id: qgisapp.h 12390 2009-12-09 21:35:43Z jef $ */
 #include "qgsgpsinformationwidget.h"
-#include "qgsvectorlayer.h"
 #include "qgsnmeaconnection.h"
 #include "qgsgpsconnectionregistry.h"
 #include "qgsgpsdetector.h"
@@ -44,7 +43,6 @@
 #include <qpen.h>
 #include <qwt_data.h>
 #include <qwt_symbol.h>
-#include <qwt_legend.h>
 #include <qwt_polar_grid.h>
 #include <qwt_polar_curve.h>
 #include <qwt_scale_engine.h>
@@ -53,7 +51,6 @@
 #include <QSettings>
 #include <QFileInfo>
 #include <QPointF>
-#include <QSettings>
 #include <QColorDialog>
 
 

diff --git a/src/app/legend/qgslegendlayer.cpp b/src/app/legend/qgslegendlayer.cpp
@@ -25,7 +25,6 @@
 #include "qgslegendsymbologyitem.h"
 #include "qgslogger.h"
 
-#include "qgsapplication.h"
 #include "qgsfield.h"
 #include "qgsmapcanvasmap.h"
 #include "qgsmaplayerregistry.h"

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -626,7 +626,7 @@ QgisApp::~QgisApp()
   removeAnnotationItems();
 
   // cancel request for FileOpen events
-  QgsApplication::setFileOpenEventReceiver( 0 );
+  QgsApplication::setFileOpenEventReceiver( NULL );
 
   // delete map layer registry and provider registry
   QgsApplication::exitQgis();

diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -24,7 +24,6 @@
 #include "qgsmaplayerregistry.h"
 #include "qgsmaptopixel.h"
 #include "qgsproject.h"
-#include "qgsmaprenderer.h"
 #include "qgsrasterlayer.h"
 #include "qgsrendercontext.h"
 #include "qgsscalecalculator.h"

diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -37,7 +37,6 @@
 #include <ogr_srs_api.h>
 #include <cpl_error.h>
 #include <cpl_conv.h>
-#include "qgslogger.h"
 
 CUSTOM_CRS_VALIDATION QgsCoordinateReferenceSystem::mCustomSrsValidation = NULL;
 

diff --git a/src/core/qgsmaplayer.cpp b/src/core/qgsmaplayer.cpp
@@ -23,7 +23,6 @@
 #include <QSettings> // TODO: get rid of it [MD]
 #include <QDir>
 #include <QFile>
-#include <QFileInfo>
 #include <QDomDocument>
 #include <QDomElement>
 #include <QDomImplementation>

diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -65,7 +65,6 @@
 #include "qgsproviderregistry.h"
 #include "qgsrectangle.h"
 #include "qgsrendercontext.h"
-#include "qgssinglesymbolrenderer.h"
 #include "qgscoordinatereferencesystem.h"
 #include "qgsvectordataprovider.h"
 #include "qgsvectorlayerjoinbuffer.h"

diff --git a/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp b/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp
@@ -6,7 +6,6 @@
 #include <QKeyEvent>
 
 #include "qgssymbollayerv2.h"
-#include "qgssymbolv2.h"
 #include "qgssymbollayerv2registry.h"
 
 #include "qgsapplication.h"