diff options
| author | aavit <qt-info@nokia.com> | 2010-02-20 21:02:27 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-02-20 21:02:27 (GMT) |
| commit | b3fb3713bd0118e0357bc95cf665c4e8bb6f978f (patch) | |
| tree | c4d1f0b4513692717bc99fb638f18061dc318b51 /src/plugins/imageformats | |
| parent | 4e8e1dcc9d4c003f160268d095fc1b20e6995da2 (diff) | |
| parent | ce276c42d95f8a7e83da371f33d9da32986a30eb (diff) | |
| download | Qt-b3fb3713bd0118e0357bc95cf665c4e8bb6f978f.zip Qt-b3fb3713bd0118e0357bc95cf665c4e8bb6f978f.tar.gz Qt-b3fb3713bd0118e0357bc95cf665c4e8bb6f978f.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'src/plugins/imageformats')
| -rw-r--r-- | src/plugins/imageformats/ico/qicohandler.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/imageformats/ico/qicohandler.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp index 4edb87a..032ff85 100644 --- a/src/plugins/imageformats/ico/qicohandler.cpp +++ b/src/plugins/imageformats/ico/qicohandler.cpp @@ -54,6 +54,9 @@ #include <QtCore/QFile> #include <QtCore/QBuffer> #include <qvariant.h> + +QT_BEGIN_NAMESPACE + // These next two structs represent how the icon information is stored // in an ICO file. typedef struct @@ -891,3 +894,4 @@ bool QtIcoHandler::jumpToNextImage() return jumpToImage(m_currentIconIndex + 1); } +QT_END_NAMESPACE diff --git a/src/plugins/imageformats/ico/qicohandler.h b/src/plugins/imageformats/ico/qicohandler.h index 394a5eb..4334ad9 100644 --- a/src/plugins/imageformats/ico/qicohandler.h +++ b/src/plugins/imageformats/ico/qicohandler.h @@ -43,6 +43,8 @@ #include <QtGui/QImageIOHandler> +QT_BEGIN_NAMESPACE + class ICOReader; class QtIcoHandler: public QImageIOHandler { @@ -71,5 +73,7 @@ private: }; +QT_END_NAMESPACE + #endif /* QTICOHANDLER_H */ |