Skip to content
Permalink
Browse files

Add missing Q_OBJECT macros

  • Loading branch information
m-kuhn committed Jul 13, 2015
1 parent 7634385 commit b5cfd84d0ada2cbe406323c4ec6453d5cf747c3c
@@ -207,11 +207,13 @@ SET (QGIS_APP_MOC_HDRS
qgssavestyletodbdialog.h
qgsshortcutsmanager.h
qgsapplayertreeviewmenuprovider.h
qgsguivectorlayertools.h

qgsmaptooladdfeature.h
qgsmaptoolcapture.h
qgsmaptooladdpart.h
qgsmaptooladdring.h
qgsmaptooledit.h
qgsmaptoolfillring.h
qgsmaptoolchangelabelproperties.h
qgsmaptooldeletepart.h
@@ -23,8 +23,10 @@
* or a feature is added.
*/

class QgsGuiVectorLayerTools : public QgsVectorLayerTools, public QObject
class QgsGuiVectorLayerTools : public QObject, public QgsVectorLayerTools
{
Q_OBJECT

public:
QgsGuiVectorLayerTools();

@@ -23,9 +23,11 @@ class QgsRubberBand;
class QgsVectorLayer;
class QKeyEvent;

/**Base class for map tools that edit vector geometry*/
/** Base class for map tools that edit vector geometry*/
class APP_EXPORT QgsMapToolEdit: public QgsMapToolAdvancedDigitizing
{
Q_OBJECT

public:
QgsMapToolEdit( QgsMapCanvas* canvas );
virtual ~QgsMapToolEdit();
@@ -42,17 +44,17 @@ class APP_EXPORT QgsMapToolEdit: public QgsMapToolAdvancedDigitizing
*/
QgsRubberBand* createRubberBand( QGis::GeometryType geometryType = QGis::Line, bool alternativeBand = false );

/**Returns the current vector layer of the map canvas or 0*/
/** Returns the current vector layer of the map canvas or 0*/
QgsVectorLayer* currentVectorLayer();

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

/**Display a timed message bar noting the active layer is not vector. */
/** Display a timed message bar noting the active layer is not vector. */
void notifyNotVectorLayer();
/**Display a timed message bar noting the active vector layer is not editable. */
/** Display a timed message bar noting the active vector layer is not editable. */
void notifyNotEditableLayer();
};

@@ -412,32 +412,33 @@ SET(QGIS_CORE_MOC_HDRS
qgswebview.h

composer/qgsaddremoveitemcommand.h
composer/qgsatlascomposition.h
composer/qgscomposerattributetable.h
composer/qgscomposerattributetablemodel.h
composer/qgscomposerattributetablemodelv2.h
composer/qgscomposerattributetablev2.h
composer/qgscomposereffect.h
composer/qgscomposerframe.h
composer/qgscomposerhtml.h
composer/qgscomposeritemgroup.h
composer/qgscomposeritem.h
composer/qgscomposerlabel.h
composer/qgscomposerlegend.h
composer/qgscomposermapgrid.h
composer/qgscomposermap.h
composer/qgscomposermapitem.h
composer/qgscomposermapgrid.h
composer/qgscomposermapoverview.h
composer/qgscomposermodel.h
composer/qgscomposermousehandles.h
composer/qgscomposermultiframe.h
composer/qgscomposerobject.h
composer/qgscomposerpicture.h
composer/qgscomposerscalebar.h
composer/qgscomposerobject.h
composer/qgscomposeritem.h
composer/qgscomposeritemgroup.h
composer/qgscomposermousehandles.h
composer/qgscomposerlabel.h
composer/qgscomposershape.h
composer/qgscomposerattributetable.h
composer/qgscomposerattributetablev2.h
composer/qgscomposerattributetablemodel.h
composer/qgscomposerattributetablemodelv2.h
composer/qgscomposertablecolumn.h
composer/qgscomposertable.h
composer/qgscomposertablev2.h
composer/qgscomposertablecolumn.h
composer/qgscomposertexttable.h
composer/qgscomposerhtml.h
composer/qgscomposermultiframe.h
composer/qgscomposereffect.h
composer/qgsatlascomposition.h
composer/qgscomposermodel.h
composer/qgscomposition.h
composer/qgslegendmodel.h

@@ -21,24 +21,25 @@
class QgsComposition;
class QgsComposerMultiFrame;

/**Frame item for a composer multiframe item*/
/** Frame item for a composer multiframe item*/
class CORE_EXPORT QgsComposerFrame: public QgsComposerItem
{
Q_OBJECT

public:

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

~QgsComposerFrame();

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

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

/**Returns the visible portion of the multi frame's content which
/** Returns the visible portion of the multi frame's content which
* is shown in this frame.
* @returns extent of visible portion
* @note added in QGIS 2.5
* @see setContentSection
*/
QRectF extent() const { return mSection; }

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

/**Sets whether the page should be hidden (ie, not included in composer exports) if this frame is empty
/** Sets whether the page should be hidden (ie, not included in composer exports) if this frame is empty
* @param hidePageIfEmpty set to true if page should be hidden if frame is empty
* @note added in QGIS 2.5
* @see hidePageIfEmpty
*/
void setHidePageIfEmpty( const bool hidePageIfEmpty );

/**Returns whether the background and frame border should be hidden if this frame is empty
/** Returns whether the background and frame border should be hidden if this frame is empty
* @returns true if background and border should be hidden if frame is empty
* @note added in QGIS 2.5
* @see setHideBackgroundIfEmpty
*/
bool hideBackgroundIfEmpty() const { return mHideBackgroundIfEmpty; }

/**Sets whether the background and frame border should be hidden if this frame is empty
/** Sets whether the background and frame border should be hidden if this frame is empty
* @param hideBackgroundIfEmpty set to true if background and border should be hidden if frame is empty
* @note added in QGIS 2.5
* @see hideBackgroundIfEmpty
*/
void setHideBackgroundIfEmpty( const bool hideBackgroundIfEmpty );

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

/**if true, composition will not export page if this frame is empty*/
/** If true, composition will not export page if this frame is empty*/
bool mHidePageIfEmpty;
/**if true, background and outside frame will not be drawn if frame is empty*/
/** If true, background and outside frame will not be drawn if frame is empty*/
bool mHideBackgroundIfEmpty;

};
@@ -90,6 +90,8 @@ class CORE_EXPORT QgsMapLayerLegendUtils
*/
class CORE_EXPORT QgsDefaultVectorLayerLegend : public QgsMapLayerLegend
{
Q_OBJECT

public:
explicit QgsDefaultVectorLayerLegend( QgsVectorLayer* vl );

@@ -105,6 +107,8 @@ class CORE_EXPORT QgsDefaultVectorLayerLegend : public QgsMapLayerLegend
*/
class CORE_EXPORT QgsDefaultRasterLayerLegend : public QgsMapLayerLegend
{
Q_OBJECT

public:
explicit QgsDefaultRasterLayerLegend( QgsRasterLayer* rl );

@@ -120,6 +124,8 @@ class CORE_EXPORT QgsDefaultRasterLayerLegend : public QgsMapLayerLegend
*/
class CORE_EXPORT QgsDefaultPluginLayerLegend : public QgsMapLayerLegend
{
Q_OBJECT

public:
explicit QgsDefaultPluginLayerLegend( QgsPluginLayer* pl );

@@ -1444,10 +1444,10 @@ QMap<QString, QgsVectorFileWriter::MetaData> QgsVectorFileWriter::initMetaData()
layerOptions.clear();

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

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

bool QgsVectorFileWriter::driverMetadata( const QString& driverName, QgsVectorFileWriter::MetaData& driverMetadata )
bool QgsVectorFileWriter::driverMetadata( const QString& driverName, QgsVectorFileWriter::MetaData& driverMetadata )
{
static const QMap<QString, MetaData> sDriverMetadata = initMetaData();

@@ -261,11 +261,11 @@ SET(QGIS_GUI_MOC_HDRS
qgsattributeform.h
qgsattributetypeloaddialog.h
qgsblendmodecombobox.h
qgsbrowsertreeview.h
qgsbusyindicatordialog.h
qgscharacterselectdialog.h
qgsbrowsertreeview.h
qgscodeeditor.h
qgscodeeditorcss.h
qgscodeeditor.h
qgscodeeditorhtml.h
qgscodeeditorpython.h
qgscodeeditorsql.h
@@ -314,10 +314,12 @@ SET(QGIS_GUI_MOC_HDRS
qgsmaplayermodel.h
qgsmaplayerproxymodel.h
qgsmapoverviewcanvas.h
qgsmaptool.h
qgsmaptoolemitpoint.h
qgsmaptoolidentify.h
qgsmaptool.h
qgsmaptoolidentifyfeature.h
qgsmaptoolidentify.h
qgsmaptoolpan.h
qgsmaptoolzoom.h
qgsmessagebar.h
qgsmessagebaritem.h
qgsmessagelogviewer.h
@@ -26,6 +26,8 @@ class QgsMapCanvas;
*/
class GUI_EXPORT QgsMapToolPan : public QgsMapTool
{
Q_OBJECT

public:
//! constructor
QgsMapToolPan( QgsMapCanvas* canvas );
@@ -27,6 +27,8 @@ class QgsRubberBand;
*/
class GUI_EXPORT QgsMapToolZoom : public QgsMapTool
{
Q_OBJECT

public:
//! constructor
QgsMapToolZoom( QgsMapCanvas* canvas, bool zoomOut );
@@ -43,6 +43,8 @@ Tree model for the rules:
*/
class GUI_EXPORT QgsRuleBasedRendererV2Model : public QAbstractItemModel
{
Q_OBJECT

public:
QgsRuleBasedRendererV2Model( QgsRuleBasedRendererV2* r );

@@ -37,6 +37,8 @@ class QTreeView;

class GUI_EXPORT QgsSvgSelectorListModel : public QAbstractListModel
{
Q_OBJECT

public:
QgsSvgSelectorListModel( QObject* parent );

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

class GUI_EXPORT QgsSvgSelectorGroupsModel : public QStandardItemModel
{
Q_OBJECT

public:
QgsSvgSelectorGroupsModel( QObject* parent );

0 comments on commit b5cfd84

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