summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/corelib/io/qfile.h2
-rw-r--r--src/corelib/kernel/qtimer.h2
-rw-r--r--src/network/access/qnetworkaccessbackend_p.h2
-rw-r--r--src/network/access/qnetworkaccesshttpbackend_p.h2
-rw-r--r--src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp2
-rw-r--r--src/testlib/qtestspontaneevent.h6
-rw-r--r--src/xml/dom/qdom.cpp4
7 files changed, 10 insertions, 10 deletions
diff --git a/src/corelib/io/qfile.h b/src/corelib/io/qfile.h
index b52780d..f65c845 100644
--- a/src/corelib/io/qfile.h
+++ b/src/corelib/io/qfile.h
@@ -116,7 +116,7 @@ public:
static QByteArray encodeName(const QString &fileName);
static QString decodeName(const QByteArray &localFileName);
inline static QString decodeName(const char *localFileName)
- { return decodeName(QByteArray(localFileName)); };
+ { return decodeName(QByteArray(localFileName)); }
static void setEncodingFunction(EncoderFn);
static void setDecodingFunction(DecoderFn);
diff --git a/src/corelib/kernel/qtimer.h b/src/corelib/kernel/qtimer.h
index c05c4ef..622e9b6 100644
--- a/src/corelib/kernel/qtimer.h
+++ b/src/corelib/kernel/qtimer.h
@@ -84,7 +84,7 @@ public Q_SLOTS:
void stop();
#ifdef QT3_SUPPORT
- inline QT_MOC_COMPAT void changeInterval(int msec) { start(msec); };
+ inline QT_MOC_COMPAT void changeInterval(int msec) { start(msec); }
QT_MOC_COMPAT int start(int msec, bool sshot);
#endif
diff --git a/src/network/access/qnetworkaccessbackend_p.h b/src/network/access/qnetworkaccessbackend_p.h
index 5fdaa4c..a5179cc 100644
--- a/src/network/access/qnetworkaccessbackend_p.h
+++ b/src/network/access/qnetworkaccessbackend_p.h
@@ -157,7 +157,7 @@ public:
// return true if the QNonContiguousByteDevice of the upload
// data needs to support reset(). Currently needed for HTTP.
// This will possibly enable buffering of the upload data.
- virtual bool needsResetableUploadData() {return false;};
+ virtual bool needsResetableUploadData() { return false; }
protected:
// Create the device used for reading the upload data
diff --git a/src/network/access/qnetworkaccesshttpbackend_p.h b/src/network/access/qnetworkaccesshttpbackend_p.h
index d01cc5a..55aadac 100644
--- a/src/network/access/qnetworkaccesshttpbackend_p.h
+++ b/src/network/access/qnetworkaccesshttpbackend_p.h
@@ -95,7 +95,7 @@ public:
qint64 deviceReadData(char *buffer, qint64 maxlen);
// we return true since HTTP needs to send PUT/POST data again after having authenticated
- bool needsResetableUploadData() {return true;};
+ bool needsResetableUploadData() { return true; }
private slots:
void replyReadyRead();
diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp
index 1cbc1d7..a86a3a4 100644
--- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp
+++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp
@@ -74,7 +74,7 @@ public:
+ QString::number((((((size.width()<<11)|size.height())<<11)|mode)<<4)|state, 16); }
void stepSerialNum()
- { serialNum = lastSerialNum.fetchAndAddRelaxed(1); };
+ { serialNum = lastSerialNum.fetchAndAddRelaxed(1); }
void loadDataForModeAndState(QSvgRenderer *renderer, QIcon::Mode mode, QIcon::State state);
diff --git a/src/testlib/qtestspontaneevent.h b/src/testlib/qtestspontaneevent.h
index 0c670f8..2f00414 100644
--- a/src/testlib/qtestspontaneevent.h
+++ b/src/testlib/qtestspontaneevent.h
@@ -74,9 +74,9 @@ public:
class QSpontaneKeyEvent
{
public:
- void setSpontaneous() { spont = 1; };
- bool spontaneous() { return spont; };
- virtual void dummyFunc() { };
+ void setSpontaneous() { spont = 1; }
+ bool spontaneous() { return spont; }
+ virtual void dummyFunc() {}
virtual ~QSpontaneKeyEvent() {}
#ifndef QTEST_NO_SIZEOF_CHECK
diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp
index cf2d8ba..3ae91d3 100644
--- a/src/xml/dom/qdom.cpp
+++ b/src/xml/dom/qdom.cpp
@@ -514,8 +514,8 @@ public:
bool setContent(QXmlInputSource *source, QXmlReader *reader, QString *errorMsg, int *errorLine, int *errorColumn);
// Attributes
- QDomDocumentTypePrivate* doctype() { return type.data(); };
- QDomImplementationPrivate* implementation() { return impl.data(); };
+ QDomDocumentTypePrivate* doctype() { return type.data(); }
+ QDomImplementationPrivate* implementation() { return impl.data(); }
QDomElementPrivate* documentElement();
// Factories