diff options
| author | hjk <qtc-committer@nokia.com> | 2009-09-28 08:46:29 (GMT) |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2009-09-28 10:06:25 (GMT) |
| commit | 994daec967ea0e3db2fa6093efe1274f9a79d2ff (patch) | |
| tree | 5f9db6029a703e74067aeabd1e8ec2d3ca378883 /src | |
| parent | c912b0234ead0e35a969b5600a61c77b60e18aa6 (diff) | |
| download | Qt-994daec967ea0e3db2fa6093efe1274f9a79d2ff.zip Qt-994daec967ea0e3db2fa6093efe1274f9a79d2ff.tar.gz Qt-994daec967ea0e3db2fa6093efe1274f9a79d2ff.tar.bz2 | |
compile fix with namespace
Reviewed-by: sroedal
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/painting/qpaintbuffer.cpp | 5 | ||||
| -rw-r--r-- | src/gui/painting/qpaintbuffer_p.h | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/gui/painting/qpaintbuffer.cpp b/src/gui/painting/qpaintbuffer.cpp index 1038f74..57e7cd0 100644 --- a/src/gui/painting/qpaintbuffer.cpp +++ b/src/gui/painting/qpaintbuffer.cpp @@ -49,6 +49,8 @@ //#define QPAINTBUFFER_DEBUG_DRAW +QT_BEGIN_NAMESPACE + extern int qt_defaultDpiX(); extern int qt_defaultDpiY(); extern void qt_format_text(const QFont &font, @@ -1740,7 +1742,9 @@ struct QPaintBufferCacheEntry QVariant::Type type; quint64 cacheKey; }; +QT_END_NAMESPACE Q_DECLARE_METATYPE(QPaintBufferCacheEntry) +QT_BEGIN_NAMESPACE QDataStream &operator<<(QDataStream &stream, const QPaintBufferCacheEntry &entry) { @@ -1832,3 +1836,4 @@ QDataStream &operator>>(QDataStream &stream, QPaintBuffer &buffer) return stream; } +QT_END_NAMESPACE diff --git a/src/gui/painting/qpaintbuffer_p.h b/src/gui/painting/qpaintbuffer_p.h index a80fa8d..6a7ac73 100644 --- a/src/gui/painting/qpaintbuffer_p.h +++ b/src/gui/painting/qpaintbuffer_p.h @@ -59,6 +59,8 @@ #include <private/qtextengine_p.h> #include <QDebug> +QT_BEGIN_NAMESPACE + class QPaintBufferPrivate; class QPaintBufferPlayback; @@ -440,4 +442,6 @@ private: FreeFunc free; }; +QT_END_NAMESPACE + #endif // QPAINTBUFFER_P_H |