feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: Always generate a onXyzChanged slot.

Browse Source 
Even if the NOTIFY signal listed for the property has a different name.

Task-number: QTCREATORBUG-3614
Change-Id: I748cddab89732acd6a56b243610be52873225064
Reviewed-on: http://codereview.qt.nokia.com/637
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
This commit is contained in:
Christian Kamm
2011-06-23 09:10:32 +02:00
parent 46e970c37c
commit 756e00b15f
1 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/libs/qmljs/qmljsinterpreter.cpp
View File

@@ -189,12 +189,8 @@ void QmlObjectValue::processMembers(MemberProcessor *processor) const
}
}
// process the meta properties
for (int index = 0; index < _metaObject->propertyCount(); ++index) {
FakeMetaProperty prop = _metaObject->property(index);
processor->processProperty(prop.name(), propertyValue(prop));
}
// all explicitly defined signal names
QSet<QString> explicitSignals;
// process the meta methods
for (int index = 0; index < _metaObject->methodCount(); ++index) {
@@ -208,9 +204,9 @@ void QmlObjectValue::processMembers(MemberProcessor *processor) const
} else if (method.methodType() == FakeMetaMethod::Signal && method.access() != FakeMetaMethod::Private) {
// process the signal
processor->processSignal(methodName, signature);
explicitSignals.insert(methodName);
QString slotName;
slotName += QLatin1String("on");
QString slotName = QLatin1String("on");
slotName += methodName.at(0).toUpper();
slotName += methodName.midRef(1);
@@ -219,6 +215,27 @@ void QmlObjectValue::processMembers(MemberProcessor *processor) const
}
}
// process the meta properties
for (int index = 0; index < _metaObject->propertyCount(); ++index) {
FakeMetaProperty prop = _metaObject->property(index);
const QString propertyName = prop.name();
processor->processProperty(propertyName, propertyValue(prop));
// every property always has a onXyzChanged slot, even if the NOTIFY
// signal has a different name
QString signalName = propertyName;
signalName += QLatin1String("Changed");
if (!explicitSignals.contains(signalName)) {
QString slotName = QLatin1String("on");
slotName += signalName.at(0).toUpper();
slotName += signalName.midRef(1);
// process the generated slot
processor->processGeneratedSlot(slotName, engine()->undefinedValue());
}
}
if (_attachedType)
_attachedType->processMembers(processor);