diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-08-29 23:30:42 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-04 00:05:12 +0200 |
| commit | 7ac6ce213393fe5c2ef116a4d68d9dd4dd241eb2 (patch) | |
| tree | 5e15ab616a769404dd535f869670b2e8720d2bb8 | |
| parent | f62b05ccf1e9395a9cbe6f48aeaa5534968903b4 (diff) | |
Fix ICC warnings about functions declared but not used
Added Q_DECL_UNUSED for the function used in Q_ASSERT; removed the
functions that really weren't used and added the #ifdef for the
function that was only used under #ifdef.
qmetaobjectbuilder.cpp(93): warning #177: function "priv" was declared but never referenced
qobject.cpp(2349): warning #177: function "check_and_warn_compat" was declared but never referenced
qpathsimplifier.cpp(141): error #177: function "<unnamed>::Rational::isValid" was declared but never referenced
qtextengine.cpp(2584): error #177: function "<unnamed>::QScriptItemComparator::operator()(const QScriptItem &, const QScriptItem &)" was declared but never referenced
Change-Id: I89a140d59211f10ecd88d751f0bcc0ea2fedff7f
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| -rw-r--r-- | src/corelib/kernel/qmetaobjectbuilder.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 2 | ||||
| -rw-r--r-- | src/gui/painting/qpathsimplifier.cpp | 1 | ||||
| -rw-r--r-- | src/gui/text/qtextengine.cpp | 1 |
4 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp index 96450f9441..4c727f9d3d 100644 --- a/src/corelib/kernel/qmetaobjectbuilder.cpp +++ b/src/corelib/kernel/qmetaobjectbuilder.cpp @@ -90,7 +90,7 @@ Q_CORE_EXPORT bool isBuiltinType(const QByteArray &type) } // namespace QtPrivate // copied from qmetaobject.cpp -static inline const QMetaObjectPrivate *priv(const uint* data) +static inline Q_DECL_UNUSED const QMetaObjectPrivate *priv(const uint* data) { return reinterpret_cast<const QMetaObjectPrivate*>(data); } class QMetaMethodBuilderPrivate diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index f99bcf1532..b914ca812f 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -2346,6 +2346,7 @@ void QMetaObjectPrivate::memberIndexes(const QObject *obj, } } +#ifndef QT_NO_DEBUG static inline void check_and_warn_compat(const QMetaObject *sender, const QMetaMethod &signal, const QMetaObject *receiver, const QMetaMethod &method) { @@ -2360,6 +2361,7 @@ static inline void check_and_warn_compat(const QMetaObject *sender, const QMetaM receiver->className(), method.methodSignature().constData()); } } +#endif /*! \threadsafe diff --git a/src/gui/painting/qpathsimplifier.cpp b/src/gui/painting/qpathsimplifier.cpp index c65daf0da2..1e9c483ff8 100644 --- a/src/gui/painting/qpathsimplifier.cpp +++ b/src/gui/painting/qpathsimplifier.cpp @@ -138,7 +138,6 @@ Fraction fraction(unsigned int n, unsigned int d) { struct Rational { - bool isValid() const { return fraction.isValid(); } int integer; Fraction fraction; }; diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index 229db80186..4c2ca61d39 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -2581,7 +2581,6 @@ QString QTextEngine::elidedText(Qt::TextElideMode mode, const QFixed &width, int namespace { struct QScriptItemComparator { - bool operator()(const QScriptItem &a, const QScriptItem &b) { return a.position < b.position; } bool operator()(int p, const QScriptItem &b) { return p < b.position; } #if defined(Q_CC_MSVC) && _MSC_VER < 1600 //The STL implementation of MSVC 2008 requires the definition |