remove duplicate inclusion of qgslogger.h (probably introduced with r9138)

jef · jef · commit 0002741ed39f · 2011-03-09T19:35:28.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15406 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsabout.cpp b/src/app/qgsabout.cpp
@@ -28,7 +28,6 @@
 
 /* Uncomment this block to use preloaded images
 #include <map>
-#include "qgslogger.h"
 std::map<QString, QPixmap> mugs;
 */
 #ifdef Q_OS_MACX
diff --git a/src/app/qgsbookmarks.cpp b/src/app/qgsbookmarks.cpp
@@ -32,7 +32,6 @@
 #include <cassert>
 #include <sqlite3.h>
 #include <fstream>
-#include "qgslogger.h"
 
 QgsBookmarks::QgsBookmarks( QWidget *parent, Qt::WFlags fl )
     : QDialog( parent, fl ),
diff --git a/src/app/qgsclipboard.cpp b/src/app/qgsclipboard.cpp
@@ -31,7 +31,6 @@
 #include "qgsgeometry.h"
 #include "qgscoordinatereferencesystem.h"
 #include "qgslogger.h"
-#include "qgslogger.h"
 
 
 QgsClipboard::QgsClipboard()
diff --git a/src/app/qgscustomprojectiondialog.cpp b/src/app/qgscustomprojectiondialog.cpp
@@ -32,7 +32,6 @@
 //stdc++ includes
 #include <fstream>
 #include <sqlite3.h>
-#include "qgslogger.h"
 
 //proj4 includes
 extern "C"
diff --git a/src/app/qgspluginmanager.cpp b/src/app/qgspluginmanager.cpp
@@ -41,7 +41,6 @@
 
 #include <qgspythonutils.h>
 #include "qgsapplication.h"
-#include "qgslogger.h"
 
 // Do we need this?
 // #define TESTLIB
diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp
@@ -32,7 +32,6 @@
 #include "qgssnappingdialog.h"
 #include "qgsrasterlayer.h"
 #include "qgsgenericprojectionselector.h"
-#include "qgslogger.h"
 
 //qt includes
 #include <QColorDialog>
diff --git a/src/app/qgsquerybuilder.cpp b/src/app/qgsquerybuilder.cpp
@@ -19,7 +19,6 @@
 #include <QMessageBox>
 #include <QRegExp>
 #include <QPushButton>
-#include "qgslogger.h"
 #include "qgsvectorlayer.h"
 #include "qgsvectordataprovider.h"
 
diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp
@@ -48,7 +48,6 @@
 #include <QList>
 #include <QSettings>
 #include <QMouseEvent>
-#include "qgslogger.h"
 
 // QWT Charting widget
 #include <qwt_plot_canvas.h>
diff --git a/src/core/qgscoordinatetransform.cpp b/src/core/qgscoordinatetransform.cpp
@@ -23,7 +23,6 @@
 #include <QDomNode>
 #include <QDomElement>
 #include <QApplication>
-#include "qgslogger.h"
 
 extern "C"
 {
@@ -140,7 +139,7 @@ void QgsCoordinateTransform::initialise()
     //No destination projection is set so we set the default output projection to
     //be the same as input proj. This only happens on the first layer loaded
     //whatever that may be...
-    mDestCRS.createFromProj4( mSourceCRS.toProj4() );
+    mDestCRS.createFromOgcWmsCrs( mSourceCRS.authid() );
   }
 
   // init the projections (destination and source)
diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -25,7 +25,6 @@ email                : morb at ozemail dot com dot au
 #include "qgslogger.h"
 #include "qgspoint.h"
 #include "qgsrectangle.h"
-#include "qgslogger.h"
 
 #include "qgsmaplayerregistry.h"
 #include "qgsvectorlayer.h"
diff --git a/src/core/qgshttptransaction.cpp b/src/core/qgshttptransaction.cpp
@@ -29,7 +29,6 @@
 #include <QUrl>
 #include <QSettings>
 #include <QTimer>
-#include "qgslogger.h"
 
 static int HTTP_PORT_DEFAULT = 80;
 
diff --git a/src/core/qgsmaplayer.cpp b/src/core/qgsmaplayer.cpp
@@ -38,7 +38,6 @@
 #include "qgscoordinatereferencesystem.h"
 #include "qgsapplication.h"
 #include "qgsproject.h"
-#include "qgslogger.h"
 #include "qgsdatasourceuri.h"
 #include "qgsvectorlayer.h"
 
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -45,7 +45,6 @@
 #include <qgsvectordataprovider.h>
 #include <qgsgeometry.h>
 #include <qgsmaprenderer.h>
-#include "qgslogger.h"
 
 
 using namespace pal;
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -27,7 +27,6 @@
 #include "qgsmaplayerregistry.h"
 #include "qgsexception.h"
 #include "qgsprojectproperty.h"
-#include "qgslogger.h"
 #include "qgsprojectfiletransform.h"
 #include "qgsprojectversion.h"
 #include "qgspluginlayer.h"
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -61,7 +61,6 @@ email                : tim at linfiniti.com
 #include <QSlider>
 #include <QSettings>
 #include <QTime>
-#include "qgslogger.h"
 
 // typedefs for provider plugin functions of interest
 typedef void buildsupportedrasterfilefilter_t( QString & theFileFiltersString );
diff --git a/src/core/symbology/qgssymbol.cpp b/src/core/symbology/qgssymbol.cpp
@@ -34,7 +34,6 @@
 #include <QDir>
 #include <QFileInfo>
 //#include <QString>
-#include "qgslogger.h"
 //do we have to include qstring?
 
 QgsSymbol::QgsSymbol( QGis::GeometryType t, QString lvalue, QString uvalue, QString label ) :
diff --git a/src/gui/qgsprojectionselector.cpp b/src/gui/qgsprojectionselector.cpp
@@ -29,7 +29,6 @@
 #include <QResizeEvent>
 #include <QMessageBox>
 #include <QSettings>
-#include "qgslogger.h"
 
 const int NAME_COLUMN = 0;
 const int AUTHID_COLUMN = 1;
diff --git a/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp b/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp
@@ -420,7 +420,6 @@ void QgsSymbolV2PropertiesDialog::lockLayer()
   layer->setLocked( btnLock->isChecked() );
 }
 
-#include "qgslogger.h"
 
 void QgsSymbolV2PropertiesDialog::keyPressEvent( QKeyEvent * e )
 {
diff --git a/src/plugins/gps_importer/qgsgpsplugin.cpp b/src/plugins/gps_importer/qgsgpsplugin.cpp
@@ -46,7 +46,6 @@
 
 //the gui subclass
 #include "qgsgpsplugingui.h"
-#include "qgslogger.h"
 
 
 static const char * const ident_ = "$Id$";
diff --git a/src/plugins/spit/qgsshapefile.cpp b/src/plugins/spit/qgsshapefile.cpp
@@ -34,7 +34,6 @@
 #include "qgslogger.h"
 
 #include "qgspgutil.h"
-#include "qgslogger.h"
 
 #if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1800
 #define TO8F(x) (x).toUtf8().constData()
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -41,7 +41,6 @@ email                : sherman at mrcc.com
 #include "qgsfeature.h"
 #include "qgsfield.h"
 #include "qgsgeometry.h"
-#include "qgslogger.h"
 #include "qgscoordinatereferencesystem.h"
 #include "qgsvectorfilewriter.h"
 

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@`
`23`	`23`	`#include <QDomNode>`
`24`	`24`	`#include <QDomElement>`
`25`	`25`	`#include <QApplication>`
`26`		`-#include "qgslogger.h"`
`27`	`26`
`28`	`27`	`extern "C"`
`29`	`28`	`{`
`@@ -140,7 +139,7 @@ void QgsCoordinateTransform::initialise()`
`140`	`139`	`//No destination projection is set so we set the default output projection to`
`141`	`140`	`//be the same as input proj. This only happens on the first layer loaded`
`142`	`141`	`//whatever that may be...`
`143`		`- mDestCRS.createFromProj4( mSourceCRS.toProj4() );`
	`142`	`+ mDestCRS.createFromOgcWmsCrs( mSourceCRS.authid() );`
`144`	`143`	`}`
`145`	`144`
`146`	`145`	`// init the projections (destination and source)`
Original file line number	Diff line number	Diff line change
`@@ -420,7 +420,6 @@ void QgsSymbolV2PropertiesDialog::lockLayer()`
`420`	`420`	`layer->setLocked( btnLock->isChecked() );`
`421`	`421`	`}`
`422`	`422`
`423`		`-#include "qgslogger.h"`
`424`	`423`
`425`	`424`	`void QgsSymbolV2PropertiesDialog::keyPressEvent( QKeyEvent * e )`
`426`	`425`	`{`