summaryrefslogtreecommitdiffstats
path: root/tools/qml
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 /tools/qml
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 'tools/qml')
-rw-r--r--tools/qml/qdeclarativefolderlistmodel.cpp4
-rw-r--r--tools/qml/qdeclarativefolderlistmodel.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/tools/qml/qdeclarativefolderlistmodel.cpp b/tools/qml/qdeclarativefolderlistmodel.cpp
index 2ac71ad..7ac25d6 100644
--- a/tools/qml/qdeclarativefolderlistmodel.cpp
+++ b/tools/qml/qdeclarativefolderlistmodel.cpp
@@ -256,6 +256,10 @@ void QDeclarativeFolderListModel::setNameFilters(const QStringList &filters)
d->model.setNameFilters(d->nameFilters);
}
+void QDeclarativeFolderListModel::classBegin()
+{
+}
+
void QDeclarativeFolderListModel::componentComplete()
{
if (!d->folder.isValid() || !QDir().exists(d->folder.toLocalFile()))
diff --git a/tools/qml/qdeclarativefolderlistmodel.h b/tools/qml/qdeclarativefolderlistmodel.h
index 57b7fe5..1ecc784 100644
--- a/tools/qml/qdeclarativefolderlistmodel.h
+++ b/tools/qml/qdeclarativefolderlistmodel.h
@@ -87,6 +87,7 @@ public:
QStringList nameFilters() const;
void setNameFilters(const QStringList &filters);
+ virtual void classBegin();
virtual void componentComplete();
Q_INVOKABLE bool isFolder(int index) const;