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

Get rid of the obsolete isEditable flag for properties

Browse Source 
Change-Id: I54411bd8e223671523c9c8fad5c80bfa6b5b7097
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Lars Knoll 2019-05-03 15:18:06 +02:00 committed by Fabian Kosmale
parent 9b383f3d5c
commit d0689ec867
10 changed files with 2 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/corelib/kernel/qmetaobject.cpp
View File

@ -3496,27 +3496,6 @@ bool QMetaProperty::isQProperty() const
return data.flags() & IsQProperty;
}
/*!
\obsolete
Returns \c true if the property is editable;
otherwise returns \c false.
If no \a object is given, the function returns \c false if the
\c{Q_PROPERTY()}'s \c EDITABLE attribute is false; otherwise returns
true (if the attribute is true or is a function or expression).
\sa isDesignable(), isScriptable(), isStored()
*/
#if QT_DEPRECATED_SINCE(5, 15)
bool QMetaProperty::isEditable() const
{
if (!mobj)
return false;
return data.flags() & Editable;
}
#endif
/*!
\class QMetaClassInfo
\inmodule QtCore

3
src/corelib/kernel/qmetaobject.h
View File

@ -289,9 +289,6 @@ public:
bool isDesignable() const;
bool isScriptable() const;
bool isStored() const;
#if QT_DEPRECATED_SINCE(5, 15)
QT_DEPRECATED_VERSION_5_15 bool isEditable() const;
#endif
bool isUser() const;
bool isConstant() const;
bool isFinal() const;

1
src/corelib/kernel/qmetaobject_p.h
View File

@ -77,7 +77,6 @@ enum PropertyFlags {
Designable = 0x00001000,
Scriptable = 0x00004000,
Stored = 0x00010000,
Editable = 0x00040000,
User = 0x00100000,
Required = 0x01000000,
IsQProperty = 0x02000000

27
src/corelib/kernel/qmetaobjectbuilder.cpp
View File

@ -2291,21 +2291,6 @@ bool QMetaPropertyBuilder::isStored() const
return false;
}
/*!
Returns \c true if the property is editable; otherwise returns \c false.
This default value is false.
\sa setEditable(), isDesignable(), isScriptable(), isStored()
*/
bool QMetaPropertyBuilder::isEditable() const
{
QMetaPropertyBuilderPrivate *d = d_func();
if (d)
return d->flag(Editable);
else
return false;
}
/*!
Returns \c true if this property is designated as the \c USER
property, i.e., the one that the user can edit or that is
@ -2454,18 +2439,6 @@ void QMetaPropertyBuilder::setStored(bool value)
d->setFlag(Stored, value);
}
/*!
Sets this property to editable if \a value is true.
\sa isEditable(), setDesignable(), setScriptable(), setStored()
*/
void QMetaPropertyBuilder::setEditable(bool value)
{
QMetaPropertyBuilderPrivate *d = d_func();
if (d)
d->setFlag(Editable, value);
}
/*!
Sets the \c USER flag on this property to \a value.

1
src/corelib/kernel/qmetaobjectbuilder_p.h
View File

@ -269,7 +269,6 @@ public:
void setDesignable(bool value);
void setScriptable(bool value);
void setStored(bool value);
void setEditable(bool value);
void setUser(bool value);
void setStdCppSet(bool value);
void setEnumOrFlag(bool value);

3
src/tools/moc/generator.cpp
View File

@ -878,9 +878,6 @@ void Generator::generateProperties()
if (p.stored != "false")
flags |= Stored;
if (p.editable != "false")
flags |= Editable;
if (p.user != "false")
flags |= User;

9
src/tools/moc/moc.cpp
View File

@ -1267,7 +1267,7 @@ void Moc::createPropertyDef(PropertyDef &propDef)
if (typeWrappedInQProperty)
next(RANGLE);
propDef.designable = propDef.scriptable = propDef.stored = "true";
propDef.user = propDef.editable = "false";
propDef.user = "false";
/*
The Q_PROPERTY construct cannot contain any commas, since
commas separate macro arguments. We therefore expect users
@ -1376,13 +1376,6 @@ void Moc::parsePropertyAttributes(PropertyDef &propDef)
propDef.designable = v + v2;
checkIsFunction(propDef.designable, "DESIGNABLE");
break;
case 'E': if (l != "EDITABLE") error(2); {
const QByteArray msg = "EDITABLE flag for property declaration is deprecated.";
warning(msg.constData());
propDef.editable = v + v2;
checkIsFunction(propDef.editable, "EDITABLE");
}
break;
case 'N': if (l != "NOTIFY") error(2);
propDef.notify = v;
break;

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

@ -132,7 +132,7 @@ struct PropertyDef
return (s == write);
}
QByteArray name, type, member, read, write, reset, designable, scriptable, editable, stored, user, notify, inPrivateClass;
QByteArray name, type, member, read, write, reset, designable, scriptable, stored, user, notify, inPrivateClass;
int notifyId = -1; // -1 means no notifyId, >= 0 means signal defined in this class, < -1 means signal not defined in this class
enum Specification { ValueSpec, ReferenceSpec, PointerSpec };
Specification gspec = ValueSpec;

11
tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
View File

@ -556,7 +556,6 @@ void tst_QMetaObjectBuilder::property()
QVERIFY(!nullProp.isDesignable());
QVERIFY(!nullProp.isScriptable());
QVERIFY(!nullProp.isStored());
QVERIFY(!nullProp.isEditable());
QVERIFY(!nullProp.isUser());
QVERIFY(!nullProp.hasStdCppSet());
QVERIFY(!nullProp.isEnumOrFlag());
@ -576,7 +575,6 @@ void tst_QMetaObjectBuilder::property()
QVERIFY(!prop1.isDesignable());
QVERIFY(prop1.isScriptable());
QVERIFY(!prop1.isStored());
QVERIFY(!prop1.isEditable());
QVERIFY(!prop1.isUser());
QVERIFY(!prop1.hasStdCppSet());
QVERIFY(!prop1.isEnumOrFlag());
@ -597,7 +595,6 @@ void tst_QMetaObjectBuilder::property()
QVERIFY(!prop2.isDesignable());
QVERIFY(prop2.isScriptable());
QVERIFY(!prop2.isStored());
QVERIFY(!prop2.isEditable());
QVERIFY(!prop2.isUser());
QVERIFY(!prop2.hasStdCppSet());
QVERIFY(!prop2.isEnumOrFlag());
@ -621,7 +618,6 @@ void tst_QMetaObjectBuilder::property()
prop1.setDesignable(true);
prop1.setScriptable(false);
prop1.setStored(true);
prop1.setEditable(true);
prop1.setUser(true);
prop1.setStdCppSet(true);
prop1.setEnumOrFlag(true);
@ -638,7 +634,6 @@ void tst_QMetaObjectBuilder::property()
QVERIFY(prop1.isDesignable());
QVERIFY(!prop1.isScriptable());
QVERIFY(prop1.isStored());
QVERIFY(prop1.isEditable());
QVERIFY(prop1.isUser());
QVERIFY(prop1.hasStdCppSet());
QVERIFY(prop1.isEnumOrFlag());
@ -653,7 +648,6 @@ void tst_QMetaObjectBuilder::property()
QVERIFY(!prop2.isDesignable());
QVERIFY(prop2.isScriptable());
QVERIFY(!prop2.isStored());
QVERIFY(!prop2.isEditable());
QVERIFY(!prop2.isUser());
QVERIFY(!prop2.hasStdCppSet());
QVERIFY(!prop2.isEnumOrFlag());
@ -671,7 +665,6 @@ void tst_QMetaObjectBuilder::property()
QVERIFY(!prop2.isDesignable());
QVERIFY(prop2.isScriptable());
QVERIFY(!prop2.isStored());
QVERIFY(!prop2.isEditable());
QVERIFY(!prop2.isUser());
QVERIFY(!prop2.hasStdCppSet());
QVERIFY(!prop2.isEnumOrFlag());
@ -697,7 +690,6 @@ void tst_QMetaObjectBuilder::property()
prop2.setDesignable(false); \
prop2.setScriptable(false); \
prop2.setStored(false); \
prop2.setEditable(false); \
prop2.setUser(false); \
prop2.setStdCppSet(false); \
prop2.setEnumOrFlag(false); \
@ -711,7 +703,6 @@ void tst_QMetaObjectBuilder::property()
(prop2.isDesignable() ? 1 : 0) + \
(prop2.isScriptable() ? 1 : 0) + \
(prop2.isStored() ? 1 : 0) + \
(prop2.isEditable() ? 1 : 0) + \
(prop2.isUser() ? 1 : 0) + \
(prop2.hasStdCppSet() ? 1 : 0) + \
(prop2.isEnumOrFlag() ? 1 : 0) + \
@ -731,7 +722,6 @@ void tst_QMetaObjectBuilder::property()
CHECK_FLAG(setDesignable, isDesignable);
CHECK_FLAG(setScriptable, isScriptable);
CHECK_FLAG(setStored, isStored);
CHECK_FLAG(setEditable, isEditable);
CHECK_FLAG(setUser, isUser);
CHECK_FLAG(setStdCppSet, hasStdCppSet);
CHECK_FLAG(setEnumOrFlag, isEnumOrFlag);
@ -1231,7 +1221,6 @@ static bool sameProperty(const QMetaProperty& prop1, const QMetaProperty& prop2)
prop1.isDesignable() != prop2.isDesignable() ||
prop1.isScriptable() != prop2.isScriptable() ||
prop1.isStored() != prop2.isStored() ||
prop1.isEditable() != prop2.isEditable() ||
prop1.isUser() != prop2.isUser() ||
prop1.isFlagType() != prop2.isFlagType() ||
prop1.isEnumType() != prop2.isEnumType() ||

1
tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp
View File

@ -409,7 +409,6 @@ void tst_QDBusMetaObject::types()
QMetaProperty constructed = result->property(propIdx);
QCOMPARE(constructed.isDesignable(), expected.isDesignable());
QCOMPARE(constructed.isEditable(), expected.isEditable());
QCOMPARE(constructed.isEnumType(), expected.isEnumType());
QCOMPARE(constructed.isFlagType(), expected.isFlagType());
QCOMPARE(constructed.isReadable(), expected.isReadable());