diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-27 16:16:16 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-27 16:35:12 +0200 |
commit | 434824aede28e8c36d6991aa218f89daf2cc22fa (patch) | |
tree | f00760a20a065e5a70d722bd06411c4348c49e16 /src/corelib | |
parent | d2aaa13820e400de73e3b0a12af6b7b7c6393d32 (diff) |
Fix compiler warnings.
- Fix gcc 4.6.X warnings about assigned but unused variables
- Remove trailing ';' from inline functions (Clang)
Change-Id: I8670afd6b149748a740f22c65de137762e9f18e1
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/concurrent/qtconcurrentiteratekernel.h | 4 | ||||
-rw-r--r-- | src/corelib/concurrent/qtconcurrentresultstore.h | 2 | ||||
-rw-r--r-- | src/corelib/global/qglobal.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/concurrent/qtconcurrentiteratekernel.h b/src/corelib/concurrent/qtconcurrentiteratekernel.h index 3aaf5dd211..c6fcb973ab 100644 --- a/src/corelib/concurrent/qtconcurrentiteratekernel.h +++ b/src/corelib/concurrent/qtconcurrentiteratekernel.h @@ -145,8 +145,8 @@ class ResultReporter<void> { public: inline ResultReporter(ThreadEngine<void> *) { } - inline void reserveSpace(int) { }; - inline void reportResults(int) { }; + inline void reserveSpace(int) { } + inline void reportResults(int) { } inline void * getPointer() { return 0; } }; diff --git a/src/corelib/concurrent/qtconcurrentresultstore.h b/src/corelib/concurrent/qtconcurrentresultstore.h index f1b517b55d..627aca27bd 100644 --- a/src/corelib/concurrent/qtconcurrentresultstore.h +++ b/src/corelib/concurrent/qtconcurrentresultstore.h @@ -134,7 +134,7 @@ public: ResultIteratorBase resultAt(int index) const; bool contains(int index) const; int count() const; - virtual ~ResultStoreBase() { }; + virtual ~ResultStoreBase() { } protected: int insertResultItem(int index, ResultItem &resultItem); diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 9780c2f96e..aa52fc17bf 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -2284,7 +2284,7 @@ struct QForeachContainerBase {}; template <typename T> class QForeachContainer : public QForeachContainerBase { public: - inline QForeachContainer(const T& t): c(t), brk(0), i(c.begin()), e(c.end()){}; + inline QForeachContainer(const T& t): c(t), brk(0), i(c.begin()), e(c.end()){} const T c; mutable int brk; mutable typename T::const_iterator i, e; |