diff options
Diffstat (limited to 'src')
54 files changed, 71 insertions, 71 deletions
diff --git a/src/labs/models/qqmldelegatecomponent_p.h b/src/labs/models/qqmldelegatecomponent_p.h index e720aa935e..254f9d0b7e 100644 --- a/src/labs/models/qqmldelegatecomponent_p.h +++ b/src/labs/models/qqmldelegatecomponent_p.h @@ -52,7 +52,7 @@ public: virtual bool match(int row, int column, const QVariant &value) const; -signals: +Q_SIGNALS: void roleValueChanged(); void rowChanged(); void indexChanged(); @@ -91,7 +91,7 @@ public: QQmlComponent *delegate(QQmlAdaptorModel *adaptorModel, int row, int column = -1) const override; -signals: +Q_SIGNALS: void roleChanged(); private: diff --git a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.h b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.h index 573e7d14f0..d7168a6b51 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.h +++ b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.h @@ -70,7 +70,7 @@ public: return m_statesDelegate; } -signals: +Q_SIGNALS: void scheduleMessage(const QByteArray &); protected: diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.h b/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.h index 9cb870ee6f..faecf16475 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.h +++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.h @@ -102,7 +102,7 @@ public: bool pauseAtNextOpportunity() const override; -signals: +Q_SIGNALS: void debuggerPaused(QV4Debugger *self, QV4Debugger::PauseReason reason); void scheduleJob(); diff --git a/src/plugins/qmltooling/qmldbg_inspector/globalinspector.h b/src/plugins/qmltooling/qmldbg_inspector/globalinspector.h index 49e13f3e9e..8c0ae5efad 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/globalinspector.h +++ b/src/plugins/qmltooling/qmldbg_inspector/globalinspector.h @@ -33,7 +33,7 @@ public: void removeWindow(QQuickWindow *window); void processMessage(const QByteArray &message); -signals: +Q_SIGNALS: void messageToClient(const QString &name, const QByteArray &data); private: diff --git a/src/plugins/qmltooling/qmldbg_preview/proxytranslator.h b/src/plugins/qmltooling/qmldbg_preview/proxytranslator.h index 04e6ca5fed..b80d724f05 100644 --- a/src/plugins/qmltooling/qmldbg_preview/proxytranslator.h +++ b/src/plugins/qmltooling/qmldbg_preview/proxytranslator.h @@ -42,7 +42,7 @@ public: static QString translationFromInformation(const TranslationBindingInformation &translationBindingInformation); static QString originStringFromInformation(const TranslationBindingInformation &translationBindingInformation); static QQmlSourceLocation sourceLocationFromInformation(const TranslationBindingInformation &translationBindingInformation); -signals: +Q_SIGNALS: void languageChanged(const QLocale &locale); private: diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.h b/src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.h index 47a09e7036..f28911ccb4 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.h +++ b/src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.h @@ -38,7 +38,7 @@ public: void engineAboutToBeAdded(QJSEngine *engine) override; void engineAboutToBeRemoved(QJSEngine *engine) override; -signals: +Q_SIGNALS: void language(const QUrl &context, const QLocale &locale); void state(const QString &stateName); void stateList(); diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileloader.h b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileloader.h index f9d40871ac..018955e585 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileloader.h +++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileloader.h @@ -52,7 +52,7 @@ public: void whitelist(const QUrl &url); bool isBlacklisted(const QString &file); -signals: +Q_SIGNALS: void request(const QString &file); private: diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.h b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.h index 8dfc8230fd..e273b22fa7 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.h +++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.h @@ -61,7 +61,7 @@ public: quint16 totalRender; }; -signals: +Q_SIGNALS: void error(const QString &message); void fps(const FpsInfo &info); diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewservice.h b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewservice.h index b653297544..8376250a8e 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewservice.h +++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewservice.h @@ -56,7 +56,7 @@ public: QQuickItem *currentRootItem(); -signals: +Q_SIGNALS: void error(const QString &file); void file(const QString &file, const QByteArray &contents); void directory(const QString &file, const QStringList &entries); diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h index ef77c134fe..b672d6ee4f 100644 --- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h +++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h @@ -62,7 +62,7 @@ public: void dataReady(QQmlAbstractProfilerAdapter *profiler) override; -signals: +Q_SIGNALS: void startFlushTimer(); void stopFlushTimer(); diff --git a/src/plugins/qmltooling/qmldbg_profiler/qv4profileradapter.h b/src/plugins/qmltooling/qmldbg_profiler/qv4profileradapter.h index 83ffdcaddb..34d0287fcf 100644 --- a/src/plugins/qmltooling/qmldbg_profiler/qv4profileradapter.h +++ b/src/plugins/qmltooling/qmldbg_profiler/qv4profileradapter.h @@ -38,7 +38,7 @@ public: const QVector<QV4::Profiling::FunctionCallProperties> &, const QVector<QV4::Profiling::MemoryAllocationProperties> &); -signals: +Q_SIGNALS: void v4ProfilingEnabled(quint64 v4Features); void v4ProfilingEnabledWhileWaiting(quint64 v4Features); diff --git a/src/plugins/scenegraph/openvg/qsgopenvglayer.h b/src/plugins/scenegraph/openvg/qsgopenvglayer.h index 2f29ffa229..1db4ddff5c 100644 --- a/src/plugins/scenegraph/openvg/qsgopenvglayer.h +++ b/src/plugins/scenegraph/openvg/qsgopenvglayer.h @@ -51,7 +51,7 @@ public: void setMirrorVertical(bool mirror) override; void setSamples(int) override { } -public slots: +public Q_SLOTS: void markDirtyTexture() override; void invalidated() override; diff --git a/src/qml/debugger/qqmlabstractprofileradapter_p.h b/src/qml/debugger/qqmlabstractprofileradapter_p.h index 0028937420..bd59c41aa7 100644 --- a/src/qml/debugger/qqmlabstractprofileradapter_p.h +++ b/src/qml/debugger/qqmlabstractprofileradapter_p.h @@ -43,7 +43,7 @@ public: void stopProfiling(); - void reportData() { emit dataRequested(); } + void reportData() { Q_EMIT dataRequested(); } void stopWaiting() { waiting = false; } void startWaiting() { waiting = true; } @@ -51,9 +51,9 @@ public: bool isRunning() const { return featuresEnabled != 0; } quint64 features() const { return featuresEnabled; } - void synchronize(const QElapsedTimer &t) { emit referenceTimeKnown(t); } + void synchronize(const QElapsedTimer &t) { Q_EMIT referenceTimeKnown(t); } -signals: +Q_SIGNALS: void profilingEnabled(quint64 features); void profilingEnabledWhileWaiting(quint64 features); diff --git a/src/qml/debugger/qqmlconfigurabledebugservice_p.h b/src/qml/debugger/qqmlconfigurabledebugservice_p.h index 288cdba2ef..8451f4e800 100644 --- a/src/qml/debugger/qqmlconfigurabledebugservice_p.h +++ b/src/qml/debugger/qqmlconfigurabledebugservice_p.h @@ -38,7 +38,7 @@ protected: QMutexLocker lock(&m_configMutex); m_waitingForConfiguration = false; for (QJSEngine *engine : qAsConst(m_waitingEngines)) - emit Base::attachedToEngine(engine); + Q_EMIT Base::attachedToEngine(engine); m_waitingEngines.clear(); } @@ -64,7 +64,7 @@ protected: if (m_waitingForConfiguration) m_waitingEngines.append(engine); else - emit Base::attachedToEngine(engine); + Q_EMIT Base::attachedToEngine(engine); } QRecursiveMutex m_configMutex; diff --git a/src/qml/debugger/qqmldebugservice_p.h b/src/qml/debugger/qqmldebugservice_p.h index 73a7dc27b0..b92c61146c 100644 --- a/src/qml/debugger/qqmldebugservice_p.h +++ b/src/qml/debugger/qqmldebugservice_p.h @@ -46,8 +46,8 @@ public: virtual void stateChanged(State) {} virtual void messageReceived(const QByteArray &) {} - virtual void engineAboutToBeAdded(QJSEngine *engine) { emit attachedToEngine(engine); } - virtual void engineAboutToBeRemoved(QJSEngine *engine) { emit detachedFromEngine(engine); } + virtual void engineAboutToBeAdded(QJSEngine *engine) { Q_EMIT attachedToEngine(engine); } + virtual void engineAboutToBeRemoved(QJSEngine *engine) { Q_EMIT detachedFromEngine(engine); } virtual void engineAdded(QJSEngine *) {} virtual void engineRemoved(QJSEngine *) {} @@ -59,7 +59,7 @@ public: protected: explicit QQmlDebugService(const QString &, float version, QObject *parent = nullptr); -signals: +Q_SIGNALS: void attachedToEngine(QJSEngine *); void detachedFromEngine(QJSEngine *); diff --git a/src/qml/debugger/qqmlprofiler_p.h b/src/qml/debugger/qqmlprofiler_p.h index 1362e5bf8f..e56c3e7948 100644 --- a/src/qml/debugger/qqmlprofiler_p.h +++ b/src/qml/debugger/qqmlprofiler_p.h @@ -353,7 +353,7 @@ public: void reportData(); void setTimer(const QElapsedTimer &timer) { m_timer = timer; } -signals: +Q_SIGNALS: void dataReady(const QVector<QQmlProfilerData> &, const QQmlProfiler::LocationHash &); protected: diff --git a/src/qml/jsruntime/qv4profiling_p.h b/src/qml/jsruntime/qv4profiling_p.h index f974c2cb43..ee0213d89a 100644 --- a/src/qml/jsruntime/qv4profiling_p.h +++ b/src/qml/jsruntime/qv4profiling_p.h @@ -218,7 +218,7 @@ public: void reportData(); void setTimer(const QElapsedTimer &timer) { m_timer = timer; } -signals: +Q_SIGNALS: void dataReady(const QV4::Profiling::FunctionLocationHash &, const QVector<QV4::Profiling::FunctionCallProperties> &, const QVector<QV4::Profiling::MemoryAllocationProperties> &); diff --git a/src/qml/qml/qqmltypeloadernetworkreplyproxy_p.h b/src/qml/qml/qqmltypeloadernetworkreplyproxy_p.h index 2fa4d4f26e..47e59b4bba 100644 --- a/src/qml/qml/qqmltypeloadernetworkreplyproxy_p.h +++ b/src/qml/qml/qqmltypeloadernetworkreplyproxy_p.h @@ -37,7 +37,7 @@ class QQmlTypeLoaderNetworkReplyProxy : public QObject public: QQmlTypeLoaderNetworkReplyProxy(QQmlTypeLoader *l); -public slots: +public Q_SLOTS: void finished(); void downloadProgress(qint64, qint64); void manualFinished(QNetworkReply*); diff --git a/src/qmldebug/qqmldebugclient_p.h b/src/qmldebug/qqmldebugclient_p.h index db62c8fec3..2859696e49 100644 --- a/src/qmldebug/qqmldebugclient_p.h +++ b/src/qmldebug/qqmldebugclient_p.h @@ -41,7 +41,7 @@ public: QQmlDebugConnection *connection() const; -signals: +Q_SIGNALS: void stateChanged(State state); protected: diff --git a/src/qmldebug/qqmldebugconnection_p.h b/src/qmldebug/qqmldebugconnection_p.h index 00c0cec948..7f6de3790c 100644 --- a/src/qmldebug/qqmldebugconnection_p.h +++ b/src/qmldebug/qqmldebugconnection_p.h @@ -50,7 +50,7 @@ public: float serviceVersion(const QString &serviceName) const; bool sendMessage(const QString &name, const QByteArray &message); -signals: +Q_SIGNALS: void connected(); void disconnected(); void socketError(QAbstractSocket::SocketError socketError); diff --git a/src/qmldebug/qqmldebugmessageclient_p.h b/src/qmldebug/qqmldebugmessageclient_p.h index c3681ef564..928a8f4457 100644 --- a/src/qmldebug/qqmldebugmessageclient_p.h +++ b/src/qmldebug/qqmldebugmessageclient_p.h @@ -37,7 +37,7 @@ public: virtual void messageReceived(const QByteArray &) override; -signals: +Q_SIGNALS: void message(QtMsgType, const QString &, const QQmlDebugContextInfo &); }; diff --git a/src/qmldebug/qqmlenginecontrolclient_p.h b/src/qmldebug/qqmlenginecontrolclient_p.h index d9872f6ee0..3aad694542 100644 --- a/src/qmldebug/qqmlenginecontrolclient_p.h +++ b/src/qmldebug/qqmlenginecontrolclient_p.h @@ -32,7 +32,7 @@ public: QList<int> blockedEngines() const; -signals: +Q_SIGNALS: void engineAboutToBeAdded(int engineId, const QString &name); void engineAdded(int engineId, const QString &name); void engineAboutToBeRemoved(int engineId, const QString &name); diff --git a/src/qmldebug/qqmlenginedebugclient_p.h b/src/qmldebug/qqmlenginedebugclient_p.h index a4ae4a6e9f..48bc62f076 100644 --- a/src/qmldebug/qqmlenginedebugclient_p.h +++ b/src/qmldebug/qqmlenginedebugclient_p.h @@ -127,7 +127,7 @@ public: QVariant resultExpr() const; bool valid() const; -signals: +Q_SIGNALS: void newObject(qint32 objectId); void valueChanged(QByteArray,QVariant); void result(); diff --git a/src/qmldebug/qqmlinspectorclient_p.h b/src/qmldebug/qqmlinspectorclient_p.h index ff617dbaee..829ec8e9bf 100644 --- a/src/qmldebug/qqmlinspectorclient_p.h +++ b/src/qmldebug/qqmlinspectorclient_p.h @@ -37,7 +37,7 @@ public: int moveObject(int childId, int newParentId); int destroyObject(int objectId); -signals: +Q_SIGNALS: void responseReceived(int requestId, bool result); protected: diff --git a/src/qmldebug/qqmlpreviewclient_p.h b/src/qmldebug/qqmlpreviewclient_p.h index 435c722917..0ce9619e35 100644 --- a/src/qmldebug/qqmlpreviewclient_p.h +++ b/src/qmldebug/qqmlpreviewclient_p.h @@ -62,7 +62,7 @@ public: void triggerRerun(); void triggerZoom(float factor); -signals: +Q_SIGNALS: void request(const QString &path); void error(const QString &message); void fps(const FpsInfo &info); diff --git a/src/qmldebug/qqmlprofilerclient_p.h b/src/qmldebug/qqmlprofilerclient_p.h index f5d5d0b758..37978f11f4 100644 --- a/src/qmldebug/qqmlprofilerclient_p.h +++ b/src/qmldebug/qqmlprofilerclient_p.h @@ -52,7 +52,7 @@ protected: QQmlProfilerClient(QQmlProfilerClientPrivate &dd); void onStateChanged(State status); -signals: +Q_SIGNALS: void complete(qint64 maximumTime); void traceFinished(qint64 timestamp, const QList<int> &engineIds); void traceStarted(qint64 timestamp, const QList<int> &engineIds); diff --git a/src/qmldebug/qv4debugclient_p.h b/src/qmldebug/qv4debugclient_p.h index f076641a68..4e480703ac 100644 --- a/src/qmldebug/qv4debugclient_p.h +++ b/src/qmldebug/qv4debugclient_p.h @@ -72,7 +72,7 @@ public: protected: void messageReceived(const QByteArray &data) override; -signals: +Q_SIGNALS: void connected(); void interrupted(); void result(); diff --git a/src/qmlmodels/qqmlabstractdelegatecomponent_p.h b/src/qmlmodels/qqmlabstractdelegatecomponent_p.h index ddf563495b..91339616f7 100644 --- a/src/qmlmodels/qqmlabstractdelegatecomponent_p.h +++ b/src/qmlmodels/qqmlabstractdelegatecomponent_p.h @@ -38,7 +38,7 @@ public: virtual QQmlComponent *delegate(QQmlAdaptorModel *adaptorModel, int row, int column = 0) const = 0; -signals: +Q_SIGNALS: void delegateChanged(); protected: diff --git a/src/qmlmodels/qqmllistmodelworkeragent_p.h b/src/qmlmodels/qqmllistmodelworkeragent_p.h index db89202807..21e99f0ec4 100644 --- a/src/qmlmodels/qqmllistmodelworkeragent_p.h +++ b/src/qmlmodels/qqmllistmodelworkeragent_p.h @@ -63,7 +63,7 @@ public: void modelDestroyed(); -signals: +Q_SIGNALS: void engineChanged(QV4::ExecutionEngine *engine); protected: diff --git a/src/qmlmodels/qqmltreemodeltotablemodel_p_p.h b/src/qmlmodels/qqmltreemodeltotablemodel_p_p.h index 894cdeb709..dd5857e3a6 100644 --- a/src/qmlmodels/qqmltreemodeltotablemodel_p_p.h +++ b/src/qmlmodels/qqmltreemodeltotablemodel_p_p.h @@ -85,13 +85,13 @@ public: using QAbstractItemModel::hasChildren; -signals: +Q_SIGNALS: void modelChanged(QAbstractItemModel *model); void rootIndexChanged(); void expanded(const QModelIndex &index); void collapsed(const QModelIndex &index); -public slots: +public Q_SLOTS: void expand(const QModelIndex &); void collapse(const QModelIndex &); void setModel(QAbstractItemModel *model); @@ -105,7 +105,7 @@ public slots: void collapseRow(int n); void collapseRecursively(int row); -private slots: +private Q_SLOTS: void modelHasBeenDestroyed(); void modelHasBeenReset(); void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles); diff --git a/src/qmltest/quicktest_p.h b/src/qmltest/quicktest_p.h index 1ff5b45c39..938ae6cdfc 100644 --- a/src/qmltest/quicktest_p.h +++ b/src/qmltest/quicktest_p.h @@ -54,10 +54,10 @@ public: bool hasQuit:1; bool hasTestCase() const { return m_hasTestCase; } - void setHasTestCase(bool value) { m_hasTestCase = value; emit hasTestCaseChanged(); } + void setHasTestCase(bool value) { m_hasTestCase = value; Q_EMIT hasTestCaseChanged(); } bool windowShown() const { return m_windowShown; } - void setWindowShown(bool value) { m_windowShown = value; emit windowShownChanged(); } + void setWindowShown(bool value) { m_windowShown = value; Q_EMIT windowShownChanged(); } QQmlPropertyMap *defined() const { return m_defined; } void init() { setWindowShown(false); setHasTestCase(false); hasQuit = false; } diff --git a/src/qmltest/quicktestevent_p.h b/src/qmltest/quicktestevent_p.h index 6b4487303c..c75d8f6706 100644 --- a/src/qmltest/quicktestevent_p.h +++ b/src/qmltest/quicktestevent_p.h @@ -33,7 +33,7 @@ class Q_QUICK_TEST_PRIVATE_EXPORT QQuickTouchEventSequence : public QObject public: explicit QQuickTouchEventSequence(QuickTestEvent *testEvent, QObject *item = nullptr); -public slots: +public Q_SLOTS: QObject* press(int touchId, QObject *item, qreal x, qreal y); QObject* move(int touchId, QObject *item, qreal x, qreal y); QObject* release(int touchId, QObject *item, qreal x, qreal y); diff --git a/src/qmlxmllistmodel/qqmlxmllistmodel_p.h b/src/qmlxmllistmodel/qqmlxmllistmodel_p.h index 6198b79ae3..16747c31fd 100644 --- a/src/qmlxmllistmodel/qqmlxmllistmodel_p.h +++ b/src/qmlxmllistmodel/qqmlxmllistmodel_p.h @@ -73,7 +73,7 @@ public: void setAttributeName(const QString &attributeName); bool isValid() const; -signals: +Q_SIGNALS: void nameChanged(); void elementNameChanged(); void attributeNameChanged(); diff --git a/src/quick/handlers/qquickdragaxis_p.h b/src/quick/handlers/qquickdragaxis_p.h index aa7a6b3c39..17f20f332c 100644 --- a/src/quick/handlers/qquickdragaxis_p.h +++ b/src/quick/handlers/qquickdragaxis_p.h @@ -42,7 +42,7 @@ public: bool enabled() const { return m_enabled; } void setEnabled(bool enabled); -signals: +Q_SIGNALS: void minimumChanged(); void maximumChanged(); void enabledChanged(); diff --git a/src/quick/handlers/qquickmultipointhandler_p.h b/src/quick/handlers/qquickmultipointhandler_p.h index d6a010b2a8..bd440884ba 100644 --- a/src/quick/handlers/qquickmultipointhandler_p.h +++ b/src/quick/handlers/qquickmultipointhandler_p.h @@ -42,7 +42,7 @@ public: const QQuickHandlerPoint ¢roid() const; -signals: +Q_SIGNALS: void minimumPointCountChanged(); void maximumPointCountChanged(); void centroidChanged(); diff --git a/src/quick/handlers/qquickpinchhandler_p.h b/src/quick/handlers/qquickpinchhandler_p.h index 9000a3aa24..c89e0b22cb 100644 --- a/src/quick/handlers/qquickpinchhandler_p.h +++ b/src/quick/handlers/qquickpinchhandler_p.h @@ -62,7 +62,7 @@ public: QQuickDragAxis *xAxis() { return &m_xAxis; } QQuickDragAxis *yAxis() { return &m_yAxis; } -signals: +Q_SIGNALS: void minimumScaleChanged(); void maximumScaleChanged(); void minimumRotationChanged(); diff --git a/src/quick/items/qquickaccessibleattached_p.h b/src/quick/items/qquickaccessibleattached_p.h index d8f962ea0a..7b70bdb75c 100644 --- a/src/quick/items/qquickaccessibleattached_p.h +++ b/src/quick/items/qquickaccessibleattached_p.h @@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE if (m_state.P == arg) \ return; \ m_state.P = arg; \ - emit P ## Changed(arg); \ + Q_EMIT P ## Changed(arg); \ QAccessible::State changedState; \ changedState.P = true; \ QAccessibleStateChangeEvent ev(parent(), changedState); \ diff --git a/src/quick/items/qquickimage_p.h b/src/quick/items/qquickimage_p.h index 28496d546b..d7a55e529b 100644 --- a/src/quick/items/qquickimage_p.h +++ b/src/quick/items/qquickimage_p.h @@ -72,7 +72,7 @@ public: bool mipmap() const; void setMipmap(bool use); - void emitAutoTransformBaseChanged() override { emit autoTransformChanged(); } + void emitAutoTransformBaseChanged() override { Q_EMIT autoTransformChanged(); } Q_SIGNALS: void fillModeChanged(); diff --git a/src/quick/items/qquicktreeview_p.h b/src/quick/items/qquicktreeview_p.h index 2030016ee3..f86d6f9369 100644 --- a/src/quick/items/qquicktreeview_p.h +++ b/src/quick/items/qquicktreeview_p.h @@ -47,7 +47,7 @@ public: Q_INVOKABLE QModelIndex modelIndex(int column, int row) const override; Q_INVOKABLE QPoint cellAtIndex(const QModelIndex &index) const override; -signals: +Q_SIGNALS: void expanded(int row, int depth); void collapsed(int row, bool recursively); diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarelayer_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwarelayer_p.h index e77d584a15..76b6c2f9f4 100644 --- a/src/quick/scenegraph/adaptations/software/qsgsoftwarelayer_p.h +++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarelayer_p.h @@ -59,7 +59,7 @@ public: void setMirrorVertical(bool mirror) override; void setSamples(int) override { } -public slots: +public Q_SLOTS: void markDirtyTexture() override; void invalidated() override; diff --git a/src/quick/util/qquickinputmethod_p.h b/src/quick/util/qquickinputmethod_p.h index e409725ea9..7e0573e867 100644 --- a/src/quick/util/qquickinputmethod_p.h +++ b/src/quick/util/qquickinputmethod_p.h @@ -62,7 +62,7 @@ public: QRectF keyboardRectangle() const; QLocale locale() const; -signals: +Q_SIGNALS: void anchorRectangleChanged(); void animatingChanged(); void cursorRectangleChanged(); @@ -72,7 +72,7 @@ signals: void localeChanged(); void visibleChanged(); -public slots: +public Q_SLOTS: void commit(); void hide(); void invokeAction(QInputMethod::Action a, int cursorPosition); diff --git a/src/quick/util/qquickprofiler_p.h b/src/quick/util/qquickprofiler_p.h index 57ad4068ec..276172a2da 100644 --- a/src/quick/util/qquickprofiler_p.h +++ b/src/quick/util/qquickprofiler_p.h @@ -299,7 +299,7 @@ public: ~QQuickProfiler() override; -signals: +Q_SIGNALS: void dataReady(const QVector<QQuickProfilerData> &data); protected: diff --git a/src/quickcontrols2/ios/impl/qquickioscursorflashtimer_p.h b/src/quickcontrols2/ios/impl/qquickioscursorflashtimer_p.h index c1cf3209fa..46e73ecb64 100644 --- a/src/quickcontrols2/ios/impl/qquickioscursorflashtimer_p.h +++ b/src/quickcontrols2/ios/impl/qquickioscursorflashtimer_p.h @@ -45,7 +45,7 @@ public: void timerEvent(QTimerEvent *event) override; -signals: +Q_SIGNALS: void visibleChanged(); void cursorPositionChanged(); void runningChanged(bool running); diff --git a/src/quicklayouts/qquicklayout_p.h b/src/quicklayouts/qquicklayout_p.h index f459418d91..69ba3a79bf 100644 --- a/src/quicklayouts/qquicklayout_p.h +++ b/src/quicklayouts/qquicklayout_p.h @@ -107,7 +107,7 @@ protected: NOrientations }; -protected slots: +protected Q_SLOTS: void invalidateSenderItem(); private: @@ -278,7 +278,7 @@ public: return false; } -signals: +Q_SIGNALS: void minimumWidthChanged(); void minimumHeightChanged(); void preferredWidthChanged(); diff --git a/src/quicklayouts/qquicklinearlayout_p.h b/src/quicklayouts/qquicklinearlayout_p.h index eea803606f..26810d5684 100644 --- a/src/quicklayouts/qquicklinearlayout_p.h +++ b/src/quicklayouts/qquicklinearlayout_p.h @@ -68,7 +68,7 @@ protected: void rearrange(const QSizeF &size) override; virtual void insertLayoutItems() {} -signals: +Q_SIGNALS: Q_REVISION(1, 1) void layoutDirectionChanged(); private: @@ -140,7 +140,7 @@ public: void insertLayoutItems() override; -signals: +Q_SIGNALS: void columnSpacingChanged(); void rowSpacingChanged(); @@ -182,7 +182,7 @@ public: void insertLayoutItems() override; -signals: +Q_SIGNALS: void spacingChanged(); private: Q_DECLARE_PRIVATE(QQuickLinearLayout) diff --git a/src/quicklayouts/qquickstacklayout_p.h b/src/quicklayouts/qquickstacklayout_p.h index aedaef65ed..86000759d1 100644 --- a/src/quicklayouts/qquickstacklayout_p.h +++ b/src/quicklayouts/qquickstacklayout_p.h @@ -53,7 +53,7 @@ public: static QQuickStackLayoutAttached *qmlAttachedProperties(QObject *object); -signals: +Q_SIGNALS: void currentIndexChanged(); void countChanged(); @@ -108,7 +108,7 @@ public: QQuickStackLayout *layout() const; void setLayout(QQuickStackLayout *layout); -signals: +Q_SIGNALS: void indexChanged(); void isCurrentItemChanged(); void layoutChanged(); diff --git a/src/quicknativestyle/items/qquickstyleitem.h b/src/quicknativestyle/items/qquickstyleitem.h index 283a9d2a47..1ad8932d23 100644 --- a/src/quicknativestyle/items/qquickstyleitem.h +++ b/src/quicknativestyle/items/qquickstyleitem.h @@ -195,7 +195,7 @@ public: void markGeometryDirty(); void markImageDirty(); -signals: +Q_SIGNALS: void controlChanged(); void contentPaddingChanged(); void layoutMarginsChanged(); diff --git a/src/quicknativestyle/items/qquickstyleitemgroupbox.h b/src/quicknativestyle/items/qquickstyleitemgroupbox.h index 1c15c05a12..58b7a23e02 100644 --- a/src/quicknativestyle/items/qquickstyleitemgroupbox.h +++ b/src/quicknativestyle/items/qquickstyleitemgroupbox.h @@ -21,7 +21,7 @@ public: QPointF labelPos() const; QFont styleFont(QQuickItem *control) const override; -signals: +Q_SIGNALS: void groupBoxPaddingChanged(); void labelPosChanged(); diff --git a/src/quickshapes/qquickshape_p.h b/src/quickshapes/qquickshape_p.h index 18a404742f..f1e2eea546 100644 --- a/src/quickshapes/qquickshape_p.h +++ b/src/quickshapes/qquickshape_p.h @@ -58,7 +58,7 @@ public: SpreadMode spread() const; void setSpread(SpreadMode mode); -signals: +Q_SIGNALS: void spreadChanged(); private: @@ -88,7 +88,7 @@ public: qreal y2() const; void setY2(qreal v); -signals: +Q_SIGNALS: void x1Changed(); void y1Changed(); void x2Changed(); @@ -133,7 +133,7 @@ public: qreal focalRadius() const; void setFocalRadius(qreal v); -signals: +Q_SIGNALS: void centerXChanged(); void centerYChanged(); void focalXChanged(); @@ -170,7 +170,7 @@ public: qreal angle() const; void setAngle(qreal v); -signals: +Q_SIGNALS: void centerXChanged(); void centerYChanged(); void angleChanged(); diff --git a/src/quicktemplates2/qquicktreeviewdelegate_p.h b/src/quicktemplates2/qquicktreeviewdelegate_p.h index d577268ca1..60acb7f221 100644 --- a/src/quicktemplates2/qquicktreeviewdelegate_p.h +++ b/src/quicktemplates2/qquicktreeviewdelegate_p.h @@ -76,7 +76,7 @@ public: qreal rightMargin() const; void setRightMargin(qreal rightMargin); -signals: +Q_SIGNALS: void indicatorChanged(); void indentationChanged(); void isTreeNodeChanged(); diff --git a/src/quicktestutils/qml/qmlutils_p.h b/src/quicktestutils/qml/qmlutils_p.h index bcd200a490..962268897d 100644 --- a/src/quicktestutils/qml/qmlutils_p.h +++ b/src/quicktestutils/qml/qmlutils_p.h @@ -61,7 +61,7 @@ public: bool canImportModule(const QString &importTestQmlSource) const; -public slots: +public Q_SLOTS: virtual void initTestCase(); virtual void init(); diff --git a/src/quicktestutils/qml/testhttpserver_p.h b/src/quicktestutils/qml/testhttpserver_p.h index de81173ef5..0620aa4e72 100644 --- a/src/quicktestutils/qml/testhttpserver_p.h +++ b/src/quicktestutils/qml/testhttpserver_p.h @@ -56,7 +56,7 @@ public: // In Delay mode, each item needs one call to this function to be sent void sendDelayedItem(); -private slots: +private Q_SLOTS: void newConnection(); void disconnected(); void readyRead(); diff --git a/src/quicktestutils/quick/geometrytestutils_p.h b/src/quicktestutils/quick/geometrytestutils_p.h index 464a0c7645..605dfd9027 100644 --- a/src/quicktestutils/quick/geometrytestutils_p.h +++ b/src/quicktestutils/quick/geometrytestutils_p.h @@ -29,7 +29,7 @@ class QSizeChangeListener : public QObject, public QVector<QSize> Q_OBJECT public: explicit QSizeChangeListener(QQuickItem *item); -private slots: +private Q_SLOTS: void onSizeChanged(); private: QQuickItem *item; diff --git a/src/quicktestutils/quick/visualtestutils_p.h b/src/quicktestutils/quick/visualtestutils_p.h index 934f84ebc7..953d374327 100644 --- a/src/quicktestutils/quick/visualtestutils_p.h +++ b/src/quicktestutils/quick/visualtestutils_p.h @@ -117,7 +117,7 @@ namespace QQuickVisualTestUtils signalNames.clear(); } - public slots: + public Q_SLOTS: void receive() { QMetaMethod m = sender()->metaObject()->method(senderSignalIndex()); senders << sender(); |