Skip to content
Permalink
Browse files

Reduce debug noise and fix Qt5 compatibility

Fix #12145 (Master does not compile with Qt5 libraries)
  • Loading branch information
m-kuhn committed Feb 8, 2015
1 parent a7baf39 commit 2e9cc1a4fff94811d87f7958e3defe64ca0462d5
@@ -17,34 +17,34 @@


#include <QDateTime>
#include <QDomNode>
#include <QFileInfo>
#include <QSettings> // TODO: get rid of it [MD]
#include <QDir>
#include <QFile>
#include <QDomDocument>
#include <QDomElement>
#include <QDomImplementation>
#include <QDomNode>
#include <QFile>
#include <QFileInfo>
#include <QSettings> // TODO: get rid of it [MD]
#include <QTextStream>
#include <QUrl>

#include <sqlite3.h>

#include "qgsapplication.h"
#include "qgscoordinatereferencesystem.h"
#include "qgsdatasourceuri.h"
#include "qgslogger.h"
#include "qgsrectangle.h"
#include "qgsmaplayer.h"
#include "qgscoordinatereferencesystem.h"
#include "qgsapplication.h"
#include "qgsmaplayerlegend.h"
#include "qgsmaplayerstylemanager.h"
#include "qgsproject.h"
#include "qgspluginlayer.h"
#include "qgspluginlayerregistry.h"
#include "qgsprojectfiletransform.h"
#include "qgsdatasourceuri.h"
#include "qgsvectorlayer.h"
#include "qgsrasterlayer.h"
#include "qgspluginlayer.h"
#include "qgsproject.h"
#include "qgsproviderregistry.h"
#include "qgsrasterlayer.h"
#include "qgsrectangle.h"
#include "qgsvectorlayer.h"

QgsMapLayer::QgsMapLayer( QgsMapLayer::LayerType type,
QString lyrname,
@@ -754,12 +754,13 @@ QString QgsMapLayer::lastError()
return QString();
}

#if 0
void QgsMapLayer::connectNotify( const char * signal )
{
Q_UNUSED( signal );
QgsDebugMsgLevel( "QgsMapLayer connected to " + QString( signal ), 3 );
} // QgsMapLayer::connectNotify

#endif


void QgsMapLayer::toggleScaleBasedVisibility( bool theVisibilityFlag )
@@ -19,18 +19,18 @@
#define QGSMAPLAYER_H

#include <QDateTime>
#include <QDomNode>
#include <QImage>
#include <QObject>
#include <QPainter>
#include <QUndoStack>
#include <QVariant>
#include <QImage>
#include <QDomNode>
#include <QPainter>

#include "qgis.h"
#include "qgserror.h"
#include "qgsrectangle.h"
#include "qgsmaprenderer.h"
#include "qgsobjectcustomproperties.h"
#include "qgsrectangle.h"

class QgsRenderContext;
class QgsCoordinateReferenceSystem;
@@ -554,8 +554,10 @@ class CORE_EXPORT QgsMapLayer : public QObject
/** Write style manager's configuration (if exists). To be called by subclasses. */
void writeStyleManager( QDomNode& layerNode, QDomDocument& doc ) const;

#if 0
/** debugging member - invoked when a connect() is made to this object */
void connectNotify( const char * signal ) override;
#endif

/** Add error message */
void appendError( const QgsErrorMessage & theMessage ) { mError.append( theMessage );}
@@ -161,9 +161,10 @@ const QMap<QString, QgsMapLayer*>& QgsMapLayerRegistry::mapLayers()
}



#if 0
void QgsMapLayerRegistry::connectNotify( const char * signal )
{
Q_UNUSED( signal );
//QgsDebugMsg("QgsMapLayerRegistry connected to " + QString(signal));
} // QgsMapLayerRegistry::connectNotify
#endif
@@ -229,10 +229,12 @@ class CORE_EXPORT QgsMapLayerRegistry : public QObject, public QgsSingleton<QgsM
void legendLayersAdded( QList<QgsMapLayer*> theMapLayers );

protected:
#if 0
/** debugging member
invoked when a connect() is made to this object
*/
void connectNotify( const char * signal ) override;
#endif

private:
//! private singleton constructor
@@ -1624,12 +1624,13 @@ void QgsMapCanvas::setRenderFlag( bool theFlag )
stopRendering();
}

#if 0
void QgsMapCanvas::connectNotify( const char * signal )
{
Q_UNUSED( signal );
QgsDebugMsg( "QgsMapCanvas connected to " + QString( signal ) );
} //connectNotify

#endif

void QgsMapCanvas::updateDatumTransformEntries()
{
@@ -587,11 +587,12 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
/// Handle pattern for implementation object
QScopedPointer<CanvasProperties> mCanvasProperties;

#if 0
/**debugging member
invoked when a connect() is made to this object
*/
void connectNotify( const char * signal ) override;

#endif
//! Make sure the datum transform store is properly populated
void updateDatumTransformEntries();

0 comments on commit 2e9cc1a

Please sign in to comment.
You can’t perform that action at this time.