Skip to content

Commit 78b834c

Browse files
nyalldawsonnyalldawson
committedAug 29, 2017
Fix missing Q_OBJECT macros
Thanks to Clazy
·
ltr-3_40final-3_0_0
1 parent 972a1fe commit 78b834c

36 files changed

+465
-359
lines changed
 

‎python/core/layertree/qgslayertreemodel.sip

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,8 @@ Filter nodes from QgsMapLayerLegend according to the current filtering rules
385385
QFlags<QgsLayerTreeModel::Flag> operator|(QgsLayerTreeModel::Flag f1, QFlags<QgsLayerTreeModel::Flag> f2);
386386

387387

388+
389+
388390
/************************************************************************
389391
* This file has been generated automatically from *
390392
* *

‎python/gui/qgscodeeditorsql.sip

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ class QgsCodeEditorSQL : QgsCodeEditor
2828

2929
};
3030

31+
3132
/************************************************************************
3233
* This file has been generated automatically from *
3334
* *

‎python/gui/symbology/qgsdatadefinedsizelegendwidget.sip

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ Returns configuration as set up in the dialog (may be null). Ownership is passed
4040

4141
};
4242

43+
4344
/************************************************************************
4445
* This file has been generated automatically from *
4546
* *

‎src/app/qgsdiagramproperties.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ class APP_EXPORT QgsDiagramProperties : public QWidget, private Ui::QgsDiagramPr
9494

9595
class EditBlockerDelegate: public QStyledItemDelegate
9696
{
97+
Q_OBJECT
98+
9799
public:
98100
EditBlockerDelegate( QObject *parent = nullptr )
99101
: QStyledItemDelegate( parent )

‎src/core/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -659,6 +659,7 @@ SET(QGIS_CORE_MOC_HDRS
659659
composer/qgslayoutmanager.h
660660
composer/qgspaperitem.h
661661

662+
processing/qgsnativealgorithms.h
662663
processing/qgsprocessingalgrunnertask.h
663664
processing/qgsprocessingfeedback.h
664665
processing/qgsprocessingprovider.h
@@ -669,6 +670,8 @@ SET(QGIS_CORE_MOC_HDRS
669670
raster/qgsrasterfilewritertask.h
670671
raster/qgsrasterlayer.h
671672
raster/qgsrasterdataprovider.h
673+
raster/qgsrasterinterface.h
674+
raster/qgsrasterlayerrenderer.h
672675

673676
geometry/qgspoint.h
674677

@@ -943,7 +946,6 @@ SET(QGIS_CORE_HDRS
943946
metadata/qgslayermetadata.h
944947
metadata/qgslayermetadatavalidator.h
945948

946-
processing/qgsnativealgorithms.h
947949
processing/qgsprocessing.h
948950
processing/qgsprocessingalgorithm.h
949951
processing/qgsprocessingcontext.h
@@ -980,7 +982,6 @@ SET(QGIS_CORE_HDRS
980982
raster/qgsrasterfilewriter.h
981983
raster/qgsrasterhistogram.h
982984
raster/qgsrasteridentifyresult.h
983-
raster/qgsrasterinterface.h
984985
raster/qgsrasteriterator.h
985986
raster/qgsrasterminmaxorigin.h
986987
raster/qgsrasternuller.h

‎src/core/layertree/qgslayertreemodel.cpp

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -33,36 +33,6 @@
3333
#include "qgssymbollayerutils.h"
3434
#include "qgsvectorlayer.h"
3535

36-
///@cond PRIVATE
37-
38-
/** In order to support embedded widgets in layer tree view, the model
39-
* generates one placeholder legend node for each embedded widget.
40-
* The placeholder will be replaced by an embedded widget in QgsLayerTreeView
41-
*/
42-
class EmbeddedWidgetLegendNode : public QgsLayerTreeModelLegendNode
43-
{
44-
public:
45-
EmbeddedWidgetLegendNode( QgsLayerTreeLayer *nodeL )
46-
: QgsLayerTreeModelLegendNode( nodeL )
47-
{
48-
// we need a valid rule key to allow the model to build a tree out of legend nodes
49-
// if that's possible (if there is a node without a rule key, building of tree is canceled)
50-
mRuleKey = QStringLiteral( "embedded-widget-" ) + QUuid::createUuid().toString();
51-
}
52-
53-
QVariant data( int role ) const override
54-
{
55-
if ( role == RuleKeyRole )
56-
return mRuleKey;
57-
return QVariant();
58-
}
59-
60-
private:
61-
QString mRuleKey;
62-
};
63-
64-
///@endcond
65-
6636
QgsLayerTreeModel::QgsLayerTreeModel( QgsLayerTree *rootNode, QObject *parent )
6737
: QAbstractItemModel( parent )
6838
, mRootNode( rootNode )

‎src/core/layertree/qgslayertreemodel.h

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525

2626
#include "qgsgeometry.h"
2727
#include "qgsmaplayer.h"
28+
#include "qgslayertreemodellegendnode.h"
2829

2930
class QgsLayerTreeNode;
3031
class QgsLayerTreeGroup;
3132
class QgsLayerTreeLayer;
32-
class QgsLayerTreeModelLegendNode;
3333
class QgsMapHitTest;
3434
class QgsMapLayer;
3535
class QgsMapSettings;
@@ -385,4 +385,38 @@ class CORE_EXPORT QgsLayerTreeModel : public QAbstractItemModel
385385

386386
Q_DECLARE_OPERATORS_FOR_FLAGS( QgsLayerTreeModel::Flags )
387387

388+
///@cond PRIVATE
389+
#ifndef SIP_RUN
390+
391+
/** In order to support embedded widgets in layer tree view, the model
392+
* generates one placeholder legend node for each embedded widget.
393+
* The placeholder will be replaced by an embedded widget in QgsLayerTreeView
394+
*/
395+
class EmbeddedWidgetLegendNode : public QgsLayerTreeModelLegendNode
396+
{
397+
Q_OBJECT
398+
399+
public:
400+
EmbeddedWidgetLegendNode( QgsLayerTreeLayer *nodeL )
401+
: QgsLayerTreeModelLegendNode( nodeL )
402+
{
403+
// we need a valid rule key to allow the model to build a tree out of legend nodes
404+
// if that's possible (if there is a node without a rule key, building of tree is canceled)
405+
mRuleKey = QStringLiteral( "embedded-widget-" ) + QUuid::createUuid().toString();
406+
}
407+
408+
QVariant data( int role ) const override
409+
{
410+
if ( role == RuleKeyRole )
411+
return mRuleKey;
412+
return QVariant();
413+
}
414+
415+
private:
416+
QString mRuleKey;
417+
};
418+
#endif
419+
420+
///@endcond
421+
388422
#endif // QGSLAYERTREEMODEL_H

‎src/core/layertree/qgslayertreemodellegendnode.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "qgis_core.h"
2727
#include "qgis.h"
2828

29-
#include "qgsrasterdataprovider.h" // for QgsImageFetcher dtor visibility
29+
#include "raster/qgsrasterdataprovider.h" // for QgsImageFetcher dtor visibility
3030

3131
class QgsLayerTreeLayer;
3232
class QgsLayerTreeModel;
@@ -140,7 +140,7 @@ class CORE_EXPORT QgsLayerTreeModelLegendNode : public QObject
140140
QString mUserLabel;
141141
};
142142

143-
#include "qgslegendsymbolitem.h"
143+
#include "symbology/qgslegendsymbolitem.h"
144144

145145
/** \ingroup core
146146
* Implementation of legend node interface for displaying preview of vector symbols and their labels
@@ -388,6 +388,8 @@ class CORE_EXPORT QgsWmsLegendNode : public QgsLayerTreeModelLegendNode
388388
*/
389389
class CORE_EXPORT QgsDataDefinedSizeLegendNode : public QgsLayerTreeModelLegendNode
390390
{
391+
Q_OBJECT
392+
391393
public:
392394
//! Construct the node using QgsDataDefinedSizeLegend as definition of the node's appearance
393395
QgsDataDefinedSizeLegendNode( QgsLayerTreeLayer *nodeLayer, const QgsDataDefinedSizeLegend &settings, QObject *parent SIP_TRANSFERTHIS = nullptr );

‎src/core/layout/qgslayoutitemregistry.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,8 @@ class CORE_EXPORT QgsLayoutItemRegistry : public QObject
265265
//simple item for testing
266266
class TestLayoutItem : public QgsLayoutItem
267267
{
268+
Q_OBJECT
269+
268270
public:
269271

270272
TestLayoutItem( QgsLayout *layout );

‎src/core/processing/qgsnativealgorithms.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929

3030
class QgsNativeAlgorithms: public QgsProcessingProvider
3131
{
32+
Q_OBJECT
33+
3234
public:
3335

3436
QgsNativeAlgorithms( QObject *parent = nullptr );

‎src/core/qgsnetworkdiskcache.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818

1919
#include "qgsnetworkdiskcache.h"
2020

21-
QgsNetworkDiskCache::ExpirableNetworkDiskCache QgsNetworkDiskCache::sDiskCache;
21+
///@cond PRIVATE
22+
ExpirableNetworkDiskCache QgsNetworkDiskCache::sDiskCache;
23+
///@endcond
2224
QMutex QgsNetworkDiskCache::sDiskCacheMutex;
2325

2426
QgsNetworkDiskCache::QgsNetworkDiskCache( QObject *parent )

‎src/core/qgsnetworkdiskcache.h

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,19 @@
2525

2626
class QNetworkDiskCache;
2727

28+
///@cond PRIVATE
29+
30+
class ExpirableNetworkDiskCache : public QNetworkDiskCache
31+
{
32+
Q_OBJECT
33+
34+
public:
35+
explicit ExpirableNetworkDiskCache( QObject *parent = 0 ) : QNetworkDiskCache( parent ) {}
36+
qint64 runExpire() { return QNetworkDiskCache::expire(); }
37+
};
38+
39+
///@endcond
40+
2841
/** \ingroup core
2942
* Wrapper implementation of QNetworkDiskCache with all methods guarded by a
3043
* mutex soly for internal use of QgsNetworkAccessManagers
@@ -83,14 +96,6 @@ class QgsNetworkDiskCache : public QNetworkDiskCache
8396

8497
private:
8598
explicit QgsNetworkDiskCache( QObject *parent );
86-
Q_DISABLE_COPY( QgsNetworkDiskCache )
87-
88-
class ExpirableNetworkDiskCache : public QNetworkDiskCache
89-
{
90-
public:
91-
explicit ExpirableNetworkDiskCache( QObject *parent = 0 ) : QNetworkDiskCache( parent ) {}
92-
qint64 runExpire() { return QNetworkDiskCache::expire(); }
93-
};
9499

95100
static ExpirableNetworkDiskCache sDiskCache;
96101
static QMutex sDiskCacheMutex;

‎src/core/raster/qgsrasterinterface.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
*/
4040
class CORE_EXPORT QgsRasterBlockFeedback : public QgsFeedback
4141
{
42+
Q_OBJECT
43+
4244
public:
4345
//! Construct a new raster block feedback object
4446
QgsRasterBlockFeedback( QObject *parent = nullptr ) : QgsFeedback( parent ), mPreviewOnly( false ), mRenderPartialOutput( false ) {}

‎src/core/raster/qgsrasterlayerrenderer.cpp

Lines changed: 39 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,50 @@
2525
#include "qgsproject.h"
2626
#include "qgsexception.h"
2727

28+
29+
///@cond PRIVATE
30+
31+
QgsRasterLayerRendererFeedback::QgsRasterLayerRendererFeedback( QgsRasterLayerRenderer *r )
32+
: QgsRasterBlockFeedback()
33+
, mR( r )
34+
, mMinimalPreviewInterval( 250 )
35+
{
36+
setRenderPartialOutput( r->mContext.testFlag( QgsRenderContext::RenderPartialOutput ) );
37+
}
38+
39+
void QgsRasterLayerRendererFeedback::onNewData()
40+
{
41+
if ( !renderPartialOutput() )
42+
return; // we were not asked for partial renders and we may not have a temporary image for overwriting...
43+
44+
// update only once upon a time
45+
// (preview itself takes some time)
46+
if ( mLastPreview.isValid() && mLastPreview.msecsTo( QTime::currentTime() ) < mMinimalPreviewInterval )
47+
return;
48+
49+
// TODO: update only the area that got new data
50+
51+
QgsDebugMsg( QString( "new raster preview! %1" ).arg( mLastPreview.msecsTo( QTime::currentTime() ) ) );
52+
QTime t;
53+
t.start();
54+
QgsRasterBlockFeedback feedback;
55+
feedback.setPreviewOnly( true );
56+
feedback.setRenderPartialOutput( true );
57+
QgsRasterIterator iterator( mR->mPipe->last() );
58+
QgsRasterDrawer drawer( &iterator );
59+
drawer.draw( mR->mPainter, mR->mRasterViewPort, mR->mMapToPixel, &feedback );
60+
QgsDebugMsg( QString( "total raster preview time: %1 ms" ).arg( t.elapsed() ) );
61+
mLastPreview = QTime::currentTime();
62+
}
63+
64+
///@endcond
65+
///
2866
QgsRasterLayerRenderer::QgsRasterLayerRenderer( QgsRasterLayer *layer, QgsRenderContext &rendererContext )
2967
: QgsMapLayerRenderer( layer->id() )
3068
, mRasterViewPort( nullptr )
3169
, mPipe( nullptr )
3270
, mContext( rendererContext )
33-
, mFeedback( new Feedback( this ) )
71+
, mFeedback( new QgsRasterLayerRendererFeedback( this ) )
3472
{
3573
mPainter = rendererContext.painter();
3674
const QgsMapToPixel &qgsMapToPixel = rendererContext.mapToPixel();
@@ -231,34 +269,3 @@ QgsFeedback *QgsRasterLayerRenderer::feedback() const
231269
return mFeedback;
232270
}
233271

234-
QgsRasterLayerRenderer::Feedback::Feedback( QgsRasterLayerRenderer *r )
235-
: mR( r )
236-
, mMinimalPreviewInterval( 250 )
237-
{
238-
setRenderPartialOutput( r->mContext.testFlag( QgsRenderContext::RenderPartialOutput ) );
239-
}
240-
241-
void QgsRasterLayerRenderer::Feedback::onNewData()
242-
{
243-
if ( !renderPartialOutput() )
244-
return; // we were not asked for partial renders and we may not have a temporary image for overwriting...
245-
246-
// update only once upon a time
247-
// (preview itself takes some time)
248-
if ( mLastPreview.isValid() && mLastPreview.msecsTo( QTime::currentTime() ) < mMinimalPreviewInterval )
249-
return;
250-
251-
// TODO: update only the area that got new data
252-
253-
QgsDebugMsg( QString( "new raster preview! %1" ).arg( mLastPreview.msecsTo( QTime::currentTime() ) ) );
254-
QTime t;
255-
t.start();
256-
QgsRasterBlockFeedback feedback;
257-
feedback.setPreviewOnly( true );
258-
feedback.setRenderPartialOutput( true );
259-
QgsRasterIterator iterator( mR->mPipe->last() );
260-
QgsRasterDrawer drawer( &iterator );
261-
drawer.draw( mR->mPainter, mR->mRasterViewPort, mR->mMapToPixel, &feedback );
262-
QgsDebugMsg( QString( "total raster preview time: %1 ms" ).arg( t.elapsed() ) );
263-
mLastPreview = QTime::currentTime();
264-
}

0 commit comments

Comments
 (0)
Please sign in to comment.