Skip to content

Commit

Permalink
remove duplicate inclusion of qgslogger.h (probably introduced with r…
Browse files Browse the repository at this point in the history
…9138)

git-svn-id: http://svn.osgeo.org/qgis/trunk@15406 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Mar 9, 2011
1 parent 25a0219 commit f0413e7
Show file tree
Hide file tree
Showing 21 changed files with 1 addition and 22 deletions.
1 change: 0 additions & 1 deletion src/app/qgsabout.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/app/qgsbookmarks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include <cassert>
#include <sqlite3.h>
#include <fstream>
#include "qgslogger.h"

QgsBookmarks::QgsBookmarks( QWidget *parent, Qt::WFlags fl )
: QDialog( parent, fl ),
Expand Down
1 change: 0 additions & 1 deletion src/app/qgsclipboard.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include "qgsgeometry.h"
#include "qgscoordinatereferencesystem.h"
#include "qgslogger.h"
#include "qgslogger.h"


QgsClipboard::QgsClipboard()
Expand Down
1 change: 0 additions & 1 deletion src/app/qgscustomprojectiondialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
//stdc++ includes
#include <fstream>
#include <sqlite3.h>
#include "qgslogger.h"

//proj4 includes
extern "C"
Expand Down
1 change: 0 additions & 1 deletion src/app/qgspluginmanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@

#include <qgspythonutils.h>
#include "qgsapplication.h"
#include "qgslogger.h"

// Do we need this?
// #define TESTLIB
Expand Down
1 change: 0 additions & 1 deletion src/app/qgsprojectproperties.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include "qgssnappingdialog.h"
#include "qgsrasterlayer.h"
#include "qgsgenericprojectionselector.h"
#include "qgslogger.h"

//qt includes
#include <QColorDialog>
Expand Down
1 change: 0 additions & 1 deletion src/app/qgsquerybuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include <QMessageBox>
#include <QRegExp>
#include <QPushButton>
#include "qgslogger.h"
#include "qgsvectorlayer.h"
#include "qgsvectordataprovider.h"

Expand Down
1 change: 0 additions & 1 deletion src/app/qgsrasterlayerproperties.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
#include <QList>
#include <QSettings>
#include <QMouseEvent>
#include "qgslogger.h"

// QWT Charting widget
#include <qwt_plot_canvas.h>
Expand Down
3 changes: 1 addition & 2 deletions src/core/qgscoordinatetransform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include <QDomNode>
#include <QDomElement>
#include <QApplication>
#include "qgslogger.h"

extern "C"
{
Expand Down Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion src/core/qgsgeometry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/core/qgshttptransaction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#include <QUrl>
#include <QSettings>
#include <QTimer>
#include "qgslogger.h"

static int HTTP_PORT_DEFAULT = 80;

Expand Down
1 change: 0 additions & 1 deletion src/core/qgsmaplayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
#include "qgscoordinatereferencesystem.h"
#include "qgsapplication.h"
#include "qgsproject.h"
#include "qgslogger.h"
#include "qgsdatasourceuri.h"
#include "qgsvectorlayer.h"

Expand Down
1 change: 0 additions & 1 deletion src/core/qgspallabeling.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
#include <qgsvectordataprovider.h>
#include <qgsgeometry.h>
#include <qgsmaprenderer.h>
#include "qgslogger.h"


using namespace pal;
Expand Down
1 change: 0 additions & 1 deletion src/core/qgsproject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/core/raster/qgsrasterlayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
1 change: 0 additions & 1 deletion src/core/symbology/qgssymbol.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) :
Expand Down
1 change: 0 additions & 1 deletion src/gui/qgsprojectionselector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#include <QResizeEvent>
#include <QMessageBox>
#include <QSettings>
#include "qgslogger.h"

const int NAME_COLUMN = 0;
const int AUTHID_COLUMN = 1;
Expand Down
1 change: 0 additions & 1 deletion src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,6 @@ void QgsSymbolV2PropertiesDialog::lockLayer()
layer->setLocked( btnLock->isChecked() );
}

#include "qgslogger.h"

void QgsSymbolV2PropertiesDialog::keyPressEvent( QKeyEvent * e )
{
Expand Down
1 change: 0 additions & 1 deletion src/plugins/gps_importer/qgsgpsplugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@

//the gui subclass
#include "qgsgpsplugingui.h"
#include "qgslogger.h"


static const char * const ident_ = "$Id$";
Expand Down
1 change: 0 additions & 1 deletion src/plugins/spit/qgsshapefile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
1 change: 0 additions & 1 deletion src/providers/ogr/qgsogrprovider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit f0413e7

Please sign in to comment.