summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-05-28 03:24:18 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-05-28 03:24:18 (GMT)
commitd9e51611a2be361cb75b682c5552846b64e32df3 (patch)
tree3aca2b3af7807b5da95f93546fa91beb4dee6c4d
parent68c915846e8820e008d15fb3453aa6f45d5becf4 (diff)
downloadQt-d9e51611a2be361cb75b682c5552846b64e32df3.zip
Qt-d9e51611a2be361cb75b682c5552846b64e32df3.tar.gz
Qt-d9e51611a2be361cb75b682c5552846b64e32df3.tar.bz2
Remove extra semicolons.
-rw-r--r--src/declarative/debugger/qmldebugclient.cpp2
-rw-r--r--src/declarative/test/qfxtestobjects.cpp24
-rw-r--r--src/declarative/test/qfxtestobjects.h28
-rw-r--r--src/declarative/util/qperformancelog.h2
4 files changed, 28 insertions, 28 deletions
diff --git a/src/declarative/debugger/qmldebugclient.cpp b/src/declarative/debugger/qmldebugclient.cpp
index 85ccf0b..3dacf01 100644
--- a/src/declarative/debugger/qmldebugclient.cpp
+++ b/src/declarative/debugger/qmldebugclient.cpp
@@ -40,7 +40,7 @@
****************************************************************************/
#include "qmldebugclient.h"
-#include <private/qtcpsocket_p.h>
+#include <private/qobject_p.h>
#include <QtDeclarative/qpacketprotocol.h>
#include <QtCore/qdebug.h>
#include <QtCore/qstringlist.h>
diff --git a/src/declarative/test/qfxtestobjects.cpp b/src/declarative/test/qfxtestobjects.cpp
index 5beefd9..12fc7fb 100644
--- a/src/declarative/test/qfxtestobjects.cpp
+++ b/src/declarative/test/qfxtestobjects.cpp
@@ -47,18 +47,18 @@
QT_BEGIN_NAMESPACE
-QML_DECLARE_TYPE(TestObject);
-QML_DEFINE_TYPE(TestObject,TestObject);
-QML_DECLARE_TYPE(TestFrame);
-QML_DEFINE_TYPE(TestFrame,TestFrame);
-QML_DECLARE_TYPE(TestFullFrame);
-QML_DEFINE_TYPE(TestFullFrame,TestFullFrame);
-QML_DECLARE_TYPE(TestMouse);
-QML_DEFINE_TYPE(TestMouse,TestMouse);
-QML_DECLARE_TYPE(TestKey);
-QML_DEFINE_TYPE(TestKey,TestKey);
-QML_DECLARE_TYPE(TestLog);
-QML_DEFINE_TYPE(TestLog,TestLog);
+QML_DECLARE_TYPE(TestObject)
+QML_DEFINE_TYPE(TestObject,TestObject)
+QML_DECLARE_TYPE(TestFrame)
+QML_DEFINE_TYPE(TestFrame,TestFrame)
+QML_DECLARE_TYPE(TestFullFrame)
+QML_DEFINE_TYPE(TestFullFrame,TestFullFrame)
+QML_DECLARE_TYPE(TestMouse)
+QML_DEFINE_TYPE(TestMouse,TestMouse)
+QML_DECLARE_TYPE(TestKey)
+QML_DEFINE_TYPE(TestKey,TestKey)
+QML_DECLARE_TYPE(TestLog)
+QML_DEFINE_TYPE(TestLog,TestLog)
static QString padding(int pad)
{
diff --git a/src/declarative/test/qfxtestobjects.h b/src/declarative/test/qfxtestobjects.h
index de4d94b..80fcfe7 100644
--- a/src/declarative/test/qfxtestobjects.h
+++ b/src/declarative/test/qfxtestobjects.h
@@ -60,7 +60,7 @@ Q_OBJECT
public:
TestObject(QObject * = 0);
- Q_PROPERTY(int time READ time WRITE setTime NOTIFY dataChanged);
+ Q_PROPERTY(int time READ time WRITE setTime NOTIFY dataChanged)
int time() const;
void setTime(int);
@@ -78,7 +78,7 @@ Q_OBJECT
public:
TestFrame(QObject * = 0);
- Q_PROPERTY(QString hash READ hash WRITE setHash NOTIFY frameChanged);
+ Q_PROPERTY(QString hash READ hash WRITE setHash NOTIFY frameChanged)
QString hash() const;
void setHash(const QString &);
@@ -96,7 +96,7 @@ Q_OBJECT
public:
TestFullFrame(QObject * = 0);
- Q_PROPERTY(int frameId READ frameId WRITE setFrameId NOTIFY frameChanged);
+ Q_PROPERTY(int frameId READ frameId WRITE setFrameId NOTIFY frameChanged)
int frameId() const;
void setFrameId(int);
@@ -114,23 +114,23 @@ Q_OBJECT
public:
TestMouse(QObject * = 0);
- Q_PROPERTY(int type READ type WRITE setType NOTIFY mouseChanged);
+ Q_PROPERTY(int type READ type WRITE setType NOTIFY mouseChanged)
int type() const;
void setType(int);
- Q_PROPERTY(int button READ button WRITE setButton NOTIFY mouseChanged);
+ Q_PROPERTY(int button READ button WRITE setButton NOTIFY mouseChanged)
int button() const;
void setButton(int);
- Q_PROPERTY(int buttons READ buttons WRITE setButtons NOTIFY mouseChanged);
+ Q_PROPERTY(int buttons READ buttons WRITE setButtons NOTIFY mouseChanged)
int buttons() const;
void setButtons(int);
- Q_PROPERTY(QPoint globalPos READ globalPos WRITE setGlobalPos NOTIFY mouseChanged);
+ Q_PROPERTY(QPoint globalPos READ globalPos WRITE setGlobalPos NOTIFY mouseChanged)
QPoint globalPos() const;
void setGlobalPos(const QPoint &);
- Q_PROPERTY(QPoint pos READ pos WRITE setPos NOTIFY mouseChanged);
+ Q_PROPERTY(QPoint pos READ pos WRITE setPos NOTIFY mouseChanged)
QPoint pos() const;
void setPos(const QPoint &);
@@ -153,19 +153,19 @@ Q_OBJECT
public:
TestKey(QObject * = 0);
- Q_PROPERTY(int type READ type WRITE setType NOTIFY keyChanged);
+ Q_PROPERTY(int type READ type WRITE setType NOTIFY keyChanged)
int type() const;
void setType(int);
- Q_PROPERTY(int modifiers READ modifiers WRITE setModifiers NOTIFY keyChanged);
+ Q_PROPERTY(int modifiers READ modifiers WRITE setModifiers NOTIFY keyChanged)
int modifiers() const;
void setModifiers(int);
- Q_PROPERTY(QString text READ text WRITE setText NOTIFY keyChanged);
+ Q_PROPERTY(QString text READ text WRITE setText NOTIFY keyChanged)
QString text() const;
void setText(const QString &);
- Q_PROPERTY(int key READ key WRITE setKey NOTIFY keyChanged);
+ Q_PROPERTY(int key READ key WRITE setKey NOTIFY keyChanged)
int key() const;
void setKey(int);
@@ -187,8 +187,8 @@ Q_OBJECT
public:
TestLog(QObject * = 0);
- Q_CLASSINFO("DefaultProperty", "actions");
- Q_PROPERTY(QList<TestObject *> *actions READ qmlActions);
+ Q_CLASSINFO("DefaultProperty", "actions")
+ Q_PROPERTY(QList<TestObject *> *actions READ qmlActions)
QList<TestObject *> *qmlActions();
QList<TestObject *> &actions();
diff --git a/src/declarative/util/qperformancelog.h b/src/declarative/util/qperformancelog.h
index 9d19bbd..6bb9037 100644
--- a/src/declarative/util/qperformancelog.h
+++ b/src/declarative/util/qperformancelog.h
@@ -64,7 +64,7 @@ namespace QPerformanceLog
void displayData(LogData *);
void clear(LogData *);
#endif
-};
+}
#ifdef Q_ENABLE_PERFORMANCE_LOG