diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-05-20 12:05:47 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-05-20 12:05:47 (GMT) |
| commit | 5504a102e9f608fed7377332b8de7b823cf22b85 (patch) | |
| tree | 89d08ac45fd0ef618e28473958ae8bdcaa4d54b3 | |
| parent | ee550f157d4c9ca7816a75ac344d1c32eaf1f2b1 (diff) | |
| download | Qt-5504a102e9f608fed7377332b8de7b823cf22b85.zip Qt-5504a102e9f608fed7377332b8de7b823cf22b85.tar.gz Qt-5504a102e9f608fed7377332b8de7b823cf22b85.tar.bz2 | |
compile when using qt namespace
| -rw-r--r-- | src/3rdparty/easing/easing.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/tools/qeasingcurve.cpp | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/3rdparty/easing/easing.cpp b/src/3rdparty/easing/easing.cpp index 5bd3997..81af40f 100644 --- a/src/3rdparty/easing/easing.cpp +++ b/src/3rdparty/easing/easing.cpp @@ -26,6 +26,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND #define M_PI_2 (M_PI / 2) #endif +QT_USE_NAMESPACE /** * Easing equation function for a simple linear tweening, with no easing. diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp index 34765c8..8c37137 100644 --- a/src/corelib/tools/qeasingcurve.cpp +++ b/src/corelib/tools/qeasingcurve.cpp @@ -295,6 +295,11 @@ #include "qeasingcurve.h" +#ifndef QT_NO_DEBUG_STREAM +#include <QtCore/qdebug.h> +#include <QtCore/QString> +#endif + QT_BEGIN_NAMESPACE static bool isConfigFunction(QEasingCurve::Type type) @@ -341,7 +346,9 @@ bool QEasingCurveFunction::operator==(const QEasingCurveFunction& other) _o == other._o; } +QT_BEGIN_INCLUDE_NAMESPACE #include "../3rdparty/easing/easing.cpp" +QT_END_INCLUDE_NAMESPACE class QEasingCurvePrivate { @@ -823,8 +830,6 @@ qreal QEasingCurve::valueForProgress(qreal progress) const } #ifndef QT_NO_DEBUG_STREAM -#include <QtCore/qdebug.h> -#include <QtCore/QString> QDebug operator<<(QDebug debug, const QEasingCurve &item) { debug << "type:" << item.d_ptr->type |