File qt4-pedantic-headers.diff of Package libqt4
--- src/corelib/io/qfile.h
+++ src/corelib/io/qfile.h
@@ -96,7 +96,7 @@
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);
--- src/corelib/kernel/qtimer.h
+++ src/corelib/kernel/qtimer.h
@@ -63,7 +63,7 @@
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
--- src/gui/kernel/qapplication.h
+++ src/gui/kernel/qapplication.h
@@ -279,7 +279,7 @@
inline static QT3_SUPPORT void setOverrideCursor(const QCursor &cursor, bool replace)
{ if (replace) changeOverrideCursor(cursor); else setOverrideCursor(cursor); }
inline static QT3_SUPPORT bool hasGlobalMouseTracking() {return true;}
- inline static QT3_SUPPORT void setGlobalMouseTracking(bool) {};
+ inline static QT3_SUPPORT void setGlobalMouseTracking(bool) {}
inline static QT3_SUPPORT void flushX() { flush(); }
static inline QT3_SUPPORT void setWinStyleHighlightColor(const QColor &c) {
QPalette p(palette());
@@ -289,7 +289,7 @@
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); }
--- src/gui/kernel/qevent.h
+++ src/gui/kernel/qevent.h
@@ -650,7 +650,7 @@
QClipboardEvent(QEventPrivate *data);
~QClipboardEvent();
- QEventPrivate *data() { return d; };
+ QEventPrivate *data() { return d; }
};
#endif
--- src/gui/kernel/qwidget.h
+++ src/gui/kernel/qwidget.h
@@ -721,7 +721,7 @@
inline QT3_SUPPORT void setFont(const QFont &f, bool) { setFont(f); }
inline QT3_SUPPORT void setPalette(const QPalette &p, bool) { setPalette(p); }
enum BackgroundOrigin { WidgetOrigin, ParentOrigin, WindowOrigin, AncestorOrigin };
- inline QT3_SUPPORT void setBackgroundOrigin(BackgroundOrigin){};
+ inline QT3_SUPPORT void setBackgroundOrigin(BackgroundOrigin){}
inline QT3_SUPPORT BackgroundOrigin backgroundOrigin() const { return WindowOrigin; }
inline QT3_SUPPORT QPoint backgroundOffset() const { return QPoint(); }
inline QT3_SUPPORT void repaint(bool) { repaint(); }
--- src/gui/painting/qstylepainter.h
+++ src/gui/painting/qstylepainter.h
@@ -44,7 +44,7 @@
widget = w;
wstyle = w->style();
return QPainter::begin(pd);
- };
+ }
inline void drawPrimitive(QStyle::PrimitiveElement pe, const QStyleOption &opt);
inline void drawControl(QStyle::ControlElement ce, const QStyleOption &opt);
inline void drawComplexControl(QStyle::ComplexControl cc, const QStyleOptionComplex &opt);
--- src/gui/widgets/qslider.h
+++ src/gui/widgets/qslider.h
@@ -93,8 +93,8 @@
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:
--- src/network/qnativesocketengine_unix.cpp
+++ src/network/qnativesocketengine_unix.cpp
@@ -128,7 +128,7 @@
*addr = tmpAddress;
#ifndef QT_NO_IPV6IFNAME
char scopeid[IFNAMSIZ];
- if (::if_indextoname(sa6->sin6_scope_id, scopeid) > 0) {
+ if (::if_indextoname(sa6->sin6_scope_id, scopeid) != 0) {
addr->setScopeId(QLatin1String(scopeid));
} else
#endif
--- src/gui/widgets/qmainwindow.h
+++ src/gui/widgets/qmainwindow.h
@@ -60,7 +60,7 @@ public:
AllowNestedDocks = 0x02,
AllowTabbedDocks = 0x04,
ForceTabbedDocks = 0x08, // implies AllowTabbedDocks, !AllowNestedDocks
- VerticalTabs = 0x10, // implies AllowTabbedDocks
+ VerticalTabs = 0x10 // implies AllowTabbedDocks
};
Q_DECLARE_FLAGS(DockOptions, DockOption)