From 526f111b059e18414e3a03c7f9a2b8c2ed65be7a Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Mon, 9 Sep 2013 15:55:04 +0200 Subject: Allow QtQuick private headers to be used with QT_NO_KEYWORDS. This is necessary for the QtWebEngine module. This also adds an empty nokeywords test using the same mechanism as qtbase/tests/auto/tools/moc/no-keywords.h to find conflicts at compile time. Change-Id: I9df541720797dd61f078178c2af68ead18ff8bfe Reviewed-by: Simon Hausmann --- src/quick/items/qquickaccessibleattached_p.h | 6 ++--- src/quick/items/qquickanimatedsprite_p.h | 32 +++++++++++++-------------- src/quick/items/qquickflickable_p_p.h | 2 +- src/quick/items/qquickgridview_p.h | 2 +- src/quick/items/qquickitem_p.h | 6 ++--- src/quick/items/qquickitemview_p.h | 20 ++++++++--------- src/quick/items/qquickitemviewtransition_p.h | 2 +- src/quick/items/qquicklistview_p.h | 2 +- src/quick/items/qquickmultipointtoucharea_p.h | 2 +- src/quick/items/qquickpathview_p.h | 4 ++-- src/quick/items/qquickpincharea_p.h | 28 +++++++++++------------ src/quick/items/qquickscreen_p.h | 2 +- src/quick/items/qquicksprite_p.h | 30 ++++++++++++------------- src/quick/items/qquickspriteengine_p.h | 20 ++++++++--------- src/quick/items/qquickspritesequence_p.h | 10 ++++----- src/quick/items/qquicktext_p_p.h | 2 +- src/quick/items/qquicktextutil_p.h | 2 +- src/quick/items/qquickwindow_p.h | 2 +- 18 files changed, 87 insertions(+), 87 deletions(-) (limited to 'src/quick/items') diff --git a/src/quick/items/qquickaccessibleattached_p.h b/src/quick/items/qquickaccessibleattached_p.h index 131b379a07..5301c089a9 100644 --- a/src/quick/items/qquickaccessibleattached_p.h +++ b/src/quick/items/qquickaccessibleattached_p.h @@ -73,7 +73,7 @@ public: { if (role != m_role) { m_role = role; - emit roleChanged(); + Q_EMIT roleChanged(); // There is no way to signify role changes at the moment. // QAccessible::updateAccessibility(parent(), 0, QAccessible::); } @@ -82,7 +82,7 @@ public: void setName(const QString &name) { if (name != m_name) { m_name = name; - emit nameChanged(); + Q_EMIT nameChanged(); QAccessibleEvent ev(parent(), QAccessible::NameChanged); QAccessible::updateAccessibility(&ev); } @@ -93,7 +93,7 @@ public: { if (m_description != description) { m_description = description; - emit descriptionChanged(); + Q_EMIT descriptionChanged(); QAccessibleEvent ev(parent(), QAccessible::DescriptionChanged); QAccessible::updateAccessibility(&ev); } diff --git a/src/quick/items/qquickanimatedsprite_p.h b/src/quick/items/qquickanimatedsprite_p.h index 6d0a821a47..b7b25900e8 100644 --- a/src/quick/items/qquickanimatedsprite_p.h +++ b/src/quick/items/qquickanimatedsprite_p.h @@ -160,7 +160,7 @@ public: return m_curFrame; } -signals: +Q_SIGNALS: void pausedChanged(bool arg); void runningChanged(bool arg); @@ -190,7 +190,7 @@ signals: void currentFrameChanged(int arg); -public slots: +public Q_SLOTS: void start(); void stop(); void restart() {stop(); start();} @@ -222,7 +222,7 @@ public slots: { if (m_interpolate != arg) { m_interpolate = arg; - emit interpolateChanged(arg); + Q_EMIT interpolateChanged(arg); } } @@ -230,7 +230,7 @@ public slots: { if (m_sprite->m_source != arg) { m_sprite->setSource(arg); - emit sourceChanged(arg); + Q_EMIT sourceChanged(arg); reloadImage(); } } @@ -239,7 +239,7 @@ public slots: { if (m_sprite->m_reverse != arg) { m_sprite->setReverse(arg); - emit reverseChanged(arg); + Q_EMIT reverseChanged(arg); } } @@ -247,7 +247,7 @@ public slots: { if (m_sprite->m_frameSync != arg) { m_sprite->setFrameSync(arg); - emit frameSyncChanged(arg); + Q_EMIT frameSyncChanged(arg); if (m_running) restart(); } @@ -257,7 +257,7 @@ public slots: { if (m_sprite->m_frames != arg) { m_sprite->setFrameCount(arg); - emit frameCountChanged(arg); + Q_EMIT frameCountChanged(arg); reloadImage(); } } @@ -266,7 +266,7 @@ public slots: { if (m_sprite->m_frameHeight != arg) { m_sprite->setFrameHeight(arg); - emit frameHeightChanged(arg); + Q_EMIT frameHeightChanged(arg); reloadImage(); } } @@ -275,7 +275,7 @@ public slots: { if (m_sprite->m_frameWidth != arg) { m_sprite->setFrameWidth(arg); - emit frameWidthChanged(arg); + Q_EMIT frameWidthChanged(arg); reloadImage(); } } @@ -284,7 +284,7 @@ public slots: { if (m_sprite->m_frameX != arg) { m_sprite->setFrameX(arg); - emit frameXChanged(arg); + Q_EMIT frameXChanged(arg); reloadImage(); } } @@ -293,7 +293,7 @@ public slots: { if (m_sprite->m_frameY != arg) { m_sprite->setFrameY(arg); - emit frameYChanged(arg); + Q_EMIT frameYChanged(arg); reloadImage(); } } @@ -302,7 +302,7 @@ public slots: { if (m_sprite->m_frameRate != arg) { m_sprite->setFrameRate(arg); - emit frameRateChanged(arg); + Q_EMIT frameRateChanged(arg); if (m_running) restart(); } @@ -312,7 +312,7 @@ public slots: { if (m_sprite->m_frameDuration != arg) { m_sprite->setFrameDuration(arg); - emit frameDurationChanged(arg); + Q_EMIT frameDurationChanged(arg); if (m_running) restart(); } @@ -332,7 +332,7 @@ public slots: { if (m_loops != arg) { m_loops = arg; - emit loopsChanged(arg); + Q_EMIT loopsChanged(arg); } } @@ -340,12 +340,12 @@ public slots: { if (m_curFrame != arg) { m_curFrame = arg; - emit currentFrameChanged(arg); //TODO-C Only emitted on manual advance! + Q_EMIT currentFrameChanged(arg); //TODO-C Only emitted on manual advance! } } -private slots: +private Q_SLOTS: void createEngine(); void sizeVertices(); diff --git a/src/quick/items/qquickflickable_p_p.h b/src/quick/items/qquickflickable_p_p.h index 0186029fa0..fd73583a14 100644 --- a/src/quick/items/qquickflickable_p_p.h +++ b/src/quick/items/qquickflickable_p_p.h @@ -278,7 +278,7 @@ public: void updateVisible(); -signals: +Q_SIGNALS: void xPositionChanged(qreal xPosition); void yPositionChanged(qreal yPosition); void widthRatioChanged(qreal widthRatio); diff --git a/src/quick/items/qquickgridview_p.h b/src/quick/items/qquickgridview_p.h index 09e11adf90..bb2cecc3ef 100644 --- a/src/quick/items/qquickgridview_p.h +++ b/src/quick/items/qquickgridview_p.h @@ -126,7 +126,7 @@ public: void setView(QQuickGridView *view) { if (view != m_view) { m_view = view; - emit viewChanged(); + Q_EMIT viewChanged(); } } diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index fe70b38ed1..d89ef76c7f 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -197,7 +197,7 @@ public: void updateOpacity(); void updateZ(); -signals: +Q_SIGNALS: void enabledChanged(bool enabled); void sizeChanged(const QSize &size); void mipmapChanged(bool mipmap); @@ -526,7 +526,7 @@ public: void emitChildrenRectChanged(const QRectF &rect) { Q_Q(QQuickItem); - emit q->childrenRectChanged(rect); + Q_EMIT q->childrenRectChanged(rect); } QPointF computeTransformOrigin() const; @@ -759,7 +759,7 @@ public: Q_D(QQuickKeysAttached); if (enabled != d->enabled) { d->enabled = enabled; - emit enabledChanged(); + Q_EMIT enabledChanged(); } } diff --git a/src/quick/items/qquickitemview_p.h b/src/quick/items/qquickitemview_p.h index d7812bcdad..2e7de96c14 100644 --- a/src/quick/items/qquickitemview_p.h +++ b/src/quick/items/qquickitemview_p.h @@ -209,7 +209,7 @@ public: virtual qreal originX() const; virtual qreal originY() const; -signals: +Q_SIGNALS: void modelChanged(); void delegateChanged(); void countChanged(); @@ -254,7 +254,7 @@ protected: virtual qreal minXExtent() const; virtual qreal maxXExtent() const; -protected slots: +protected Q_SLOTS: void destroyRemoved(); void createdItem(int index, QObject *item); virtual void initItem(int index, QObject *item); @@ -288,7 +288,7 @@ public: void setIsCurrentItem(bool c) { if (m_isCurrent != c) { m_isCurrent = c; - emit currentItemChanged(); + Q_EMIT currentItemChanged(); } } @@ -296,7 +296,7 @@ public: void setDelayRemove(bool delay) { if (m_delayRemove != delay) { m_delayRemove = delay; - emit delayRemoveChanged(); + Q_EMIT delayRemoveChanged(); } } @@ -304,7 +304,7 @@ public: void setSection(const QString §) { if (m_section != sect) { m_section = sect; - emit sectionChanged(); + Q_EMIT sectionChanged(); } } @@ -312,7 +312,7 @@ public: void setPrevSection(const QString §) { if (m_prevSection != sect) { m_prevSection = sect; - emit prevSectionChanged(); + Q_EMIT prevSectionChanged(); } } @@ -320,14 +320,14 @@ public: void setNextSection(const QString §) { if (m_nextSection != sect) { m_nextSection = sect; - emit nextSectionChanged(); + Q_EMIT nextSectionChanged(); } } - void emitAdd() { emit add(); } - void emitRemove() { emit remove(); } + void emitAdd() { Q_EMIT add(); } + void emitRemove() { Q_EMIT remove(); } -signals: +Q_SIGNALS: void currentItemChanged(); void delayRemoveChanged(); diff --git a/src/quick/items/qquickitemviewtransition_p.h b/src/quick/items/qquickitemviewtransition_p.h index 4fb4386c57..e0b8196d80 100644 --- a/src/quick/items/qquickitemviewtransition_p.h +++ b/src/quick/items/qquickitemviewtransition_p.h @@ -186,7 +186,7 @@ public: static QQuickViewTransitionAttached *qmlAttachedProperties(QObject *); -signals: +Q_SIGNALS: void indexChanged(); void itemChanged(); void destinationChanged(); diff --git a/src/quick/items/qquicklistview_p.h b/src/quick/items/qquicklistview_p.h index f612e7eab9..7b5b2e7315 100644 --- a/src/quick/items/qquicklistview_p.h +++ b/src/quick/items/qquicklistview_p.h @@ -183,7 +183,7 @@ public: void setView(QQuickListView *view) { if (view != m_view) { m_view = view; - emit viewChanged(); + Q_EMIT viewChanged(); } } diff --git a/src/quick/items/qquickmultipointtoucharea_p.h b/src/quick/items/qquickmultipointtoucharea_p.h index afe7d4b77b..0e3f4131e8 100644 --- a/src/quick/items/qquickmultipointtoucharea_p.h +++ b/src/quick/items/qquickmultipointtoucharea_p.h @@ -251,7 +251,7 @@ protected: void grabGesture(); virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *); -protected slots: +protected Q_SLOTS: void setTouchEventsEnabledForWindow(QWindow *window); private: diff --git a/src/quick/items/qquickpathview_p.h b/src/quick/items/qquickpathview_p.h index 998707aa41..800dcc646a 100644 --- a/src/quick/items/qquickpathview_p.h +++ b/src/quick/items/qquickpathview_p.h @@ -245,7 +245,7 @@ public: void setIsCurrentItem(bool c) { if (m_isCurrent != c) { m_isCurrent = c; - emit currentItemChanged(); + Q_EMIT currentItemChanged(); } } @@ -256,7 +256,7 @@ public: void setOnPath(bool on) { if (on != m_onPath) { m_onPath = on; - emit pathChanged(); + Q_EMIT pathChanged(); } } qreal m_percent; diff --git a/src/quick/items/qquickpincharea_p.h b/src/quick/items/qquickpincharea_p.h index 60c2dc742e..c991145fc7 100644 --- a/src/quick/items/qquickpincharea_p.h +++ b/src/quick/items/qquickpincharea_p.h @@ -71,13 +71,13 @@ public: if (target == m_target) return; m_target = target; - emit targetChanged(); + Q_EMIT targetChanged(); } void resetTarget() { if (!m_target) return; m_target = 0; - emit targetChanged(); + Q_EMIT targetChanged(); } qreal minimumScale() const { return m_minScale; } @@ -85,14 +85,14 @@ public: if (s == m_minScale) return; m_minScale = s; - emit minimumScaleChanged(); + Q_EMIT minimumScaleChanged(); } qreal maximumScale() const { return m_maxScale; } void setMaximumScale(qreal s) { if (s == m_maxScale) return; m_maxScale = s; - emit maximumScaleChanged(); + Q_EMIT maximumScaleChanged(); } qreal minimumRotation() const { return m_minRotation; } @@ -100,14 +100,14 @@ public: if (r == m_minRotation) return; m_minRotation = r; - emit minimumRotationChanged(); + Q_EMIT minimumRotationChanged(); } qreal maximumRotation() const { return m_maxRotation; } void setMaximumRotation(qreal r) { if (r == m_maxRotation) return; m_maxRotation = r; - emit maximumRotationChanged(); + Q_EMIT maximumRotationChanged(); } enum Axis { NoDrag=0x00, XAxis=0x01, YAxis=0x02, XAndYAxis=0x03, XandYAxis=XAndYAxis }; @@ -116,7 +116,7 @@ public: if (a == m_axis) return; m_axis = a; - emit dragAxisChanged(); + Q_EMIT dragAxisChanged(); } qreal xmin() const { return m_xmin; } @@ -124,28 +124,28 @@ public: if (x == m_xmin) return; m_xmin = x; - emit minimumXChanged(); + Q_EMIT minimumXChanged(); } qreal xmax() const { return m_xmax; } void setXmax(qreal x) { if (x == m_xmax) return; m_xmax = x; - emit maximumXChanged(); + Q_EMIT maximumXChanged(); } qreal ymin() const { return m_ymin; } void setYmin(qreal y) { if (y == m_ymin) return; m_ymin = y; - emit minimumYChanged(); + Q_EMIT minimumYChanged(); } qreal ymax() const { return m_ymax; } void setYmax(qreal y) { if (y == m_ymax) return; m_ymax = y; - emit maximumYChanged(); + Q_EMIT maximumYChanged(); } bool active() const { return m_active; } @@ -153,10 +153,10 @@ public: if (a == m_active) return; m_active = a; - emit activeChanged(); + Q_EMIT activeChanged(); } -signals: +Q_SIGNALS: void targetChanged(); void minimumScaleChanged(); void maximumScaleChanged(); @@ -283,7 +283,7 @@ protected: const QRectF &oldGeometry); virtual void itemChange(ItemChange change, const ItemChangeData& value); -private slots: +private Q_SLOTS: void setTouchEventsEnabledForWindow(QWindow *window); private: diff --git a/src/quick/items/qquickscreen_p.h b/src/quick/items/qquickscreen_p.h index b35fd04e58..721390d1b2 100644 --- a/src/quick/items/qquickscreen_p.h +++ b/src/quick/items/qquickscreen_p.h @@ -93,7 +93,7 @@ Q_SIGNALS: void primaryOrientationChanged(); void orientationChanged(); -protected slots: +protected Q_SLOTS: void screenChanged(QScreen*); private: diff --git a/src/quick/items/qquicksprite_p.h b/src/quick/items/qquicksprite_p.h index a85059e8d6..7aac2781be 100644 --- a/src/quick/items/qquicksprite_p.h +++ b/src/quick/items/qquicksprite_p.h @@ -153,7 +153,7 @@ public: return m_frameSync; } -signals: +Q_SIGNALS: void sourceChanged(QUrl arg); @@ -179,13 +179,13 @@ signals: void frameSyncChanged(bool arg); -public slots: +public Q_SLOTS: void setSource(QUrl arg) { if (m_source != arg) { m_source = arg; - emit sourceChanged(arg); + Q_EMIT sourceChanged(arg); startImageLoading(); } } @@ -194,7 +194,7 @@ public slots: { if (m_frameHeight != arg) { m_frameHeight = arg; - emit frameHeightChanged(arg); + Q_EMIT frameHeightChanged(arg); } } @@ -202,7 +202,7 @@ public slots: { if (m_frameWidth != arg) { m_frameWidth = arg; - emit frameWidthChanged(arg); + Q_EMIT frameWidthChanged(arg); } } @@ -210,7 +210,7 @@ public slots: { if (m_reverse != arg) { m_reverse = arg; - emit reverseChanged(arg); + Q_EMIT reverseChanged(arg); } } @@ -224,7 +224,7 @@ public slots: { if (m_frames != arg) { m_frames = arg; - emit frameCountChanged(arg); + Q_EMIT frameCountChanged(arg); } } @@ -232,7 +232,7 @@ public slots: { if (m_frameX != arg) { m_frameX = arg; - emit frameXChanged(arg); + Q_EMIT frameXChanged(arg); } } @@ -240,7 +240,7 @@ public slots: { if (m_frameY != arg) { m_frameY = arg; - emit frameYChanged(arg); + Q_EMIT frameYChanged(arg); } } @@ -248,7 +248,7 @@ public slots: { if (m_frameRate != arg) { m_frameRate = arg; - emit frameRateChanged(arg); + Q_EMIT frameRateChanged(arg); } } @@ -256,7 +256,7 @@ public slots: { if (m_frameRateVariation != arg) { m_frameRateVariation = arg; - emit frameRateVariationChanged(arg); + Q_EMIT frameRateVariationChanged(arg); } } @@ -264,7 +264,7 @@ public slots: { if (m_frameDuration != arg) { m_frameDuration = arg; - emit frameDurationChanged(arg); + Q_EMIT frameDurationChanged(arg); } } @@ -272,7 +272,7 @@ public slots: { if (m_frameDurationVariation != arg) { m_frameDurationVariation = arg; - emit frameDurationVariationChanged(arg); + Q_EMIT frameDurationVariationChanged(arg); } } @@ -280,11 +280,11 @@ public slots: { if (m_frameSync != arg) { m_frameSync = arg; - emit frameSyncChanged(arg); + Q_EMIT frameSyncChanged(arg); } } -private slots: +private Q_SLOTS: void startImageLoading(); private: diff --git a/src/quick/items/qquickspriteengine_p.h b/src/quick/items/qquickspriteengine_p.h index 768b5e4a6e..3ff5f8caee 100644 --- a/src/quick/items/qquickspriteengine_p.h +++ b/src/quick/items/qquickspriteengine_p.h @@ -108,7 +108,7 @@ public: return m_randomStart; } -signals: +Q_SIGNALS: void durationChanged(int arg); void nameChanged(QString arg); @@ -121,12 +121,12 @@ signals: void randomStartChanged(bool arg); -public slots: +public Q_SLOTS: void setDuration(int arg) { if (m_duration != arg) { m_duration = arg; - emit durationChanged(arg); + Q_EMIT durationChanged(arg); } } @@ -134,7 +134,7 @@ public slots: { if (m_name != arg) { m_name = arg; - emit nameChanged(arg); + Q_EMIT nameChanged(arg); } } @@ -142,7 +142,7 @@ public slots: { if (m_to != arg) { m_to = arg; - emit toChanged(arg); + Q_EMIT toChanged(arg); } } @@ -150,7 +150,7 @@ public slots: { if (m_durationVariation != arg) { m_durationVariation = arg; - emit durationVariationChanged(arg); + Q_EMIT durationVariationChanged(arg); } } @@ -158,7 +158,7 @@ public slots: { if (m_randomStart != arg) { m_randomStart = arg; - emit randomStartChanged(arg); + Q_EMIT randomStartChanged(arg); } } @@ -214,17 +214,17 @@ public: int stateCount() {return m_states.count();} private: -signals: +Q_SIGNALS: void globalGoalChanged(QString arg); void stateChanged(int idx); -public slots: +public Q_SLOTS: void setGlobalGoal(QString arg) { if (m_globalGoal != arg) { m_globalGoal = arg; - emit globalGoalChanged(arg); + Q_EMIT globalGoalChanged(arg); } } diff --git a/src/quick/items/qquickspritesequence_p.h b/src/quick/items/qquickspritesequence_p.h index b954a4464f..8f5a992942 100644 --- a/src/quick/items/qquickspritesequence_p.h +++ b/src/quick/items/qquickspritesequence_p.h @@ -88,14 +88,14 @@ public: return m_curState; } -signals: +Q_SIGNALS: void runningChanged(bool arg); void interpolateChanged(bool arg); void goalSpriteChanged(QString arg); void currentSpriteChanged(QString arg); -public slots: +public Q_SLOTS: void jumpTo(const QString &sprite); void setGoalSprite(const QString &sprite); @@ -104,7 +104,7 @@ public slots: { if (m_running != arg) { m_running = arg; - emit runningChanged(arg); + Q_EMIT runningChanged(arg); } } @@ -112,11 +112,11 @@ public slots: { if (m_interpolate != arg) { m_interpolate = arg; - emit interpolateChanged(arg); + Q_EMIT interpolateChanged(arg); } } -private slots: +private Q_SLOTS: void createEngine(); void sizeVertices(); diff --git a/src/quick/items/qquicktext_p_p.h b/src/quick/items/qquicktext_p_p.h index 7a31e77ae4..86deb17b42 100644 --- a/src/quick/items/qquicktext_p_p.h +++ b/src/quick/items/qquicktext_p_p.h @@ -214,7 +214,7 @@ protected: QQuickPixmap *loadPixmap(QQmlContext *context, const QUrl &name); -private slots: +private Q_SLOTS: void requestFinished(); private: diff --git a/src/quick/items/qquicktextutil_p.h b/src/quick/items/qquicktextutil_p.h index 5d376474a2..7f2206f1ef 100644 --- a/src/quick/items/qquicktextutil_p.h +++ b/src/quick/items/qquicktextutil_p.h @@ -101,7 +101,7 @@ void QQuickTextUtil::setCursorDelegate(Private *d, QQmlComponent *delegate) if (parent->isCursorVisible() && parent->isComponentComplete()) createCursor(d); - emit parent->cursorDelegateChanged(); + Q_EMIT parent->cursorDelegateChanged(); } template diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h index ad861754d7..12925cbbca 100644 --- a/src/quick/items/qquickwindow_p.h +++ b/src/quick/items/qquickwindow_p.h @@ -191,7 +191,7 @@ public: void updateEffectiveOpacityRoot(QQuickItem *, qreal); void updateDirtyNode(QQuickItem *); - void fireFrameSwapped() { emit q_func()->frameSwapped(); } + void fireFrameSwapped() { Q_EMIT q_func()->frameSwapped(); } QSGContext *context; QSGRenderer *renderer; -- cgit v1.2.3