1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moc: fix GCC -Wextra-semi colon after member function definitions

Browse Source 
As pointed out by Thiago the QT_DECLARE_METATYPE calls are redundant, so
remove them.

Task-number: QTBUG-132101
Pick-to: 6.8
Change-Id: I73800e70d3f270fb87941d4e053aa7ac5ed1841c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 3bb4c4949fed9ccf8653151c78d5130b8db00716)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Ahmad Samir 2024-12-19 11:27:02 +02:00 committed by Qt Cherry-pick Bot
parent 5171b7f488
commit 01edc916d2
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/moc/generator.h
View File

@ -21,7 +21,7 @@ public:
const QHash<QByteArray, QByteArray> &knownGadgets, FILE *outfile = nullptr, const QHash<QByteArray, QByteArray> &knownGadgets, FILE *outfile = nullptr,
bool requireCompleteTypes = false); bool requireCompleteTypes = false);
void generateCode(); void generateCode();
qsizetype registeredStringsCount() { return strings.size(); }; qsizetype registeredStringsCount() { return strings.size(); }
private: private:
bool registerableMetaType(const QByteArray &propertyType); bool registerableMetaType(const QByteArray &propertyType);

33
tests/auto/tools/moc/tst_moc.cpp
View File

@ -107,8 +107,6 @@ enum FooItems
Q_ENUM_NS(FooItems) Q_ENUM_NS(FooItems)
} }
Q_DECLARE_METATYPE(const QMetaObject*);
#define TESTEXPORTMACRO Q_DECL_EXPORT #define TESTEXPORTMACRO Q_DECL_EXPORT
#if !defined(Q_MOC_RUN) && !defined(Q_NOREPLY) #if !defined(Q_MOC_RUN) && !defined(Q_NOREPLY)
@ -913,8 +911,8 @@ signals:
void sigWithDefaultArg(int i = 12); void sigWithDefaultArg(int i = 12);
private: private:
bool user1() { return true; }; bool user1() { return true; }
bool user2() { return false; }; bool user2() { return false; }
template <class T> void revisions_T(); template <class T> void revisions_T();
QString member2() const { return sMember; } QString member2() const { return sMember; }
void setMember3( const QString &sVal ) { sMember = sVal; } void setMember3( const QString &sVal ) { sMember = sVal; }
@ -1320,8 +1318,6 @@ void tst_Moc::structQObject()
#include "namespaced-flags.h" #include "namespaced-flags.h"
Q_DECLARE_METATYPE(QList<Foo::Bar::Flags>);
void tst_Moc::namespacedFlags() void tst_Moc::namespacedFlags()
{ {
Foo::Baz baz; Foo::Baz baz;
@ -2036,11 +2032,11 @@ struct const_ {};
class QTBUG9354_constInName: public QObject class QTBUG9354_constInName: public QObject
{ Q_OBJECT { Q_OBJECT
public slots: public slots:
void slotChooseScientificConst0(science_constant const &) {}; void slotChooseScientificConst0(science_constant const &) {}
void foo(science_const const &) {}; void foo(science_const const &) {}
void foo(constconst const &) {}; void foo(constconst const &) {}
void foo(constconst *) {}; void foo(constconst *) {}
void foo(const_ *) {}; void foo(const_ *) {}
}; };
@ -2157,7 +2153,7 @@ public:
Q_INVOKABLE Q_REVISION(6, 0) void method60() {} Q_INVOKABLE Q_REVISION(6, 0) void method60() {}
enum TestEnum { One, Two }; enum TestEnum { One, Two };
Q_ENUM(TestEnum); Q_ENUM(TestEnum)
public slots: public slots:
@ -2201,7 +2197,7 @@ public:
Q_INVOKABLE Q_REVISION(6, 0) void method60() {} Q_INVOKABLE Q_REVISION(6, 0) void method60() {}
enum TestEnum { One, Two }; enum TestEnum { One, Two };
Q_ENUM(TestEnum); Q_ENUM(TestEnum)
public slots: public slots:
void slot1() {} void slot1() {}
@ -3402,7 +3398,6 @@ public:
Q_DECLARE_METATYPE(CustomQObject::Number) Q_DECLARE_METATYPE(CustomQObject::Number)
typedef CustomQObject* CustomQObjectStar; typedef CustomQObject* CustomQObjectStar;
Q_DECLARE_METATYPE(CustomQObjectStar);
namespace SomeNamespace { namespace SomeNamespace {
@ -3443,7 +3438,6 @@ public:
Q_DECLARE_METATYPE(CustomQObject2::Number) Q_DECLARE_METATYPE(CustomQObject2::Number)
typedef CustomQObject2* CustomQObject2Star; typedef CustomQObject2* CustomQObject2Star;
Q_DECLARE_METATYPE(CustomQObject2Star);
namespace SomeNamespace2 { namespace SomeNamespace2 {
@ -3921,7 +3915,7 @@ namespace QTBUG32933_relatedObjectsDontIncludeItself {
Q_PROPERTY(Obj::MyEnum p2 MEMBER member) Q_PROPERTY(Obj::MyEnum p2 MEMBER member)
Q_PROPERTY(NS::Obj::MyEnum p3 MEMBER member) Q_PROPERTY(NS::Obj::MyEnum p3 MEMBER member)
Q_PROPERTY(QTBUG32933_relatedObjectsDontIncludeItself::NS::Obj::MyEnum p4 MEMBER member) Q_PROPERTY(QTBUG32933_relatedObjectsDontIncludeItself::NS::Obj::MyEnum p4 MEMBER member)
Q_ENUMS(MyEnum); Q_ENUMS(MyEnum)
public: public:
enum MyEnum { Something, SomethingElse }; enum MyEnum { Something, SomethingElse };
MyEnum member; MyEnum member;
@ -4511,8 +4505,6 @@ void TestFwdProperties::setProp3(const FwdClass3 &v)
} }
TestFwdProperties::~TestFwdProperties() {} TestFwdProperties::~TestFwdProperties() {}
Q_DECLARE_METATYPE(FwdClass1);
void tst_Moc::mocInclude() void tst_Moc::mocInclude()
{ {
TestFwdProperties obj; TestFwdProperties obj;
@ -4556,7 +4548,8 @@ signals:
public: public:
QBindable<int> bindablePublicProperty() { return QBindable<int>(&publicProperty); } QBindable<int> bindablePublicProperty() { return QBindable<int>(&publicProperty); }
Q_OBJECT_BINDABLE_PROPERTY(ClassWithQPropertyMembers, int, publicProperty, &ClassWithQPropertyMembers::publicPropertyChanged); Q_OBJECT_BINDABLE_PROPERTY(ClassWithQPropertyMembers, int, publicProperty,
&ClassWithQPropertyMembers::publicPropertyChanged)
QProperty<int> notExposed; QProperty<int> notExposed;
@ -4683,7 +4676,7 @@ public:
ClassWithPrivateQPropertyShim *q = nullptr; ClassWithPrivateQPropertyShim *q = nullptr;
void onTestPropertyChanged() { q->testPropertyChanged(); } void onTestPropertyChanged() { q->testPropertyChanged(); }
Q_OBJECT_BINDABLE_PROPERTY(Private, int, testProperty, &Private::onTestPropertyChanged); Q_OBJECT_BINDABLE_PROPERTY(Private, int, testProperty, &Private::onTestPropertyChanged)
QProperty<int> testProperty2; QProperty<int> testProperty2;
}; };
Private priv{this}; Private priv{this};