[QGIS Commit] r15414 - in trunk/qgis/src: app app/gps app/legend core core/composer gui/symbology-ng

[svn_qgis at osgeo.org]

Author: macho
Date: 2011-03-10 01:51:03 -0800 (Thu, 10 Mar 2011)
New Revision: 15414

Modified:
   trunk/qgis/src/app/gps/qgsgpsinformationwidget.cpp
   trunk/qgis/src/app/legend/qgslegendlayer.cpp
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/core/composer/qgscomposermap.cpp
   trunk/qgis/src/core/qgscoordinatereferencesystem.cpp
   trunk/qgis/src/core/qgsmaplayer.cpp
   trunk/qgis/src/core/qgsvectorlayer.cpp
   trunk/qgis/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp
Log:
some more cleanup of dupicate includes


Modified: trunk/qgis/src/app/gps/qgsgpsinformationwidget.cpp
===================================================================
--- trunk/qgis/src/app/gps/qgsgpsinformationwidget.cpp	2011-03-10 08:38:15 UTC (rev 15413)
+++ trunk/qgis/src/app/gps/qgsgpsinformationwidget.cpp	2011-03-10 09:51:03 UTC (rev 15414)
@@ -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>
 
 

Modified: trunk/qgis/src/app/legend/qgslegendlayer.cpp
===================================================================
--- trunk/qgis/src/app/legend/qgslegendlayer.cpp	2011-03-10 08:38:15 UTC (rev 15413)
+++ trunk/qgis/src/app/legend/qgslegendlayer.cpp	2011-03-10 09:51:03 UTC (rev 15414)
@@ -25,7 +25,6 @@
 #include "qgslegendsymbologyitem.h"
 #include "qgslogger.h"
 
-#include "qgsapplication.h"
 #include "qgsfield.h"
 #include "qgsmapcanvasmap.h"
 #include "qgsmaplayerregistry.h"

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2011-03-10 08:38:15 UTC (rev 15413)
+++ trunk/qgis/src/app/qgisapp.cpp	2011-03-10 09:51:03 UTC (rev 15414)
@@ -626,7 +626,7 @@
   removeAnnotationItems();
 
   // cancel request for FileOpen events
-  QgsApplication::setFileOpenEventReceiver( 0 );
+  QgsApplication::setFileOpenEventReceiver( NULL );
 
   // delete map layer registry and provider registry
   QgsApplication::exitQgis();

Modified: trunk/qgis/src/core/composer/qgscomposermap.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposermap.cpp	2011-03-10 08:38:15 UTC (rev 15413)
+++ trunk/qgis/src/core/composer/qgscomposermap.cpp	2011-03-10 09:51:03 UTC (rev 15414)
@@ -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"

Modified: trunk/qgis/src/core/qgscoordinatereferencesystem.cpp
===================================================================
--- trunk/qgis/src/core/qgscoordinatereferencesystem.cpp	2011-03-10 08:38:15 UTC (rev 15413)
+++ trunk/qgis/src/core/qgscoordinatereferencesystem.cpp	2011-03-10 09:51:03 UTC (rev 15414)
@@ -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;
 

Modified: trunk/qgis/src/core/qgsmaplayer.cpp
===================================================================
--- trunk/qgis/src/core/qgsmaplayer.cpp	2011-03-10 08:38:15 UTC (rev 15413)
+++ trunk/qgis/src/core/qgsmaplayer.cpp	2011-03-10 09:51:03 UTC (rev 15414)
@@ -23,7 +23,6 @@
 #include <QSettings> // TODO: get rid of it [MD]
 #include <QDir>
 #include <QFile>
-#include <QFileInfo>
 #include <QDomDocument>
 #include <QDomElement>
 #include <QDomImplementation>

Modified: trunk/qgis/src/core/qgsvectorlayer.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectorlayer.cpp	2011-03-10 08:38:15 UTC (rev 15413)
+++ trunk/qgis/src/core/qgsvectorlayer.cpp	2011-03-10 09:51:03 UTC (rev 15414)
@@ -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"

Modified: trunk/qgis/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp	2011-03-10 08:38:15 UTC (rev 15413)
+++ trunk/qgis/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp	2011-03-10 09:51:03 UTC (rev 15414)
@@ -6,7 +6,6 @@
 #include <QKeyEvent>
 
 #include "qgssymbollayerv2.h"
-#include "qgssymbolv2.h"
 #include "qgssymbollayerv2registry.h"
 
 #include "qgsapplication.h"