summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/declarative/canvas/qsimplecanvasitem.h4
-rw-r--r--src/declarative/canvas/qsimplecanvasitem_p.h10
-rw-r--r--src/declarative/debugger/qmldebuggerstatus.h2
-rw-r--r--src/declarative/extra/qfxintegermodel.h4
-rw-r--r--src/declarative/extra/qmlsqlquery.h2
-rw-r--r--src/declarative/fx/qfxanchors.h2
-rw-r--r--src/declarative/fx/qfxcontentwrapper_p.h2
-rw-r--r--src/declarative/fx/qfxpath.h2
-rw-r--r--src/declarative/opengl/glsave.h4
-rw-r--r--src/declarative/opengl/gltexture.h2
-rw-r--r--src/declarative/qml/qmlbindablevalue_p.h2
-rw-r--r--src/declarative/qml/qmlcomponent.h2
-rw-r--r--src/declarative/qml/qmlcustomparser_p.h4
-rw-r--r--src/declarative/qml/qmlparser_p.h2
-rw-r--r--src/declarative/qml/qmlparserstatus.h2
-rw-r--r--src/declarative/util/qmlanimation.h6
-rw-r--r--src/declarative/util/qmlanimation_p.h18
-rw-r--r--src/declarative/util/qmllistmodel.cpp6
-rw-r--r--src/declarative/util/qmlstate_p.h2
-rw-r--r--src/declarative/util/qmlstateoperations.h2
20 files changed, 40 insertions, 40 deletions
diff --git a/src/declarative/canvas/qsimplecanvasitem.h b/src/declarative/canvas/qsimplecanvasitem.h
index e8f1ee8..b928319 100644
--- a/src/declarative/canvas/qsimplecanvasitem.h
+++ b/src/declarative/canvas/qsimplecanvasitem.h
@@ -91,7 +91,7 @@ public:
IsFocusPanel = 0x00000040,
IsFocusRealm = 0x00000080,
AcceptsInputMethods = 0x00000100};
- Q_DECLARE_FLAGS(Options, Option);
+ Q_DECLARE_FLAGS(Options, Option)
QSimpleCanvasItem(QSimpleCanvasItem *parent=0);
virtual ~QSimpleCanvasItem();
@@ -276,7 +276,7 @@ public:
QSimpleCanvasItem(QSimpleCanvasItemPrivate &dd, QSimpleCanvasItem *parent);
};
-Q_DECLARE_OPERATORS_FOR_FLAGS(QSimpleCanvasItem::Options);
+Q_DECLARE_OPERATORS_FOR_FLAGS(QSimpleCanvasItem::Options)
class QSimpleCanvasLayer : public QSimpleCanvasItem
{
diff --git a/src/declarative/canvas/qsimplecanvasitem_p.h b/src/declarative/canvas/qsimplecanvasitem_p.h
index f0b44e0..e2deab2 100644
--- a/src/declarative/canvas/qsimplecanvasitem_p.h
+++ b/src/declarative/canvas/qsimplecanvasitem_p.h
@@ -133,7 +133,7 @@ class QSimpleCanvasFilter;
class QGraphicsQSimpleCanvasItem;
class QSimpleCanvasItemPrivate : public QObjectPrivate
{
- Q_DECLARE_PUBLIC(QSimpleCanvasItem);
+ Q_DECLARE_PUBLIC(QSimpleCanvasItem)
public:
QSimpleCanvasItemPrivate()
: parent(0), canvas(0), debuggerStatus(0), filter(0),
@@ -250,16 +250,16 @@ public:
InRealm = 0x02,
InActiveFocusedRealm = 0x04
};
- Q_DECLARE_FLAGS(FocusStateCheckDatas, FocusStateCheckData);
+ Q_DECLARE_FLAGS(FocusStateCheckDatas, FocusStateCheckData)
enum FocusStateCheckRData { NoCheckRData = 0x00,
SeenFocus = 0x01,
SeenActiveFocus = 0x02 };
- Q_DECLARE_FLAGS(FocusStateCheckRDatas, FocusStateCheckRData);
+ Q_DECLARE_FLAGS(FocusStateCheckRDatas, FocusStateCheckRData)
bool checkFocusState(FocusStateCheckDatas, FocusStateCheckRDatas *);
};
-Q_DECLARE_OPERATORS_FOR_FLAGS(QSimpleCanvasItemPrivate::FocusStateCheckDatas);
-Q_DECLARE_OPERATORS_FOR_FLAGS(QSimpleCanvasItemPrivate::FocusStateCheckRDatas);
+Q_DECLARE_OPERATORS_FOR_FLAGS(QSimpleCanvasItemPrivate::FocusStateCheckDatas)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QSimpleCanvasItemPrivate::FocusStateCheckRDatas)
#endif // QSIMPLECANVASITEM_P_H
diff --git a/src/declarative/debugger/qmldebuggerstatus.h b/src/declarative/debugger/qmldebuggerstatus.h
index 8c6355d..62336de 100644
--- a/src/declarative/debugger/qmldebuggerstatus.h
+++ b/src/declarative/debugger/qmldebuggerstatus.h
@@ -57,7 +57,7 @@ public:
virtual void setSelectedState(bool);
};
-Q_DECLARE_INTERFACE(QmlDebuggerStatus, "com.trolltech.qml.QmlDebuggerStatus");
+Q_DECLARE_INTERFACE(QmlDebuggerStatus, "com.trolltech.qml.QmlDebuggerStatus")
QT_END_NAMESPACE
diff --git a/src/declarative/extra/qfxintegermodel.h b/src/declarative/extra/qfxintegermodel.h
index a715949..43504d8 100644
--- a/src/declarative/extra/qfxintegermodel.h
+++ b/src/declarative/extra/qfxintegermodel.h
@@ -60,11 +60,11 @@ public:
QFxIntegerModel(QObject *parent=0);
~QFxIntegerModel();
- Q_PROPERTY(int minimum READ minimum WRITE setMinimum);
+ Q_PROPERTY(int minimum READ minimum WRITE setMinimum)
int minimum() const;
void setMinimum(int);
- Q_PROPERTY(int maximum READ maximum WRITE setMaximum);
+ Q_PROPERTY(int maximum READ maximum WRITE setMaximum)
int maximum() const;
void setMaximum(int);
diff --git a/src/declarative/extra/qmlsqlquery.h b/src/declarative/extra/qmlsqlquery.h
index 5f750ee..dca3596 100644
--- a/src/declarative/extra/qmlsqlquery.h
+++ b/src/declarative/extra/qmlsqlquery.h
@@ -60,7 +60,7 @@ class Q_DECLARATIVE_EXPORT QmlSqlBind : public QObject, public QmlParserStatus
Q_PROPERTY(QString name READ name WRITE setName)
Q_PROPERTY(QVariant value READ value WRITE setValue)
- Q_CLASSINFO("DefaultValue", "value");
+ Q_CLASSINFO("DefaultValue", "value")
public:
QmlSqlBind(QObject *parent = 0);
diff --git a/src/declarative/fx/qfxanchors.h b/src/declarative/fx/qfxanchors.h
index b3f2d3f..0e44223 100644
--- a/src/declarative/fx/qfxanchors.h
+++ b/src/declarative/fx/qfxanchors.h
@@ -116,7 +116,7 @@ public:
Horizontal_Mask = HasLeftAnchor | HasRightAnchor | HasHCenterAnchor,
Vertical_Mask = HasTopAnchor | HasBottomAnchor | HasVCenterAnchor | HasBaselineAnchor
};
- Q_DECLARE_FLAGS(UsedAnchors, UsedAnchor);
+ Q_DECLARE_FLAGS(UsedAnchors, UsedAnchor)
QFxAnchorLine left() const;
void setLeft(const QFxAnchorLine &edge);
diff --git a/src/declarative/fx/qfxcontentwrapper_p.h b/src/declarative/fx/qfxcontentwrapper_p.h
index 4f42e00..a75fa1e 100644
--- a/src/declarative/fx/qfxcontentwrapper_p.h
+++ b/src/declarative/fx/qfxcontentwrapper_p.h
@@ -60,7 +60,7 @@
QT_BEGIN_NAMESPACE
class QFxContentWrapperPrivate : public QFxItemPrivate
{
- Q_DECLARE_PUBLIC(QFxContentWrapper);
+ Q_DECLARE_PUBLIC(QFxContentWrapper)
public:
QFxContentWrapperPrivate() { }
diff --git a/src/declarative/fx/qfxpath.h b/src/declarative/fx/qfxpath.h
index 5c17fcb..39b9d01 100644
--- a/src/declarative/fx/qfxpath.h
+++ b/src/declarative/fx/qfxpath.h
@@ -194,7 +194,7 @@ class Q_DECLARATIVE_EXPORT QFxPath : public QObject, public QmlParserStatus
{
Q_OBJECT
- Q_INTERFACES(QmlParserStatus);
+ Q_INTERFACES(QmlParserStatus)
Q_PROPERTY(QList<QFxPathElement *>* pathElements READ pathElements)
Q_PROPERTY(qreal startX READ startX WRITE setStartX)
Q_PROPERTY(qreal startY READ startY WRITE setStartY)
diff --git a/src/declarative/opengl/glsave.h b/src/declarative/opengl/glsave.h
index 8256162..ad6c0ec 100644
--- a/src/declarative/opengl/glsave.h
+++ b/src/declarative/opengl/glsave.h
@@ -67,7 +67,7 @@ public:
}
private:
- Q_DISABLE_COPY(GLSaveViewport);
+ Q_DISABLE_COPY(GLSaveViewport)
GLint viewport[4];
};
@@ -100,7 +100,7 @@ public:
}
private:
- Q_DISABLE_COPY(GLSaveScissor);
+ Q_DISABLE_COPY(GLSaveScissor)
GLint box[4];
GLboolean enabled;
};
diff --git a/src/declarative/opengl/gltexture.h b/src/declarative/opengl/gltexture.h
index 8704498..787c9a5 100644
--- a/src/declarative/opengl/gltexture.h
+++ b/src/declarative/opengl/gltexture.h
@@ -105,7 +105,7 @@ public:
GLuint texture() const;
private:
- Q_DISABLE_COPY(GLTexture);
+ Q_DISABLE_COPY(GLTexture)
GLTexturePrivate *d;
};
diff --git a/src/declarative/qml/qmlbindablevalue_p.h b/src/declarative/qml/qmlbindablevalue_p.h
index 9973bdc..9476b80 100644
--- a/src/declarative/qml/qmlbindablevalue_p.h
+++ b/src/declarative/qml/qmlbindablevalue_p.h
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
class QmlBindableValuePrivate : public QObjectPrivate
{
- Q_DECLARE_PUBLIC(QmlBindableValue);
+ Q_DECLARE_PUBLIC(QmlBindableValue)
public:
QmlBindableValuePrivate();
diff --git a/src/declarative/qml/qmlcomponent.h b/src/declarative/qml/qmlcomponent.h
index 3369de3..e7386d9 100644
--- a/src/declarative/qml/qmlcomponent.h
+++ b/src/declarative/qml/qmlcomponent.h
@@ -60,7 +60,7 @@ class QmlEngine;
class Q_DECLARATIVE_EXPORT QmlComponent : public QObject
{
Q_OBJECT
- Q_DECLARE_PRIVATE(QmlComponent);
+ Q_DECLARE_PRIVATE(QmlComponent)
public:
QmlComponent(QObject *parent = 0);
diff --git a/src/declarative/qml/qmlcustomparser_p.h b/src/declarative/qml/qmlcustomparser_p.h
index fd780d6..75da579 100644
--- a/src/declarative/qml/qmlcustomparser_p.h
+++ b/src/declarative/qml/qmlcustomparser_p.h
@@ -74,7 +74,7 @@ private:
friend class QmlCustomParserPropertyPrivate;
QmlCustomParserPropertyPrivate *d;
};
-Q_DECLARE_METATYPE(QmlCustomParserProperty);
+Q_DECLARE_METATYPE(QmlCustomParserProperty)
class QmlCustomParserNodePrivate;
class Q_DECLARATIVE_EXPORT QmlCustomParserNode
@@ -93,7 +93,7 @@ private:
friend class QmlCustomParserNodePrivate;
QmlCustomParserNodePrivate *d;
};
-Q_DECLARE_METATYPE(QmlCustomParserNode);
+Q_DECLARE_METATYPE(QmlCustomParserNode)
class Q_DECLARATIVE_EXPORT QmlCustomParser
{
diff --git a/src/declarative/qml/qmlparser_p.h b/src/declarative/qml/qmlparser_p.h
index add5773..721f1a8 100644
--- a/src/declarative/qml/qmlparser_p.h
+++ b/src/declarative/qml/qmlparser_p.h
@@ -272,7 +272,7 @@ namespace QmlParser
void dump(int = 0) const;
};
}
-Q_DECLARE_METATYPE(QmlParser::Variant);
+Q_DECLARE_METATYPE(QmlParser::Variant)
QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlparserstatus.h b/src/declarative/qml/qmlparserstatus.h
index 0e58229..7c2e141 100644
--- a/src/declarative/qml/qmlparserstatus.h
+++ b/src/declarative/qml/qmlparserstatus.h
@@ -66,7 +66,7 @@ private:
friend class QmlEnginePrivate;
QmlParserStatus **d;
};
-Q_DECLARE_INTERFACE(QmlParserStatus, "com.trolltech.qml.QmlParserStatus");
+Q_DECLARE_INTERFACE(QmlParserStatus, "com.trolltech.qml.QmlParserStatus")
QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlanimation.h b/src/declarative/util/qmlanimation.h
index e0ff167..8b9ecc2 100644
--- a/src/declarative/util/qmlanimation.h
+++ b/src/declarative/util/qmlanimation.h
@@ -266,7 +266,7 @@ class QmlParentChangeActionPrivate;
class QmlParentChangeAction : public QmlAbstractAnimation
{
Q_OBJECT
- Q_DECLARE_PRIVATE(QmlParentChangeAction);
+ Q_DECLARE_PRIVATE(QmlParentChangeAction)
//XXX should have parent property as well for when it isn't part of a transition
@@ -361,7 +361,7 @@ public:
class QmlSequentialAnimation : public QmlAnimationGroup
{
Q_OBJECT
- Q_DECLARE_PRIVATE(QmlAnimationGroup);
+ Q_DECLARE_PRIVATE(QmlAnimationGroup)
public:
QmlSequentialAnimation(QObject *parent=0);
@@ -379,7 +379,7 @@ QML_DECLARE_TYPE(QmlSequentialAnimation)
class QmlParallelAnimation : public QmlAnimationGroup
{
Q_OBJECT
- Q_DECLARE_PRIVATE(QmlAnimationGroup);
+ Q_DECLARE_PRIVATE(QmlAnimationGroup)
public:
QmlParallelAnimation(QObject *parent=0);
diff --git a/src/declarative/util/qmlanimation_p.h b/src/declarative/util/qmlanimation_p.h
index 36b826f..e5a7384 100644
--- a/src/declarative/util/qmlanimation_p.h
+++ b/src/declarative/util/qmlanimation_p.h
@@ -169,7 +169,7 @@ private:
class QmlAbstractAnimationPrivate : public QObjectPrivate
{
- Q_DECLARE_PUBLIC(QmlAbstractAnimation);
+ Q_DECLARE_PUBLIC(QmlAbstractAnimation)
public:
QmlAbstractAnimationPrivate()
: running(false), finishPlaying(false), repeat(false),
@@ -196,7 +196,7 @@ public:
class QmlPauseAnimationPrivate : public QmlAbstractAnimationPrivate
{
- Q_DECLARE_PUBLIC(QmlPauseAnimation);
+ Q_DECLARE_PUBLIC(QmlPauseAnimation)
public:
QmlPauseAnimationPrivate()
: QmlAbstractAnimationPrivate(), pa(0) {}
@@ -208,7 +208,7 @@ public:
class QmlColorAnimationPrivate : public QmlAbstractAnimationPrivate
{
- Q_DECLARE_PUBLIC(QmlColorAnimation);
+ Q_DECLARE_PUBLIC(QmlColorAnimation)
public:
QmlColorAnimationPrivate()
: QmlAbstractAnimationPrivate(), fromSourced(false), fromIsDefined(false), toIsDefined(false),
@@ -242,7 +242,7 @@ public:
class QmlRunScriptActionPrivate : public QmlAbstractAnimationPrivate
{
- Q_DECLARE_PUBLIC(QmlRunScriptAction);
+ Q_DECLARE_PUBLIC(QmlRunScriptAction)
public:
QmlRunScriptActionPrivate()
: QmlAbstractAnimationPrivate(), proxy(this), rsa(0) {}
@@ -261,7 +261,7 @@ public:
class QmlSetPropertyActionPrivate : public QmlAbstractAnimationPrivate
{
- Q_DECLARE_PUBLIC(QmlSetPropertyAction);
+ Q_DECLARE_PUBLIC(QmlSetPropertyAction)
public:
QmlSetPropertyActionPrivate()
: QmlAbstractAnimationPrivate(), proxy(this), spa(0) {}
@@ -283,7 +283,7 @@ public:
class QmlParentChangeActionPrivate : public QmlAbstractAnimationPrivate
{
- Q_DECLARE_PUBLIC(QmlParentChangeAction);
+ Q_DECLARE_PUBLIC(QmlParentChangeAction)
public:
QmlParentChangeActionPrivate()
: QmlAbstractAnimationPrivate() {}
@@ -296,7 +296,7 @@ public:
class QmlNumericAnimationPrivate : public QmlAbstractAnimationPrivate
{
- Q_DECLARE_PUBLIC(QmlNumericAnimation);
+ Q_DECLARE_PUBLIC(QmlNumericAnimation)
public:
QmlNumericAnimationPrivate()
: QmlAbstractAnimationPrivate(), fromSourced(false), na(0), value(this, &QmlNumericAnimationPrivate::valueChanged) {}
@@ -322,7 +322,7 @@ public:
class QmlAnimationGroupPrivate : public QmlAbstractAnimationPrivate
{
- Q_DECLARE_PUBLIC(QmlAnimationGroup);
+ Q_DECLARE_PUBLIC(QmlAnimationGroup)
public:
QmlAnimationGroupPrivate()
: QmlAbstractAnimationPrivate(), animations(this), ag(0) {}
@@ -361,7 +361,7 @@ public:
class QmlVariantAnimationPrivate : public QmlAbstractAnimationPrivate
{
- Q_DECLARE_PUBLIC(QmlVariantAnimation);
+ Q_DECLARE_PUBLIC(QmlVariantAnimation)
public:
QmlVariantAnimationPrivate()
: QmlAbstractAnimationPrivate(), fromSourced(false), fromIsDefined(false), toIsDefined(false),
diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp
index 5dc3fda..cc85661 100644
--- a/src/declarative/util/qmllistmodel.cpp
+++ b/src/declarative/util/qmllistmodel.cpp
@@ -67,7 +67,7 @@ struct ListModelData
ListInstruction *instructions() const { return (ListInstruction *)((char *)this + sizeof(ListModelData)); }
};
-Q_DECLARE_METATYPE(QListModelInterface *);
+Q_DECLARE_METATYPE(QListModelInterface *)
/*!
\qmlclass ListModel
@@ -178,7 +178,7 @@ public:
virtual QList<int> roles() const;
virtual QString toString(int role) const;
- Q_PROPERTY(int count READ count);
+ Q_PROPERTY(int count READ count)
virtual int count() const;
virtual QHash<int,QVariant> data(int index, const QList<int> &roles = (QList<int>())) const;
@@ -243,7 +243,7 @@ struct ModelNode
ListModel *modelCache;
ModelObject *objectCache;
};
-Q_DECLARE_METATYPE(ModelNode *);
+Q_DECLARE_METATYPE(ModelNode *)
ModelObject::ModelObject(ModelNode *node)
: _node(node), _haveProperties(false), _mo(new QmlOpenMetaObject(this))
diff --git a/src/declarative/util/qmlstate_p.h b/src/declarative/util/qmlstate_p.h
index a2f18eb..da8fdcd 100644
--- a/src/declarative/util/qmlstate_p.h
+++ b/src/declarative/util/qmlstate_p.h
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
class QmlStatePrivate : public QObjectPrivate
{
- Q_DECLARE_PUBLIC(QmlState);
+ Q_DECLARE_PUBLIC(QmlState)
public:
QmlStatePrivate()
diff --git a/src/declarative/util/qmlstateoperations.h b/src/declarative/util/qmlstateoperations.h
index 72296e4..c7a6d42 100644
--- a/src/declarative/util/qmlstateoperations.h
+++ b/src/declarative/util/qmlstateoperations.h
@@ -54,7 +54,7 @@ class QmlParentChangePrivate;
class Q_DECLARATIVE_EXPORT QmlParentChange : public QmlStateOperation
{
Q_OBJECT
- Q_DECLARE_PRIVATE(QmlParentChange);
+ Q_DECLARE_PRIVATE(QmlParentChange)
Q_PROPERTY(QObject *target READ object WRITE setObject)
Q_PROPERTY(QObject *parent READ parent WRITE setParent)
generated by cgit v0.12 at 2024-10-24 05:23:54 (GMT)