summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/debugger/qmldebug.h2
-rw-r--r--src/declarative/extra/qmlfontloader.cpp2
-rw-r--r--src/declarative/fx/qfxgridview.cpp2
-rw-r--r--src/declarative/fx/qfxitem.cpp10
-rw-r--r--src/declarative/fx/qfxitem.h2
-rw-r--r--src/declarative/fx/qfxtextinput.h2
-rw-r--r--src/declarative/qml/qmlcomponentjs_p.h8
-rw-r--r--src/declarative/qml/qmlcontext.cpp2
-rw-r--r--src/declarative/qml/qmlvaluetype_p.h38
-rw-r--r--src/declarative/util/qmlpackage.cpp2
-rw-r--r--src/declarative/util/qmlpropertychanges.h2
-rw-r--r--src/declarative/util/qmlstateoperations.cpp2
12 files changed, 37 insertions, 37 deletions
diff --git a/src/declarative/debugger/qmldebug.h b/src/declarative/debugger/qmldebug.h
index 9fd5fae..681ee08 100644
--- a/src/declarative/debugger/qmldebug.h
+++ b/src/declarative/debugger/qmldebug.h
@@ -46,7 +46,7 @@ public:
QObject *parent = 0);
private:
- Q_DECLARE_PRIVATE(QmlEngineDebug);
+ Q_DECLARE_PRIVATE(QmlEngineDebug)
};
class Q_DECLARATIVE_EXPORT QmlDebugWatch : public QObject
diff --git a/src/declarative/extra/qmlfontloader.cpp b/src/declarative/extra/qmlfontloader.cpp
index 4497384..66c8567 100644
--- a/src/declarative/extra/qmlfontloader.cpp
+++ b/src/declarative/extra/qmlfontloader.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
class QmlFontLoaderPrivate : public QObjectPrivate
{
- Q_DECLARE_PUBLIC(QmlFontLoader);
+ Q_DECLARE_PUBLIC(QmlFontLoader)
public:
QmlFontLoaderPrivate() : reply(0), status(QmlFontLoader::Null) {}
diff --git a/src/declarative/fx/qfxgridview.cpp b/src/declarative/fx/qfxgridview.cpp
index 9aa1198..a8b27f4 100644
--- a/src/declarative/fx/qfxgridview.cpp
+++ b/src/declarative/fx/qfxgridview.cpp
@@ -145,7 +145,7 @@ public:
class QFxGridViewPrivate : public QFxFlickablePrivate
{
- Q_DECLARE_PUBLIC(QFxGridView);
+ Q_DECLARE_PUBLIC(QFxGridView)
public:
QFxGridViewPrivate()
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index 4d31aaa..d6534a1 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -408,12 +408,12 @@ public:
class QFxKeyNavigationAttached : public QObject, public QFxItemKeyFilter
{
Q_OBJECT
- Q_DECLARE_PRIVATE(QFxKeyNavigationAttached);
+ Q_DECLARE_PRIVATE(QFxKeyNavigationAttached)
- Q_PROPERTY(QFxItem *left READ left WRITE setLeft NOTIFY changed);
- Q_PROPERTY(QFxItem *right READ right WRITE setRight NOTIFY changed);
- Q_PROPERTY(QFxItem *up READ up WRITE setUp NOTIFY changed);
- Q_PROPERTY(QFxItem *down READ down WRITE setDown NOTIFY changed);
+ Q_PROPERTY(QFxItem *left READ left WRITE setLeft NOTIFY changed)
+ Q_PROPERTY(QFxItem *right READ right WRITE setRight NOTIFY changed)
+ Q_PROPERTY(QFxItem *up READ up WRITE setUp NOTIFY changed)
+ Q_PROPERTY(QFxItem *down READ down WRITE setDown NOTIFY changed)
public:
QFxKeyNavigationAttached(QObject * = 0);
diff --git a/src/declarative/fx/qfxitem.h b/src/declarative/fx/qfxitem.h
index 30c522f..bde0c9e 100644
--- a/src/declarative/fx/qfxitem.h
+++ b/src/declarative/fx/qfxitem.h
@@ -93,7 +93,7 @@ class Q_DECLARATIVE_EXPORT QFxItem : public QGraphicsObject, public QmlParserSta
Q_PROPERTY(QmlList<QGraphicsTransform *>* transform READ transform DESIGNABLE false FINAL)
Q_PROPERTY(TransformOrigin transformOrigin READ transformOrigin WRITE setTransformOrigin)
Q_PROPERTY(bool smooth READ smoothTransform WRITE setSmoothTransform)
- Q_PROPERTY(QGraphicsEffect *effect READ graphicsEffect WRITE setGraphicsEffect);
+ Q_PROPERTY(QGraphicsEffect *effect READ graphicsEffect WRITE setGraphicsEffect)
Q_ENUMS(TransformOrigin)
Q_CLASSINFO("DefaultProperty", "data")
diff --git a/src/declarative/fx/qfxtextinput.h b/src/declarative/fx/qfxtextinput.h
index b1e8b14..d5d0450 100644
--- a/src/declarative/fx/qfxtextinput.h
+++ b/src/declarative/fx/qfxtextinput.h
@@ -193,7 +193,7 @@ private Q_SLOTS:
void updateRect(const QRect &r = QRect());
private:
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxTextInput);
+ Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxTextInput)
};
QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlcomponentjs_p.h b/src/declarative/qml/qmlcomponentjs_p.h
index cee3035..0f56766 100644
--- a/src/declarative/qml/qmlcomponentjs_p.h
+++ b/src/declarative/qml/qmlcomponentjs_p.h
@@ -73,10 +73,10 @@ class Q_DECLARATIVE_EXPORT QmlComponentJS : public QmlComponent
public:
QmlComponentJS(QmlEngine *, const QUrl &url, QObject *parent = 0);
QmlComponentJS(QmlEngine *, QObject *parent=0);
- Q_PROPERTY(bool isNull READ isNull NOTIFY isNullChanged);
- Q_PROPERTY(bool isReady READ isReady NOTIFY isReadyChanged);
- Q_PROPERTY(bool isError READ isError NOTIFY isErrorChanged);
- Q_PROPERTY(bool isLoading READ isLoading NOTIFY isLoadingChanged);
+ Q_PROPERTY(bool isNull READ isNull NOTIFY isNullChanged)
+ Q_PROPERTY(bool isReady READ isReady NOTIFY isReadyChanged)
+ Q_PROPERTY(bool isError READ isError NOTIFY isErrorChanged)
+ Q_PROPERTY(bool isLoading READ isLoading NOTIFY isLoadingChanged)
Q_INVOKABLE QScriptValue createObject();
Q_INVOKABLE QString errorsString() const;
diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp
index 97ab375..0632ef7 100644
--- a/src/declarative/qml/qmlcontext.cpp
+++ b/src/declarative/qml/qmlcontext.cpp
@@ -168,7 +168,7 @@ void QmlContextPrivate::addDefaultObject(QObject *object, Priority priority)
\code
class MyDataSet : ... {
...
- Q_PROPERTY(QAbstractItemModel *myModel READ model NOTIFY modelChanged);
+ Q_PROPERTY(QAbstractItemModel *myModel READ model NOTIFY modelChanged)
...
};
diff --git a/src/declarative/qml/qmlvaluetype_p.h b/src/declarative/qml/qmlvaluetype_p.h
index a56feec..da5e972 100644
--- a/src/declarative/qml/qmlvaluetype_p.h
+++ b/src/declarative/qml/qmlvaluetype_p.h
@@ -85,8 +85,8 @@ public:
class QmlPointFValueType : public QmlValueType
{
- Q_PROPERTY(qreal x READ x WRITE setX);
- Q_PROPERTY(qreal y READ y WRITE setY);
+ Q_PROPERTY(qreal x READ x WRITE setX)
+ Q_PROPERTY(qreal y READ y WRITE setY)
Q_OBJECT
public:
QmlPointFValueType(QObject *parent = 0);
@@ -107,8 +107,8 @@ private:
class QmlPointValueType : public QmlValueType
{
- Q_PROPERTY(int x READ x WRITE setX);
- Q_PROPERTY(int y READ y WRITE setY);
+ Q_PROPERTY(int x READ x WRITE setX)
+ Q_PROPERTY(int y READ y WRITE setY)
Q_OBJECT
public:
QmlPointValueType(QObject *parent = 0);
@@ -129,8 +129,8 @@ private:
class QmlSizeFValueType : public QmlValueType
{
- Q_PROPERTY(qreal width READ width WRITE setWidth);
- Q_PROPERTY(qreal height READ height WRITE setHeight);
+ Q_PROPERTY(qreal width READ width WRITE setWidth)
+ Q_PROPERTY(qreal height READ height WRITE setHeight)
Q_OBJECT
public:
QmlSizeFValueType(QObject *parent = 0);
@@ -151,8 +151,8 @@ private:
class QmlSizeValueType : public QmlValueType
{
- Q_PROPERTY(int width READ width WRITE setWidth);
- Q_PROPERTY(int height READ height WRITE setHeight);
+ Q_PROPERTY(int width READ width WRITE setWidth)
+ Q_PROPERTY(int height READ height WRITE setHeight)
Q_OBJECT
public:
QmlSizeValueType(QObject *parent = 0);
@@ -173,10 +173,10 @@ private:
class QmlRectFValueType : public QmlValueType
{
- Q_PROPERTY(qreal x READ x WRITE setX);
- Q_PROPERTY(qreal y READ y WRITE setY);
- Q_PROPERTY(qreal width READ width WRITE setWidth);
- Q_PROPERTY(qreal height READ height WRITE setHeight);
+ Q_PROPERTY(qreal x READ x WRITE setX)
+ Q_PROPERTY(qreal y READ y WRITE setY)
+ Q_PROPERTY(qreal width READ width WRITE setWidth)
+ Q_PROPERTY(qreal height READ height WRITE setHeight)
Q_OBJECT
public:
QmlRectFValueType(QObject *parent = 0);
@@ -202,10 +202,10 @@ private:
class QmlRectValueType : public QmlValueType
{
- Q_PROPERTY(int x READ x WRITE setX);
- Q_PROPERTY(int y READ y WRITE setY);
- Q_PROPERTY(int width READ width WRITE setWidth);
- Q_PROPERTY(int height READ height WRITE setHeight);
+ Q_PROPERTY(int x READ x WRITE setX)
+ Q_PROPERTY(int y READ y WRITE setY)
+ Q_PROPERTY(int width READ width WRITE setWidth)
+ Q_PROPERTY(int height READ height WRITE setHeight)
Q_OBJECT
public:
QmlRectValueType(QObject *parent = 0);
@@ -231,9 +231,9 @@ private:
class QmlVector3DValueType : public QmlValueType
{
- Q_PROPERTY(qreal x READ x WRITE setX);
- Q_PROPERTY(qreal y READ y WRITE setY);
- Q_PROPERTY(qreal z READ z WRITE setZ);
+ Q_PROPERTY(qreal x READ x WRITE setX)
+ Q_PROPERTY(qreal y READ y WRITE setY)
+ Q_PROPERTY(qreal z READ z WRITE setZ)
Q_OBJECT
public:
QmlVector3DValueType(QObject *parent = 0);
diff --git a/src/declarative/util/qmlpackage.cpp b/src/declarative/util/qmlpackage.cpp
index 8483080..912bb6b 100644
--- a/src/declarative/util/qmlpackage.cpp
+++ b/src/declarative/util/qmlpackage.cpp
@@ -59,7 +59,7 @@ public:
QmlPackageAttached(QObject *parent);
virtual ~QmlPackageAttached();
- Q_PROPERTY(QString name READ name WRITE setName);
+ Q_PROPERTY(QString name READ name WRITE setName)
QString name() const;
void setName(const QString &n);
diff --git a/src/declarative/util/qmlpropertychanges.h b/src/declarative/util/qmlpropertychanges.h
index 8d338f1..2931cdb 100644
--- a/src/declarative/util/qmlpropertychanges.h
+++ b/src/declarative/util/qmlpropertychanges.h
@@ -58,7 +58,7 @@ class Q_DECLARATIVE_EXPORT QmlPropertyChanges : public QmlStateOperation
Q_PROPERTY(QObject *target READ object WRITE setObject)
Q_PROPERTY(bool restoreEntryValues READ restoreEntryValues WRITE setRestoreEntryValues)
- Q_PROPERTY(bool explicit READ isExplicit WRITE setIsExplicit);
+ Q_PROPERTY(bool explicit READ isExplicit WRITE setIsExplicit)
public:
QmlPropertyChanges();
~QmlPropertyChanges();
diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp
index 921aa6c..716cec4 100644
--- a/src/declarative/util/qmlstateoperations.cpp
+++ b/src/declarative/util/qmlstateoperations.cpp
@@ -189,7 +189,7 @@ QmlStateOperation::ActionList QmlParentChange::actions()
class AccessibleFxItem : public QFxItem
{
Q_OBJECT
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxItem);
+ Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxItem)
public:
int siblingIndex() {
Q_D(QFxItem);
generated by cgit v0.12 at 2024-11-16 20:02:38 (GMT)