[QGIS Commit] r15406 - in trunk/qgis/src: app core core/raster
core/symbology gui gui/symbology-ng plugins/gps_importer
plugins/spit providers/ogr
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Wed Mar 9 14:35:28 EST 2011
Author: jef
Date: 2011-03-09 11:35:28 -0800 (Wed, 09 Mar 2011)
New Revision: 15406
Modified:
trunk/qgis/src/app/qgsabout.cpp
trunk/qgis/src/app/qgsbookmarks.cpp
trunk/qgis/src/app/qgsclipboard.cpp
trunk/qgis/src/app/qgscustomprojectiondialog.cpp
trunk/qgis/src/app/qgspluginmanager.cpp
trunk/qgis/src/app/qgsprojectproperties.cpp
trunk/qgis/src/app/qgsquerybuilder.cpp
trunk/qgis/src/app/qgsrasterlayerproperties.cpp
trunk/qgis/src/core/qgscoordinatetransform.cpp
trunk/qgis/src/core/qgsgeometry.cpp
trunk/qgis/src/core/qgshttptransaction.cpp
trunk/qgis/src/core/qgsmaplayer.cpp
trunk/qgis/src/core/qgspallabeling.cpp
trunk/qgis/src/core/qgsproject.cpp
trunk/qgis/src/core/raster/qgsrasterlayer.cpp
trunk/qgis/src/core/symbology/qgssymbol.cpp
trunk/qgis/src/gui/qgsprojectionselector.cpp
trunk/qgis/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp
trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp
trunk/qgis/src/plugins/spit/qgsshapefile.cpp
trunk/qgis/src/providers/ogr/qgsogrprovider.cpp
Log:
remove duplicate inclusion of qgslogger.h (probably introduced with r9138)
Modified: trunk/qgis/src/app/qgsabout.cpp
===================================================================
--- trunk/qgis/src/app/qgsabout.cpp 2011-03-09 17:11:38 UTC (rev 15405)
+++ trunk/qgis/src/app/qgsabout.cpp 2011-03-09 19:35:28 UTC (rev 15406)
@@ -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
Modified: trunk/qgis/src/app/qgsbookmarks.cpp
===================================================================
--- trunk/qgis/src/app/qgsbookmarks.cpp 2011-03-09 17:11:38 UTC (rev 15405)
+++ trunk/qgis/src/app/qgsbookmarks.cpp 2011-03-09 19:35:28 UTC (rev 15406)
@@ -32,7 +32,6 @@
#include <cassert>
#include <sqlite3.h>
#include <fstream>
-#include "qgslogger.h"
QgsBookmarks::QgsBookmarks( QWidget *parent, Qt::WFlags fl )
: QDialog( parent, fl ),
Modified: trunk/qgis/src/app/qgsclipboard.cpp
===================================================================
--- trunk/qgis/src/app/qgsclipboard.cpp 2011-03-09 17:11:38 UTC (rev 15405)
+++ trunk/qgis/src/app/qgsclipboard.cpp 2011-03-09 19:35:28 UTC (rev 15406)
@@ -31,7 +31,6 @@
#include "qgsgeometry.h"
#include "qgscoordinatereferencesystem.h"
#include "qgslogger.h"
-#include "qgslogger.h"
QgsClipboard::QgsClipboard()
Modified: trunk/qgis/src/app/qgscustomprojectiondialog.cpp
===================================================================
--- trunk/qgis/src/app/qgscustomprojectiondialog.cpp 2011-03-09 17:11:38 UTC (rev 15405)
+++ trunk/qgis/src/app/qgscustomprojectiondialog.cpp 2011-03-09 19:35:28 UTC (rev 15406)
@@ -32,7 +32,6 @@
//stdc++ includes
#include <fstream>
#include <sqlite3.h>
-#include "qgslogger.h"
//proj4 includes
extern "C"
Modified: trunk/qgis/src/app/qgspluginmanager.cpp
===================================================================
--- trunk/qgis/src/app/qgspluginmanager.cpp 2011-03-09 17:11:38 UTC (rev 15405)
+++ trunk/qgis/src/app/qgspluginmanager.cpp 2011-03-09 19:35:28 UTC (rev 15406)
@@ -41,7 +41,6 @@
#include <qgspythonutils.h>
#include "qgsapplication.h"
-#include "qgslogger.h"
// Do we need this?
// #define TESTLIB
Modified: trunk/qgis/src/app/qgsprojectproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsprojectproperties.cpp 2011-03-09 17:11:38 UTC (rev 15405)
+++ trunk/qgis/src/app/qgsprojectproperties.cpp 2011-03-09 19:35:28 UTC (rev 15406)
@@ -32,7 +32,6 @@
#include "qgssnappingdialog.h"
#include "qgsrasterlayer.h"
#include "qgsgenericprojectionselector.h"
-#include "qgslogger.h"
//qt includes
#include <QColorDialog>
Modified: trunk/qgis/src/app/qgsquerybuilder.cpp
===================================================================
--- trunk/qgis/src/app/qgsquerybuilder.cpp 2011-03-09 17:11:38 UTC (rev 15405)
+++ trunk/qgis/src/app/qgsquerybuilder.cpp 2011-03-09 19:35:28 UTC (rev 15406)
@@ -19,7 +19,6 @@
#include <QMessageBox>
#include <QRegExp>
#include <QPushButton>
-#include "qgslogger.h"
#include "qgsvectorlayer.h"
#include "qgsvectordataprovider.h"
Modified: trunk/qgis/src/app/qgsrasterlayerproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsrasterlayerproperties.cpp 2011-03-09 17:11:38 UTC (rev 15405)
+++ trunk/qgis/src/app/qgsrasterlayerproperties.cpp 2011-03-09 19:35:28 UTC (rev 15406)
@@ -48,7 +48,6 @@
#include <QList>
#include <QSettings>
#include <QMouseEvent>
-#include "qgslogger.h"
// QWT Charting widget
#include <qwt_plot_canvas.h>
Modified: trunk/qgis/src/core/qgscoordinatetransform.cpp
===================================================================
--- trunk/qgis/src/core/qgscoordinatetransform.cpp 2011-03-09 17:11:38 UTC (rev 15405)
+++ trunk/qgis/src/core/qgscoordinatetransform.cpp 2011-03-09 19:35:28 UTC (rev 15406)
@@ -23,7 +23,6 @@
#include <QDomNode>
#include <QDomElement>
#include <QApplication>
-#include "qgslogger.h"
extern "C"
{
@@ -140,7 +139,7 @@
//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)
Modified: trunk/qgis/src/core/qgsgeometry.cpp
===================================================================
--- trunk/qgis/src/core/qgsgeometry.cpp 2011-03-09 17:11:38 UTC (rev 15405)
+++ trunk/qgis/src/core/qgsgeometry.cpp 2011-03-09 19:35:28 UTC (rev 15406)
@@ -25,7 +25,6 @@
#include "qgslogger.h"
#include "qgspoint.h"
#include "qgsrectangle.h"
-#include "qgslogger.h"
#include "qgsmaplayerregistry.h"
#include "qgsvectorlayer.h"
Modified: trunk/qgis/src/core/qgshttptransaction.cpp
===================================================================
--- trunk/qgis/src/core/qgshttptransaction.cpp 2011-03-09 17:11:38 UTC (rev 15405)
+++ trunk/qgis/src/core/qgshttptransaction.cpp 2011-03-09 19:35:28 UTC (rev 15406)
@@ -29,7 +29,6 @@
#include <QUrl>
#include <QSettings>
#include <QTimer>
-#include "qgslogger.h"
static int HTTP_PORT_DEFAULT = 80;
Modified: trunk/qgis/src/core/qgsmaplayer.cpp
===================================================================
--- trunk/qgis/src/core/qgsmaplayer.cpp 2011-03-09 17:11:38 UTC (rev 15405)
+++ trunk/qgis/src/core/qgsmaplayer.cpp 2011-03-09 19:35:28 UTC (rev 15406)
@@ -38,7 +38,6 @@
#include "qgscoordinatereferencesystem.h"
#include "qgsapplication.h"
#include "qgsproject.h"
-#include "qgslogger.h"
#include "qgsdatasourceuri.h"
#include "qgsvectorlayer.h"
Modified: trunk/qgis/src/core/qgspallabeling.cpp
===================================================================
--- trunk/qgis/src/core/qgspallabeling.cpp 2011-03-09 17:11:38 UTC (rev 15405)
+++ trunk/qgis/src/core/qgspallabeling.cpp 2011-03-09 19:35:28 UTC (rev 15406)
@@ -45,7 +45,6 @@
#include <qgsvectordataprovider.h>
#include <qgsgeometry.h>
#include <qgsmaprenderer.h>
-#include "qgslogger.h"
using namespace pal;
Modified: trunk/qgis/src/core/qgsproject.cpp
===================================================================
--- trunk/qgis/src/core/qgsproject.cpp 2011-03-09 17:11:38 UTC (rev 15405)
+++ trunk/qgis/src/core/qgsproject.cpp 2011-03-09 19:35:28 UTC (rev 15406)
@@ -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"
Modified: trunk/qgis/src/core/raster/qgsrasterlayer.cpp
===================================================================
--- trunk/qgis/src/core/raster/qgsrasterlayer.cpp 2011-03-09 17:11:38 UTC (rev 15405)
+++ trunk/qgis/src/core/raster/qgsrasterlayer.cpp 2011-03-09 19:35:28 UTC (rev 15406)
@@ -61,7 +61,6 @@
#include <QSlider>
#include <QSettings>
#include <QTime>
-#include "qgslogger.h"
// typedefs for provider plugin functions of interest
typedef void buildsupportedrasterfilefilter_t( QString & theFileFiltersString );
Modified: trunk/qgis/src/core/symbology/qgssymbol.cpp
===================================================================
--- trunk/qgis/src/core/symbology/qgssymbol.cpp 2011-03-09 17:11:38 UTC (rev 15405)
+++ trunk/qgis/src/core/symbology/qgssymbol.cpp 2011-03-09 19:35:28 UTC (rev 15406)
@@ -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 ) :
Modified: trunk/qgis/src/gui/qgsprojectionselector.cpp
===================================================================
--- trunk/qgis/src/gui/qgsprojectionselector.cpp 2011-03-09 17:11:38 UTC (rev 15405)
+++ trunk/qgis/src/gui/qgsprojectionselector.cpp 2011-03-09 19:35:28 UTC (rev 15406)
@@ -29,7 +29,6 @@
#include <QResizeEvent>
#include <QMessageBox>
#include <QSettings>
-#include "qgslogger.h"
const int NAME_COLUMN = 0;
const int AUTHID_COLUMN = 1;
Modified: trunk/qgis/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp 2011-03-09 17:11:38 UTC (rev 15405)
+++ trunk/qgis/src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp 2011-03-09 19:35:28 UTC (rev 15406)
@@ -420,7 +420,6 @@
layer->setLocked( btnLock->isChecked() );
}
-#include "qgslogger.h"
void QgsSymbolV2PropertiesDialog::keyPressEvent( QKeyEvent * e )
{
Modified: trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp
===================================================================
--- trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp 2011-03-09 17:11:38 UTC (rev 15405)
+++ trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp 2011-03-09 19:35:28 UTC (rev 15406)
@@ -46,7 +46,6 @@
//the gui subclass
#include "qgsgpsplugingui.h"
-#include "qgslogger.h"
static const char * const ident_ = "$Id$";
Modified: trunk/qgis/src/plugins/spit/qgsshapefile.cpp
===================================================================
--- trunk/qgis/src/plugins/spit/qgsshapefile.cpp 2011-03-09 17:11:38 UTC (rev 15405)
+++ trunk/qgis/src/plugins/spit/qgsshapefile.cpp 2011-03-09 19:35:28 UTC (rev 15406)
@@ -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()
Modified: trunk/qgis/src/providers/ogr/qgsogrprovider.cpp
===================================================================
--- trunk/qgis/src/providers/ogr/qgsogrprovider.cpp 2011-03-09 17:11:38 UTC (rev 15405)
+++ trunk/qgis/src/providers/ogr/qgsogrprovider.cpp 2011-03-09 19:35:28 UTC (rev 15406)
@@ -41,7 +41,6 @@
#include "qgsfeature.h"
#include "qgsfield.h"
#include "qgsgeometry.h"
-#include "qgslogger.h"
#include "qgscoordinatereferencesystem.h"
#include "qgsvectorfilewriter.h"
More information about the QGIS-commit
mailing list