summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2010-04-30 05:32:43 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2010-04-30 05:32:43 (GMT)
commit85db980578cb9f1b95be160a4386d9822c6ec6d0 (patch)
tree94db73d854dd559a355207f21aa49c903bcce28a /src/declarative/util
parent77cddec6ea642b073d1d9c017c865e740c0c60bc (diff)
downloadQt-85db980578cb9f1b95be160a4386d9822c6ec6d0.zip
Qt-85db980578cb9f1b95be160a4386d9822c6ec6d0.tar.gz
Qt-85db980578cb9f1b95be160a4386d9822c6ec6d0.tar.bz2
Make QDeclarativeParserStatus method pure virtual to encourage right code.
Fix all code to be right, except multimedia. Currently, it's not *required* that types work without componentComplete, so not vital.
Diffstat (limited to 'src/declarative/util')
-rw-r--r--src/declarative/util/qdeclarativebind.cpp8
-rw-r--r--src/declarative/util/qdeclarativebind_p.h1
-rw-r--r--src/declarative/util/qdeclarativeconnections.cpp8
-rw-r--r--src/declarative/util/qdeclarativeconnections_p.h1
4 files changed, 16 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativebind.cpp b/src/declarative/util/qdeclarativebind.cpp
index 5516628..1f528e8 100644
--- a/src/declarative/util/qdeclarativebind.cpp
+++ b/src/declarative/util/qdeclarativebind.cpp
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
class QDeclarativeBindPrivate : public QObjectPrivate
{
public:
- QDeclarativeBindPrivate() : when(true), componentComplete(false), obj(0) {}
+ QDeclarativeBindPrivate() : when(true), componentComplete(true), obj(0) {}
bool when : 1;
bool componentComplete : 1;
@@ -198,6 +198,12 @@ void QDeclarativeBind::setValue(const QVariant &v)
eval();
}
+void QDeclarativeBind::classBegin()
+{
+ Q_D(QDeclarativeBind);
+ d->componentComplete = false;
+}
+
void QDeclarativeBind::componentComplete()
{
Q_D(QDeclarativeBind);
diff --git a/src/declarative/util/qdeclarativebind_p.h b/src/declarative/util/qdeclarativebind_p.h
index f756e80..f89c2eb 100644
--- a/src/declarative/util/qdeclarativebind_p.h
+++ b/src/declarative/util/qdeclarativebind_p.h
@@ -80,6 +80,7 @@ public:
void setValue(const QVariant &);
protected:
+ virtual void classBegin();
virtual void componentComplete();
private:
diff --git a/src/declarative/util/qdeclarativeconnections.cpp b/src/declarative/util/qdeclarativeconnections.cpp
index 5dd825e..ffa160f 100644
--- a/src/declarative/util/qdeclarativeconnections.cpp
+++ b/src/declarative/util/qdeclarativeconnections.cpp
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
class QDeclarativeConnectionsPrivate : public QObjectPrivate
{
public:
- QDeclarativeConnectionsPrivate() : target(0), targetSet(false), ignoreUnknownSignals(false), componentcomplete(false) {}
+ QDeclarativeConnectionsPrivate() : target(0), targetSet(false), ignoreUnknownSignals(false), componentcomplete(true) {}
QList<QDeclarativeBoundSignal*> boundsignals;
QObject *target;
@@ -271,6 +271,12 @@ void QDeclarativeConnections::connectSignals()
}
}
+void QDeclarativeConnections::classBegin()
+{
+ Q_D(QDeclarativeConnections);
+ d->componentcomplete=false;
+}
+
void QDeclarativeConnections::componentComplete()
{
Q_D(QDeclarativeConnections);
diff --git a/src/declarative/util/qdeclarativeconnections_p.h b/src/declarative/util/qdeclarativeconnections_p.h
index b51899e..a914166 100644
--- a/src/declarative/util/qdeclarativeconnections_p.h
+++ b/src/declarative/util/qdeclarativeconnections_p.h
@@ -82,6 +82,7 @@ Q_SIGNALS:
private:
void connectSignals();
+ void classBegin();
void componentComplete();
};