summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativedata_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-18 19:17:28 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-18 19:17:28 (GMT)
commitfacde29cfb1800d5cdb937420b429a2d1c9d2199 (patch)
tree8f0b2ba2161f544fcd401e2f6bef47fc78e69081 /src/declarative/qml/qdeclarativedata_p.h
parent13fa1c4c875c8fa6934ebef063b27b5559a55cac (diff)
parent2fe5ef7f13a2d7f586549938c348739bde40646d (diff)
downloadQt-facde29cfb1800d5cdb937420b429a2d1c9d2199.zip
Qt-facde29cfb1800d5cdb937420b429a2d1c9d2199.tar.gz
Qt-facde29cfb1800d5cdb937420b429a2d1c9d2199.tar.bz2
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (47 commits) tst_qdeclarativetext: Regenerate the baselines after the merge. Giving Qt a default app server when Avkon is removed TextInput autoscroll now scrolls when the cursor moves Fix samegame tutorial js Make minehunt less cheerful Add new behavior example. Fix autotest on windows Added --remove-destination to qmake_emulator_deployment.flm Fix worker ListModels to property emit countChanged() Update color type docs to mention transparency Update reference bitmaps used in bitmap comparison tests to follow changes in Text painting Fix alignment bugs in Text element Remove debug code added by 650a0078e2cef43eff107fe8d2505f64a0bfedf0 Compile on WinCE Remove obsolete tweak in QFontEngineS60::alphaMapForGlyph Optimize QFontEngineS60::recalcAdvances() Delete qtdemoapps.iby. Added bearer plugin deployment to qt.iby Implement QFontEngineS60::emSquareSize() Remove unnecessary calls to GetHorizBounds() + boundingBox() ...
Diffstat (limited to 'src/declarative/qml/qdeclarativedata_p.h')
-rw-r--r--src/declarative/qml/qdeclarativedata_p.h20
1 files changed, 17 insertions, 3 deletions
diff --git a/src/declarative/qml/qdeclarativedata_p.h b/src/declarative/qml/qdeclarativedata_p.h
index e916273..def4188 100644
--- a/src/declarative/qml/qdeclarativedata_p.h
+++ b/src/declarative/qml/qdeclarativedata_p.h
@@ -64,6 +64,7 @@ class QDeclarativeAbstractBinding;
class QDeclarativeContext;
class QDeclarativePropertyCache;
class QDeclarativeContextData;
+class QDeclarativeNotifier;
// This class is structured in such a way, that simply zero'ing it is the
// default state for elemental object allocations. This is crucial in the
// workings of the QDeclarativeInstruction::CreateSimpleObject instruction.
@@ -75,20 +76,23 @@ public:
: ownMemory(true), ownContext(false), indestructible(true), explicitIndestructibleSet(false),
context(0), outerContext(0), bindings(0), nextContextObject(0), prevContextObject(0), bindingBitsSize(0),
bindingBits(0), lineNumber(0), columnNumber(0), deferredComponent(0), deferredIdx(0),
- attachedProperties(0), scriptValue(0), objectDataRefCount(0), propertyCache(0), guards(0) {
+ scriptValue(0), objectDataRefCount(0), propertyCache(0), guards(0), extendedData(0) {
init();
}
static inline void init() {
QAbstractDeclarativeData::destroyed = destroyed;
QAbstractDeclarativeData::parentChanged = parentChanged;
+ QAbstractDeclarativeData::objectNameChanged = objectNameChanged;
}
static void destroyed(QAbstractDeclarativeData *, QObject *);
static void parentChanged(QAbstractDeclarativeData *, QObject *, QObject *);
+ static void objectNameChanged(QAbstractDeclarativeData *, QObject *);
void destroyed(QObject *);
void parentChanged(QObject *, QObject *);
+ void objectNameChanged(QObject *);
void setImplicitDestructible() {
if (!explicitIndestructibleSet) indestructible = false;
@@ -123,8 +127,6 @@ public:
QDeclarativeCompiledData *deferredComponent; // Can't this be found from the context?
unsigned int deferredIdx;
- QHash<int, QObject *> *attachedProperties;
-
// ### Can we make this QScriptValuePrivate so we incur no additional allocation
// cost?
QScriptValue *scriptValue;
@@ -147,6 +149,18 @@ public:
return 0;
}
}
+
+ QDeclarativeNotifier *objectNameNotifier() const;
+ QHash<int, QObject *> *attachedProperties() const;
+
+ struct ExtendedData {
+ ExtendedData();
+ ~ExtendedData();
+
+ QHash<int, QObject *> attachedProperties;
+ void *objectNameNotifier;
+ };
+ mutable ExtendedData *extendedData;
};
template<class T>