summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/declarative/extra/qfxintegermodel.cpp2
-rw-r--r--src/declarative/extra/qmlsqlconnection.cpp2
-rw-r--r--src/declarative/extra/qmlsqlquery.cpp4
-rw-r--r--src/declarative/extra/qmlxmllistmodel.cpp4
-rw-r--r--src/declarative/extra/qnumberformat.cpp2
-rw-r--r--src/declarative/fx/qfxscalegrid.cpp2
-rw-r--r--src/declarative/qml/qmlengine.cpp6
-rw-r--r--src/declarative/qml/qmlprivate.h2
-rw-r--r--src/declarative/qml/qmlpropertyvaluesource.cpp2
-rw-r--r--src/declarative/util/qmlbind.h8
-rw-r--r--src/declarative/widgets/graphicslayouts.cpp4
-rw-r--r--src/declarative/widgets/graphicswidgets.cpp8
12 files changed, 23 insertions, 23 deletions
diff --git a/src/declarative/extra/qfxintegermodel.cpp b/src/declarative/extra/qfxintegermodel.cpp
index 3c4d0d9..2a85ee1 100644
--- a/src/declarative/extra/qfxintegermodel.cpp
+++ b/src/declarative/extra/qfxintegermodel.cpp
@@ -43,7 +43,7 @@
QT_BEGIN_NAMESPACE
-QML_DEFINE_TYPE(QFxIntegerModel, IntegerModel);
+QML_DEFINE_TYPE(QFxIntegerModel, IntegerModel)
class QFxIntegerModelPrivate
{
diff --git a/src/declarative/extra/qmlsqlconnection.cpp b/src/declarative/extra/qmlsqlconnection.cpp
index 25ab033..b65fe35 100644
--- a/src/declarative/extra/qmlsqlconnection.cpp
+++ b/src/declarative/extra/qmlsqlconnection.cpp
@@ -51,7 +51,7 @@
QT_BEGIN_NAMESPACE
-QML_DEFINE_TYPE(QmlSqlConnection, SqlConnection);
+QML_DEFINE_TYPE(QmlSqlConnection, SqlConnection)
class QmlSqlConnectionPrivate: public QObjectPrivate
{
diff --git a/src/declarative/extra/qmlsqlquery.cpp b/src/declarative/extra/qmlsqlquery.cpp
index 5bd1459..0e2e91b 100644
--- a/src/declarative/extra/qmlsqlquery.cpp
+++ b/src/declarative/extra/qmlsqlquery.cpp
@@ -52,8 +52,8 @@
#include <QSqlDriver>
QT_BEGIN_NAMESPACE
-QML_DEFINE_TYPE(QmlSqlBind, SqlBind);
-QML_DEFINE_TYPE(QmlSqlQuery, SqlQuery);
+QML_DEFINE_TYPE(QmlSqlBind, SqlBind)
+QML_DEFINE_TYPE(QmlSqlQuery, SqlQuery)
class QmlSqlBindPrivate : public QObjectPrivate
{
diff --git a/src/declarative/extra/qmlxmllistmodel.cpp b/src/declarative/extra/qmlxmllistmodel.cpp
index 9259c83..a7f5d72 100644
--- a/src/declarative/extra/qmlxmllistmodel.cpp
+++ b/src/declarative/extra/qmlxmllistmodel.cpp
@@ -58,8 +58,8 @@
QT_BEGIN_NAMESPACE
-QML_DEFINE_TYPE(XmlListModelRole, Role);
-QML_DEFINE_TYPE(QmlXmlListModel, XmlListModel);
+QML_DEFINE_TYPE(XmlListModelRole, Role)
+QML_DEFINE_TYPE(QmlXmlListModel, XmlListModel)
class QmlXmlListModelPrivate;
diff --git a/src/declarative/extra/qnumberformat.cpp b/src/declarative/extra/qnumberformat.cpp
index 79e328a..424c125 100644
--- a/src/declarative/extra/qnumberformat.cpp
+++ b/src/declarative/extra/qnumberformat.cpp
@@ -43,7 +43,7 @@
QT_BEGIN_NAMESPACE
-QML_DEFINE_TYPE(QNumberFormat,NumberFormat);
+QML_DEFINE_TYPE(QNumberFormat,NumberFormat)
QNumberFormat::QNumberFormat(QObject *parent) : QObject(parent), _number(0), _type(Decimal),
_groupingSize(0)
diff --git a/src/declarative/fx/qfxscalegrid.cpp b/src/declarative/fx/qfxscalegrid.cpp
index 325f7d9..abe8e0d 100644
--- a/src/declarative/fx/qfxscalegrid.cpp
+++ b/src/declarative/fx/qfxscalegrid.cpp
@@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
imageFile: picture.png
\endcode
*/
-QML_DEFINE_NOCREATE_TYPE(QFxScaleGrid);
+QML_DEFINE_NOCREATE_TYPE(QFxScaleGrid)
QFxScaleGrid::QFxScaleGrid() : QObject(), _left(0), _top(0), _right(0), _bottom(0)
{
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index c0ea463..3db8d92 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -75,11 +75,11 @@
QT_BEGIN_NAMESPACE
-DEFINE_BOOL_CONFIG_OPTION(qmlDebugger, QML_DEBUGGER);
+DEFINE_BOOL_CONFIG_OPTION(qmlDebugger, QML_DEBUGGER)
-Q_DECLARE_METATYPE(QmlMetaProperty);
+Q_DECLARE_METATYPE(QmlMetaProperty)
-QML_DEFINE_TYPE(QObject,Object);
+QML_DEFINE_TYPE(QObject,Object)
static QScriptValue qmlMetaProperty_emit(QScriptContext *ctx, QScriptEngine *engine)
{
diff --git a/src/declarative/qml/qmlprivate.h b/src/declarative/qml/qmlprivate.h
index 2a9c503..62524aa 100644
--- a/src/declarative/qml/qmlprivate.h
+++ b/src/declarative/qml/qmlprivate.h
@@ -237,7 +237,7 @@ namespace QmlPrivate
return new T(other);
}
};
-};
+}
template<typename T>
int QmlPrivate::list_op(QmlPrivate::ListOp op, int val,
diff --git a/src/declarative/qml/qmlpropertyvaluesource.cpp b/src/declarative/qml/qmlpropertyvaluesource.cpp
index 4770929..18092c8 100644
--- a/src/declarative/qml/qmlpropertyvaluesource.cpp
+++ b/src/declarative/qml/qmlpropertyvaluesource.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
\class QmlPropertyValueSource
\brief The QmlPropertyValueSource class is inherited by property value sources such as animations and bindings.
*/
-QML_DEFINE_NOCREATE_TYPE(QmlPropertyValueSource);
+QML_DEFINE_NOCREATE_TYPE(QmlPropertyValueSource)
/*!
Constructs a QmlPropertyValueSource with parent \a parent.
diff --git a/src/declarative/util/qmlbind.h b/src/declarative/util/qmlbind.h
index 9d4ae8d..8ff4152 100644
--- a/src/declarative/util/qmlbind.h
+++ b/src/declarative/util/qmlbind.h
@@ -55,11 +55,11 @@ class QmlBindPrivate;
class Q_DECLARATIVE_EXPORT QmlBind : public QObject
{
Q_OBJECT
- Q_DECLARE_PRIVATE(QmlBind);
+ Q_DECLARE_PRIVATE(QmlBind)
- Q_PROPERTY(QObject *target READ object WRITE setObject);
- Q_PROPERTY(QString property READ property WRITE setProperty);
- Q_PROPERTY(QVariant value READ value WRITE setValue);
+ Q_PROPERTY(QObject *target READ object WRITE setObject)
+ Q_PROPERTY(QString property READ property WRITE setProperty)
+ Q_PROPERTY(QVariant value READ value WRITE setValue)
public:
QmlBind(QObject *parent=0);
diff --git a/src/declarative/widgets/graphicslayouts.cpp b/src/declarative/widgets/graphicslayouts.cpp
index 21acbcd..f2d8dbc 100644
--- a/src/declarative/widgets/graphicslayouts.cpp
+++ b/src/declarative/widgets/graphicslayouts.cpp
@@ -45,8 +45,8 @@
QT_BEGIN_NAMESPACE
-QML_DEFINE_INTERFACE(QGraphicsLayoutItem);
-QML_DEFINE_INTERFACE(QGraphicsLayout);
+QML_DEFINE_INTERFACE(QGraphicsLayoutItem)
+QML_DEFINE_INTERFACE(QGraphicsLayout)
class LinearLayoutAttached : public QObject
{
diff --git a/src/declarative/widgets/graphicswidgets.cpp b/src/declarative/widgets/graphicswidgets.cpp
index b808807..86509f5 100644
--- a/src/declarative/widgets/graphicswidgets.cpp
+++ b/src/declarative/widgets/graphicswidgets.cpp
@@ -59,7 +59,7 @@ public:
static_cast<QGraphicsView *>(parent())->setScene(scene);
}
};
-QML_DEFINE_EXTENDED_TYPE(QGraphicsView,QGraphicsView,QGraphicsViewDeclarativeUI);
+QML_DEFINE_EXTENDED_TYPE(QGraphicsView,QGraphicsView,QGraphicsViewDeclarativeUI)
class QGraphicsSceneDeclarativeUI : public QObject
{
@@ -111,7 +111,7 @@ private:
};
Children _children;
};
-QML_DEFINE_EXTENDED_TYPE(QGraphicsScene,QGraphicsScene,QGraphicsSceneDeclarativeUI);
+QML_DEFINE_EXTENDED_TYPE(QGraphicsScene,QGraphicsScene,QGraphicsSceneDeclarativeUI)
class QGraphicsWidgetDeclarativeUI : public QObject
{
@@ -164,9 +164,9 @@ private:
QmlConcreteList<QObject *> _data;
};
-QML_DEFINE_EXTENDED_TYPE(QGraphicsWidget,QGraphicsWidget,QGraphicsWidgetDeclarativeUI);
+QML_DEFINE_EXTENDED_TYPE(QGraphicsWidget,QGraphicsWidget,QGraphicsWidgetDeclarativeUI)
-QML_DEFINE_INTERFACE(QGraphicsItem);
+QML_DEFINE_INTERFACE(QGraphicsItem)
#include "graphicswidgets.moc"
generated by cgit v0.12 at 2025-01-06 09:08:14 (GMT)