summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gui/embedded/qwssharedmemory_p.h4
-rw-r--r--src/gui/kernel/qapplication.h2
-rw-r--r--src/gui/kernel/qapplication_p.h2
-rw-r--r--src/gui/kernel/qevent.h2
-rw-r--r--src/gui/kernel/qt_s60_p.h2
-rw-r--r--src/gui/painting/qprintengine_ps_p.h2
-rw-r--r--src/gui/painting/qwindowsurface_qws_p.h2
-rw-r--r--src/gui/text/qfontdatabase.cpp4
-rw-r--r--src/gui/widgets/qslider.h4
-rw-r--r--src/gui/widgets/qvalidator.cpp2
10 files changed, 13 insertions, 13 deletions
diff --git a/src/gui/embedded/qwssharedmemory_p.h b/src/gui/embedded/qwssharedmemory_p.h
index fabd2dd..1d0d090 100644
--- a/src/gui/embedded/qwssharedmemory_p.h
+++ b/src/gui/embedded/qwssharedmemory_p.h
@@ -68,7 +68,7 @@ public:
void setPermissions(mode_t mode);
int size() const;
- void *address() { return shmBase; };
+ void *address() { return shmBase; }
int id() const { return shmId; }
@@ -82,7 +82,7 @@ public:
// old API
QWSSharedMemory(int, const QString &, char c = 'Q');
- void * base() { return address(); };
+ void * base() { return address(); }
bool create();
void destroy();
diff --git a/src/gui/kernel/qapplication.h b/src/gui/kernel/qapplication.h
index 86c7a50..216cfff 100644
--- a/src/gui/kernel/qapplication.h
+++ b/src/gui/kernel/qapplication.h
@@ -337,7 +337,7 @@ public:
static inline QT3_SUPPORT const QColor &winStyleHighlightColor()
{ return palette().color(QPalette::Active, QPalette::Highlight); }
static inline QT3_SUPPORT void setPalette(const QPalette &pal, bool, const char* className = 0)
- { setPalette(pal, className); };
+ { setPalette(pal, className); }
static inline QT3_SUPPORT void setFont(const QFont &font, bool, const char* className = 0)
{ setFont(font, className); }
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index c027763..01fcdcf 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -100,7 +100,7 @@ extern QSysInfo::MacVersion qt_macver;
#if defined(Q_WS_QWS)
class QWSManager;
class QDirectPainter;
-struct QWSServerCleaner { ~QWSServerCleaner(); };
+struct QWSServerCleaner { ~QWSServerCleaner(); }
#endif
#ifndef QT_NO_TABLET
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index c899313..697b93a 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -685,7 +685,7 @@ public:
QClipboardEvent(QEventPrivate *data);
~QClipboardEvent();
- QEventPrivate *data() { return d; };
+ QEventPrivate *data() { return d; }
};
#endif
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h
index af2b640..d85023b 100644
--- a/src/gui/kernel/qt_s60_p.h
+++ b/src/gui/kernel/qt_s60_p.h
@@ -138,7 +138,7 @@ public:
#endif
TTypeUid::Ptr MopSupplyObject(TTypeUid id);
- inline QWidget* widget() const { return qwidget; };
+ inline QWidget* widget() const { return qwidget; }
void setWidget(QWidget *w);
void sendInputEvent(QWidget *widget, QInputEvent *inputEvent);
void setIgnoreFocusChanged(bool enabled) { m_ignoreFocusChanged = enabled; }
diff --git a/src/gui/painting/qprintengine_ps_p.h b/src/gui/painting/qprintengine_ps_p.h
index 827e4d9..704617e 100644
--- a/src/gui/painting/qprintengine_ps_p.h
+++ b/src/gui/painting/qprintengine_ps_p.h
@@ -95,7 +95,7 @@ public:
virtual QPrinter::PrinterState printerState() const;
- virtual Qt::HANDLE handle() const { return 0; };
+ virtual Qt::HANDLE handle() const { return 0; }
private:
Q_DISABLE_COPY(QPSPrintEngine)
diff --git a/src/gui/painting/qwindowsurface_qws_p.h b/src/gui/painting/qwindowsurface_qws_p.h
index 2c45120..6c65db3 100644
--- a/src/gui/painting/qwindowsurface_qws_p.h
+++ b/src/gui/painting/qwindowsurface_qws_p.h
@@ -173,7 +173,7 @@ public:
QPaintDevice *paintDevice() { return &img; }
bool scroll(const QRegion &area, int dx, int dy);
- QImage image() const { return img; };
+ QImage image() const { return img; }
QPoint painterOffset() const;
bool lock(int timeout = -1);
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index f450d94..0aed71a 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -334,7 +334,7 @@ QtFontStyle *QtFontFoundry::style(const QtFontStyle::Key &key, bool create)
else
high = pos;
pos = (high + low) / 2;
- };
+ }
pos = low;
}
if (!create)
@@ -693,7 +693,7 @@ QtFontFamily *QFontDatabasePrivate::family(const QString &f, bool create)
else
low = pos;
pos = (high + low) / 2;
- };
+ }
if (!res)
return families[pos];
}
diff --git a/src/gui/widgets/qslider.h b/src/gui/widgets/qslider.h
index 289c5b7..7b27582 100644
--- a/src/gui/widgets/qslider.h
+++ b/src/gui/widgets/qslider.h
@@ -114,8 +114,8 @@ public:
inline QT3_SUPPORT void setTickmarks(TickPosition position) { setTickPosition(position); }
inline QT3_SUPPORT TickPosition tickmarks() const { return tickPosition(); }
public Q_SLOTS:
- inline QT_MOC_COMPAT void addStep() { triggerAction(SliderSingleStepAdd); };
- inline QT_MOC_COMPAT void subtractStep() { triggerAction(SliderSingleStepSub); };
+ inline QT_MOC_COMPAT void addStep() { triggerAction(SliderSingleStepAdd); }
+ inline QT_MOC_COMPAT void subtractStep() { triggerAction(SliderSingleStepSub); }
#endif
private:
diff --git a/src/gui/widgets/qvalidator.cpp b/src/gui/widgets/qvalidator.cpp
index 416c0cd..405bf04 100644
--- a/src/gui/widgets/qvalidator.cpp
+++ b/src/gui/widgets/qvalidator.cpp
@@ -636,7 +636,7 @@ QValidator::State QDoubleValidator::validate(QString & input, int &) const
case ScientificNotation:
numMode = QLocalePrivate::DoubleScientificMode;
break;
- };
+ }
QByteArray buff;
if (!locale().d()->validateChars(input, numMode, &buff, dec)) {