diff --git a/demo/src/Bindings.h b/demo/src/Bindings.h --- a/demo/src/Bindings.h +++ b/demo/src/Bindings.h @@ -44,7 +44,7 @@ Processes* processes(); const TimeSeries* timeSeries() const; TimeSeries* timeSeries(); -signals: +Q_SIGNALS: void fibonacciChanged(); void fibonacciListChanged(); void fileSystemTreeChanged(); @@ -70,7 +70,7 @@ quint32 input() const; void setInput(quint32 v); quint64 result() const; -signals: +Q_SIGNALS: void inputChanged(); void resultChanged(); }; @@ -108,14 +108,14 @@ Q_INVOKABLE quint64 fibonacciNumber(int row) const; Q_INVOKABLE quint64 row(int row) const; -signals: +Q_SIGNALS: // new data is ready to be made available to the model with fetchMore() void newDataReady(const QModelIndex &parent) const; private: QHash, QVariant> m_headerData; void initHeaderData(); void updatePersistentIndexes(); -signals: +Q_SIGNALS: }; class FileSystemTree : public QAbstractItemModel @@ -158,14 +158,14 @@ Q_INVOKABLE QVariant fileSize(const QModelIndex& index) const; Q_INVOKABLE qint32 fileType(const QModelIndex& index) const; -signals: +Q_SIGNALS: // new data is ready to be made available to the model with fetchMore() void newDataReady(const QModelIndex &parent) const; private: QHash, QVariant> m_headerData; void initHeaderData(); void updatePersistentIndexes(); -signals: +Q_SIGNALS: void pathChanged(); }; @@ -210,14 +210,14 @@ Q_INVOKABLE quint32 pid(const QModelIndex& index) const; Q_INVOKABLE quint32 uid(const QModelIndex& index) const; -signals: +Q_SIGNALS: // new data is ready to be made available to the model with fetchMore() void newDataReady(const QModelIndex &parent) const; private: QHash, QVariant> m_headerData; void initHeaderData(); void updatePersistentIndexes(); -signals: +Q_SIGNALS: void activeChanged(); }; @@ -259,13 +259,13 @@ Q_INVOKABLE float time(int row) const; Q_INVOKABLE bool setTime(int row, float value); -signals: +Q_SIGNALS: // new data is ready to be made available to the model with fetchMore() void newDataReady(const QModelIndex &parent) const; private: QHash, QVariant> m_headerData; void initHeaderData(); void updatePersistentIndexes(); -signals: +Q_SIGNALS: }; #endif // BINDINGS_H diff --git a/src/cpp.cpp b/src/cpp.cpp --- a/src/cpp.cpp +++ b/src/cpp.cpp @@ -111,7 +111,7 @@ } } h << R"( -signals: +Q_SIGNALS: // new data is ready to be made available to the model with fetchMore() void newDataReady(const QModelIndex &parent) const; private: @@ -636,7 +636,7 @@ if (baseType(o) == "QAbstractItemModel") { writeHeaderItemModel(h, o); } - h << "signals:" << endl; + h << "Q_SIGNALS:" << endl; for (auto p: o.properties) { h << " void " << p.name << "Changed();" << endl; } diff --git a/tests/test_functions_rust.h b/tests/test_functions_rust.h --- a/tests/test_functions_rust.h +++ b/tests/test_functions_rust.h @@ -28,7 +28,7 @@ Q_INVOKABLE QString quote(const QString& prefix, const QString& suffix) const; Q_INVOKABLE QByteArray quoteBytes(const QByteArray& prefix, const QByteArray& suffix) const; Q_INVOKABLE quint8 vowelsInName() const; -signals: +Q_SIGNALS: void userNameChanged(); }; #endif // TEST_FUNCTIONS_RUST_H diff --git a/tests/test_list_rust.h b/tests/test_list_rust.h --- a/tests/test_list_rust.h +++ b/tests/test_list_rust.h @@ -43,14 +43,14 @@ Q_INVOKABLE QString userName(int row) const; Q_INVOKABLE bool setUserName(int row, const QString& value); -signals: +Q_SIGNALS: // new data is ready to be made available to the model with fetchMore() void newDataReady(const QModelIndex &parent) const; private: QHash, QVariant> m_headerData; void initHeaderData(); void updatePersistentIndexes(); -signals: +Q_SIGNALS: }; class Persons : public QAbstractItemModel @@ -86,13 +86,13 @@ Q_INVOKABLE QString userName(int row) const; Q_INVOKABLE bool setUserName(int row, const QString& value); -signals: +Q_SIGNALS: // new data is ready to be made available to the model with fetchMore() void newDataReady(const QModelIndex &parent) const; private: QHash, QVariant> m_headerData; void initHeaderData(); void updatePersistentIndexes(); -signals: +Q_SIGNALS: }; #endif // TEST_LIST_RUST_H diff --git a/tests/test_list_types_rust.h b/tests/test_list_types_rust.h --- a/tests/test_list_types_rust.h +++ b/tests/test_list_types_rust.h @@ -70,13 +70,13 @@ Q_INVOKABLE quint8 u8(int row) const; Q_INVOKABLE bool setU8(int row, quint8 value); -signals: +Q_SIGNALS: // new data is ready to be made available to the model with fetchMore() void newDataReady(const QModelIndex &parent) const; private: QHash, QVariant> m_headerData; void initHeaderData(); void updatePersistentIndexes(); -signals: +Q_SIGNALS: }; #endif // TEST_LIST_TYPES_RUST_H diff --git a/tests/test_object_rust.h b/tests/test_object_rust.h --- a/tests/test_object_rust.h +++ b/tests/test_object_rust.h @@ -22,7 +22,7 @@ ~Person(); QString userName() const; void setUserName(const QString& v); -signals: +Q_SIGNALS: void userNameChanged(); }; #endif // TEST_OBJECT_RUST_H diff --git a/tests/test_object_types_rust.h b/tests/test_object_types_rust.h --- a/tests/test_object_types_rust.h +++ b/tests/test_object_types_rust.h @@ -73,7 +73,7 @@ void setU64(quint64 v); quint8 u8() const; void setU8(quint8 v); -signals: +Q_SIGNALS: void booleanChanged(); void bytearrayChanged(); void f32Changed(); diff --git a/tests/test_objects_rust.h b/tests/test_objects_rust.h --- a/tests/test_objects_rust.h +++ b/tests/test_objects_rust.h @@ -26,7 +26,7 @@ ~Group(); const Person* person() const; Person* person(); -signals: +Q_SIGNALS: void personChanged(); }; @@ -47,7 +47,7 @@ ~InnerObject(); QString description() const; void setDescription(const QString& v); -signals: +Q_SIGNALS: void descriptionChanged(); }; @@ -68,7 +68,7 @@ ~Person(); const InnerObject* object() const; InnerObject* object(); -signals: +Q_SIGNALS: void objectChanged(); }; #endif // TEST_OBJECTS_RUST_H diff --git a/tests/test_tree_rust.h b/tests/test_tree_rust.h --- a/tests/test_tree_rust.h +++ b/tests/test_tree_rust.h @@ -40,13 +40,13 @@ Q_INVOKABLE QString userName(const QModelIndex& index) const; Q_INVOKABLE bool setUserName(const QModelIndex& index, const QString& value); -signals: +Q_SIGNALS: // new data is ready to be made available to the model with fetchMore() void newDataReady(const QModelIndex &parent) const; private: QHash, QVariant> m_headerData; void initHeaderData(); void updatePersistentIndexes(); -signals: +Q_SIGNALS: }; #endif // TEST_TREE_RUST_H