summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2010-03-12 12:05:42 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2010-03-12 12:05:42 (GMT)
commita897301131c59233c872627907925efac8a27c7b (patch)
tree9fbf7d58116bd849a3d9f1f629bbdbc8f46c785d /src
parent6396e7a15079cb157caef319348a0bcd0b95a6a7 (diff)
downloadQt-a897301131c59233c872627907925efac8a27c7b.zip
Qt-a897301131c59233c872627907925efac8a27c7b.tar.gz
Qt-a897301131c59233c872627907925efac8a27c7b.tar.bz2
--warn;
Diffstat (limited to 'src')
-rw-r--r--src/declarative/qml/qdeclarativelist.h10
-rw-r--r--src/declarative/util/qdeclarativetimeline_p_p.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/declarative/qml/qdeclarativelist.h b/src/declarative/qml/qdeclarativelist.h
index 8d59384..ed402a8 100644
--- a/src/declarative/qml/qdeclarativelist.h
+++ b/src/declarative/qml/qdeclarativelist.h
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
class QObject;
-class QMetaObject;
+struct QMetaObject;
template<typename T>
struct QDeclarativeListProperty {
typedef void (*AppendFunction)(QDeclarativeListProperty<T> *, T*);
@@ -61,12 +61,12 @@ struct QDeclarativeListProperty {
typedef T *(*AtFunction)(QDeclarativeListProperty<T> *, int);
typedef void (*ClearFunction)(QDeclarativeListProperty<T> *);
- QDeclarativeListProperty()
+ QDeclarativeListProperty()
: object(0), data(0), append(0), count(0), at(0), clear(0), dummy1(0), dummy2(0) {}
QDeclarativeListProperty(QObject *o, QList<T *> &list)
: object(o), data(&list), append(qlist_append), count(qlist_count), at(qlist_at),
clear(qlist_clear), dummy1(0), dummy2(0) {}
- QDeclarativeListProperty(QObject *o, void *d, AppendFunction a, CountFunction c = 0, AtFunction t = 0,
+ QDeclarativeListProperty(QObject *o, void *d, AppendFunction a, CountFunction c = 0, AtFunction t = 0,
ClearFunction r = 0)
: object(o), data(d), append(a), count(c), at(t), clear(r), dummy1(0), dummy2(0) {}
@@ -81,7 +81,7 @@ struct QDeclarativeListProperty {
QObject *object;
void *data;
-
+
AppendFunction append;
CountFunction count;
@@ -94,7 +94,7 @@ struct QDeclarativeListProperty {
private:
static void qlist_append(QDeclarativeListProperty *p, T *v) {
- ((QList<T *> *)p->data)->append(v);
+ ((QList<T *> *)p->data)->append(v);
}
static int qlist_count(QDeclarativeListProperty *p) {
return ((QList<T *> *)p->data)->count();
diff --git a/src/declarative/util/qdeclarativetimeline_p_p.h b/src/declarative/util/qdeclarativetimeline_p_p.h
index c08c07c..598c897 100644
--- a/src/declarative/util/qdeclarativetimeline_p_p.h
+++ b/src/declarative/util/qdeclarativetimeline_p_p.h
@@ -160,7 +160,7 @@ public:
QDeclarativeTimeLineObject *callbackObject() const;
private:
- friend class QDeclarativeTimeLinePrivate;
+ friend struct QDeclarativeTimeLinePrivate;
Callback d0;
void *d1;
QDeclarativeTimeLineObject *d2;