Skip to content

Commit b5cfd84

Browse files
m-kuhnm-kuhn
committedJul 13, 2015
Add missing Q_OBJECT macros
·
ltr-3_40archive/master_2
1 parent 7634385 commit b5cfd84

12 files changed

+69
-43
lines changed
 

‎src/app/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,13 @@ SET (QGIS_APP_MOC_HDRS
207207
qgssavestyletodbdialog.h
208208
qgsshortcutsmanager.h
209209
qgsapplayertreeviewmenuprovider.h
210+
qgsguivectorlayertools.h
210211

211212
qgsmaptooladdfeature.h
212213
qgsmaptoolcapture.h
213214
qgsmaptooladdpart.h
214215
qgsmaptooladdring.h
216+
qgsmaptooledit.h
215217
qgsmaptoolfillring.h
216218
qgsmaptoolchangelabelproperties.h
217219
qgsmaptooldeletepart.h

‎src/app/qgsguivectorlayertools.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@
2323
* or a feature is added.
2424
*/
2525

26-
class QgsGuiVectorLayerTools : public QgsVectorLayerTools, public QObject
26+
class QgsGuiVectorLayerTools : public QObject, public QgsVectorLayerTools
2727
{
28+
Q_OBJECT
29+
2830
public:
2931
QgsGuiVectorLayerTools();
3032

‎src/app/qgsmaptooledit.h

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@ class QgsRubberBand;
2323
class QgsVectorLayer;
2424
class QKeyEvent;
2525

26-
/**Base class for map tools that edit vector geometry*/
26+
/** Base class for map tools that edit vector geometry*/
2727
class APP_EXPORT QgsMapToolEdit: public QgsMapToolAdvancedDigitizing
2828
{
29+
Q_OBJECT
30+
2931
public:
3032
QgsMapToolEdit( QgsMapCanvas* canvas );
3133
virtual ~QgsMapToolEdit();
@@ -42,17 +44,17 @@ class APP_EXPORT QgsMapToolEdit: public QgsMapToolAdvancedDigitizing
4244
*/
4345
QgsRubberBand* createRubberBand( QGis::GeometryType geometryType = QGis::Line, bool alternativeBand = false );
4446

45-
/**Returns the current vector layer of the map canvas or 0*/
47+
/** Returns the current vector layer of the map canvas or 0*/
4648
QgsVectorLayer* currentVectorLayer();
4749

48-
/**Adds vertices to other features to keep topology up to date, e.g. to neighbouring polygons.
50+
/** Adds vertices to other features to keep topology up to date, e.g. to neighbouring polygons.
4951
@param geom list of points (in layer coordinate system)
5052
@return 0 in case of success*/
5153
int addTopologicalPoints( const QList<QgsPoint>& geom );
5254

53-
/**Display a timed message bar noting the active layer is not vector. */
55+
/** Display a timed message bar noting the active layer is not vector. */
5456
void notifyNotVectorLayer();
55-
/**Display a timed message bar noting the active vector layer is not editable. */
57+
/** Display a timed message bar noting the active vector layer is not editable. */
5658
void notifyNotEditableLayer();
5759
};
5860

‎src/core/CMakeLists.txt

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -412,32 +412,33 @@ SET(QGIS_CORE_MOC_HDRS
412412
qgswebview.h
413413

414414
composer/qgsaddremoveitemcommand.h
415+
composer/qgsatlascomposition.h
416+
composer/qgscomposerattributetable.h
417+
composer/qgscomposerattributetablemodel.h
418+
composer/qgscomposerattributetablemodelv2.h
419+
composer/qgscomposerattributetablev2.h
420+
composer/qgscomposereffect.h
421+
composer/qgscomposerframe.h
422+
composer/qgscomposerhtml.h
423+
composer/qgscomposeritemgroup.h
424+
composer/qgscomposeritem.h
425+
composer/qgscomposerlabel.h
415426
composer/qgscomposerlegend.h
427+
composer/qgscomposermapgrid.h
416428
composer/qgscomposermap.h
417429
composer/qgscomposermapitem.h
418-
composer/qgscomposermapgrid.h
419430
composer/qgscomposermapoverview.h
431+
composer/qgscomposermodel.h
432+
composer/qgscomposermousehandles.h
433+
composer/qgscomposermultiframe.h
434+
composer/qgscomposerobject.h
420435
composer/qgscomposerpicture.h
421436
composer/qgscomposerscalebar.h
422-
composer/qgscomposerobject.h
423-
composer/qgscomposeritem.h
424-
composer/qgscomposeritemgroup.h
425-
composer/qgscomposermousehandles.h
426-
composer/qgscomposerlabel.h
427437
composer/qgscomposershape.h
428-
composer/qgscomposerattributetable.h
429-
composer/qgscomposerattributetablev2.h
430-
composer/qgscomposerattributetablemodel.h
431-
composer/qgscomposerattributetablemodelv2.h
438+
composer/qgscomposertablecolumn.h
432439
composer/qgscomposertable.h
433440
composer/qgscomposertablev2.h
434-
composer/qgscomposertablecolumn.h
435441
composer/qgscomposertexttable.h
436-
composer/qgscomposerhtml.h
437-
composer/qgscomposermultiframe.h
438-
composer/qgscomposereffect.h
439-
composer/qgsatlascomposition.h
440-
composer/qgscomposermodel.h
441442
composer/qgscomposition.h
442443
composer/qgslegendmodel.h
443444

‎src/core/composer/qgscomposerframe.h

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,25 @@
2121
class QgsComposition;
2222
class QgsComposerMultiFrame;
2323

24-
/**Frame item for a composer multiframe item*/
24+
/** Frame item for a composer multiframe item*/
2525
class CORE_EXPORT QgsComposerFrame: public QgsComposerItem
2626
{
27+
Q_OBJECT
2728

2829
public:
2930

3031
QgsComposerFrame( QgsComposition* c, QgsComposerMultiFrame* mf, qreal x, qreal y, qreal width, qreal height );
3132

3233
~QgsComposerFrame();
3334

34-
/**Sets the visible part of the multiframe's content which is visible within
35+
/** Sets the visible part of the multiframe's content which is visible within
3536
* this frame (relative to the total multiframe extent in mm).
3637
* @param section visible portion of content
3738
* @see extent
3839
*/
3940
void setContentSection( const QRectF& section ) { mSection = section; }
4041

41-
/**Returns the parent multiframe for the frame.
42+
/** Returns the parent multiframe for the frame.
4243
* @returns parent multiframe
4344
*/
4445
QgsComposerMultiFrame* multiFrame() const { return mMultiFrame; }
@@ -56,43 +57,43 @@ class CORE_EXPORT QgsComposerFrame: public QgsComposerItem
5657
bool readXML( const QDomElement& itemElem, const QDomDocument& doc ) override;
5758
int type() const override { return ComposerFrame; }
5859

59-
/**Returns the visible portion of the multi frame's content which
60+
/** Returns the visible portion of the multi frame's content which
6061
* is shown in this frame.
6162
* @returns extent of visible portion
6263
* @note added in QGIS 2.5
6364
* @see setContentSection
6465
*/
6566
QRectF extent() const { return mSection; }
6667

67-
/**Returns whether the page should be hidden (ie, not included in composer exports) if this frame is empty
68+
/** Returns whether the page should be hidden (ie, not included in composer exports) if this frame is empty
6869
* @returns true if page should be hidden if frame is empty
6970
* @note added in QGIS 2.5
7071
* @see setHidePageIfEmpty
7172
*/
7273
bool hidePageIfEmpty() const { return mHidePageIfEmpty; }
7374

74-
/**Sets whether the page should be hidden (ie, not included in composer exports) if this frame is empty
75+
/** Sets whether the page should be hidden (ie, not included in composer exports) if this frame is empty
7576
* @param hidePageIfEmpty set to true if page should be hidden if frame is empty
7677
* @note added in QGIS 2.5
7778
* @see hidePageIfEmpty
7879
*/
7980
void setHidePageIfEmpty( const bool hidePageIfEmpty );
8081

81-
/**Returns whether the background and frame border should be hidden if this frame is empty
82+
/** Returns whether the background and frame border should be hidden if this frame is empty
8283
* @returns true if background and border should be hidden if frame is empty
8384
* @note added in QGIS 2.5
8485
* @see setHideBackgroundIfEmpty
8586
*/
8687
bool hideBackgroundIfEmpty() const { return mHideBackgroundIfEmpty; }
8788

88-
/**Sets whether the background and frame border should be hidden if this frame is empty
89+
/** Sets whether the background and frame border should be hidden if this frame is empty
8990
* @param hideBackgroundIfEmpty set to true if background and border should be hidden if frame is empty
9091
* @note added in QGIS 2.5
9192
* @see hideBackgroundIfEmpty
9293
*/
9394
void setHideBackgroundIfEmpty( const bool hideBackgroundIfEmpty );
9495

95-
/**Returns whether the frame is empty
96+
/** Returns whether the frame is empty
9697
* @returns true if frame is empty
9798
* @note added in QGIS 2.5
9899
* @see hidePageIfEmpty
@@ -104,9 +105,9 @@ class CORE_EXPORT QgsComposerFrame: public QgsComposerItem
104105
QgsComposerMultiFrame* mMultiFrame;
105106
QRectF mSection;
106107

107-
/**if true, composition will not export page if this frame is empty*/
108+
/** If true, composition will not export page if this frame is empty*/
108109
bool mHidePageIfEmpty;
109-
/**if true, background and outside frame will not be drawn if frame is empty*/
110+
/** If true, background and outside frame will not be drawn if frame is empty*/
110111
bool mHideBackgroundIfEmpty;
111112

112113
};

‎src/core/qgsmaplayerlegend.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ class CORE_EXPORT QgsMapLayerLegendUtils
9090
*/
9191
class CORE_EXPORT QgsDefaultVectorLayerLegend : public QgsMapLayerLegend
9292
{
93+
Q_OBJECT
94+
9395
public:
9496
explicit QgsDefaultVectorLayerLegend( QgsVectorLayer* vl );
9597

@@ -105,6 +107,8 @@ class CORE_EXPORT QgsDefaultVectorLayerLegend : public QgsMapLayerLegend
105107
*/
106108
class CORE_EXPORT QgsDefaultRasterLayerLegend : public QgsMapLayerLegend
107109
{
110+
Q_OBJECT
111+
108112
public:
109113
explicit QgsDefaultRasterLayerLegend( QgsRasterLayer* rl );
110114

@@ -120,6 +124,8 @@ class CORE_EXPORT QgsDefaultRasterLayerLegend : public QgsMapLayerLegend
120124
*/
121125
class CORE_EXPORT QgsDefaultPluginLayerLegend : public QgsMapLayerLegend
122126
{
127+
Q_OBJECT
128+
123129
public:
124130
explicit QgsDefaultPluginLayerLegend( QgsPluginLayer* pl );
125131

‎src/core/qgsvectorfilewriter.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1444,10 +1444,10 @@ QMap<QString, QgsVectorFileWriter::MetaData> QgsVectorFileWriter::initMetaData()
14441444
layerOptions.clear();
14451445

14461446
#if 0
1447-
// datasetOptions.insert( "HEADER", new StringOption(
1448-
QObject::tr( "Override the header file used - in place of header.dxf." ),
1449-
"" // Default value
1450-
) );
1447+
datasetOptions.insert( "HEADER", new StringOption(
1448+
QObject::tr( "Override the header file used - in place of header.dxf." ),
1449+
"" // Default value
1450+
) );
14511451

14521452
datasetOptions.insert( "TRAILER", new StringOption(
14531453
QObject::tr( "Override the trailer file used - in place of trailer.dxf." ),
@@ -1530,9 +1530,9 @@ QMap<QString, QgsVectorFileWriter::MetaData> QgsVectorFileWriter::initMetaData()
15301530
)
15311531
);
15321532
return driverMetadata;
1533-
}
1533+
}
15341534

1535-
bool QgsVectorFileWriter::driverMetadata( const QString& driverName, QgsVectorFileWriter::MetaData& driverMetadata )
1535+
bool QgsVectorFileWriter::driverMetadata( const QString& driverName, QgsVectorFileWriter::MetaData& driverMetadata )
15361536
{
15371537
static const QMap<QString, MetaData> sDriverMetadata = initMetaData();
15381538

‎src/gui/CMakeLists.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,11 @@ SET(QGIS_GUI_MOC_HDRS
261261
qgsattributeform.h
262262
qgsattributetypeloaddialog.h
263263
qgsblendmodecombobox.h
264+
qgsbrowsertreeview.h
264265
qgsbusyindicatordialog.h
265266
qgscharacterselectdialog.h
266-
qgsbrowsertreeview.h
267-
qgscodeeditor.h
268267
qgscodeeditorcss.h
268+
qgscodeeditor.h
269269
qgscodeeditorhtml.h
270270
qgscodeeditorpython.h
271271
qgscodeeditorsql.h
@@ -314,10 +314,12 @@ SET(QGIS_GUI_MOC_HDRS
314314
qgsmaplayermodel.h
315315
qgsmaplayerproxymodel.h
316316
qgsmapoverviewcanvas.h
317-
qgsmaptool.h
318317
qgsmaptoolemitpoint.h
319-
qgsmaptoolidentify.h
318+
qgsmaptool.h
320319
qgsmaptoolidentifyfeature.h
320+
qgsmaptoolidentify.h
321+
qgsmaptoolpan.h
322+
qgsmaptoolzoom.h
321323
qgsmessagebar.h
322324
qgsmessagebaritem.h
323325
qgsmessagelogviewer.h

‎src/gui/qgsmaptoolpan.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ class QgsMapCanvas;
2626
*/
2727
class GUI_EXPORT QgsMapToolPan : public QgsMapTool
2828
{
29+
Q_OBJECT
30+
2931
public:
3032
//! constructor
3133
QgsMapToolPan( QgsMapCanvas* canvas );

‎src/gui/qgsmaptoolzoom.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ class QgsRubberBand;
2727
*/
2828
class GUI_EXPORT QgsMapToolZoom : public QgsMapTool
2929
{
30+
Q_OBJECT
31+
3032
public:
3133
//! constructor
3234
QgsMapToolZoom( QgsMapCanvas* canvas, bool zoomOut );

‎src/gui/symbology-ng/qgsrulebasedrendererv2widget.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ Tree model for the rules:
4343
*/
4444
class GUI_EXPORT QgsRuleBasedRendererV2Model : public QAbstractItemModel
4545
{
46+
Q_OBJECT
47+
4648
public:
4749
QgsRuleBasedRendererV2Model( QgsRuleBasedRendererV2* r );
4850

‎src/gui/symbology-ng/qgssvgselectorwidget.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ class QTreeView;
3737

3838
class GUI_EXPORT QgsSvgSelectorListModel : public QAbstractListModel
3939
{
40+
Q_OBJECT
41+
4042
public:
4143
QgsSvgSelectorListModel( QObject* parent );
4244

@@ -53,6 +55,8 @@ class GUI_EXPORT QgsSvgSelectorListModel : public QAbstractListModel
5355

5456
class GUI_EXPORT QgsSvgSelectorGroupsModel : public QStandardItemModel
5557
{
58+
Q_OBJECT
59+
5660
public:
5761
QgsSvgSelectorGroupsModel( QObject* parent );
5862

0 commit comments

Comments
 (0)
Please sign in to comment.