From d27075599ea918bef0a6593dd60e6ea3be9b4f3d Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 27 Apr 2024 01:30:24 +0300 Subject: [PATCH] remove revision leftovers Signed-off-by: Ivailo Monev --- src/tools/moc/moc.h | 13 +++++++++---- src/tools/moc/token.cpp | 1 - src/tools/moc/token.h | 1 - 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h index 3c921d152..d10f550ec 100644 --- a/src/tools/moc/moc.h +++ b/src/tools/moc/moc.h @@ -98,7 +98,11 @@ struct FunctionDef struct PropertyDef { - PropertyDef():notifyId(-1), gspec(ValueSpec), revision(0){} + PropertyDef() : + notifyId(-1), gspec(ValueSpec) + { + } + QByteArray name, type, read, write, reset, scriptable, notify, inPrivateClass; int notifyId; enum Specification { ValueSpec, ReferenceSpec, PointerSpec }; @@ -109,7 +113,6 @@ struct PropertyDef s += name.mid(1); return (s == write); } - int revision; }; @@ -121,8 +124,10 @@ struct ClassInfoDef struct ClassDef { ClassDef(): - hasQObject(false), hasQGadget(false), notifyableProperties(0) - , begin(0), end(0){} + hasQObject(false), hasQGadget(false), notifyableProperties(0), begin(0), end(0) + { + } + QByteArray classname; QByteArray qualified; QList > superclassList; diff --git a/src/tools/moc/token.cpp b/src/tools/moc/token.cpp index 0c74dab4f..f907ba88b 100644 --- a/src/tools/moc/token.cpp +++ b/src/tools/moc/token.cpp @@ -160,7 +160,6 @@ const char *tokenTypeName(Token t) case Q_SLOT_TOKEN: return "Q_SLOT_TOKEN"; case Q_PRIVATE_SLOT_TOKEN: return "Q_PRIVATE_SLOT_TOKEN"; case Q_PRIVATE_PROPERTY_TOKEN: return "Q_PRIVATE_PROPERTY_TOKEN"; - case Q_REVISION_TOKEN: return "Q_REVISION_TOKEN"; case SPECIAL_TREATMENT_MARK: return "SPECIAL_TREATMENT_MARK"; case MOC_INCLUDE_BEGIN: return "MOC_INCLUDE_BEGIN"; case MOC_INCLUDE_END: return "MOC_INCLUDE_END"; diff --git a/src/tools/moc/token.h b/src/tools/moc/token.h index bf44fa4d2..3d8be8a2c 100644 --- a/src/tools/moc/token.h +++ b/src/tools/moc/token.h @@ -164,7 +164,6 @@ enum Token { Q_INVOKABLE_TOKEN, Q_SCRIPTABLE_TOKEN, Q_PRIVATE_PROPERTY_TOKEN, - Q_REVISION_TOKEN, Q_META_TOKEN_END, SPECIAL_TREATMENT_MARK = Q_META_TOKEN_END, MOC_INCLUDE_BEGIN,