summaryrefslogtreecommitdiffstats
path: root/src/plugins/imageformats
diff options
context:
space:
mode:
authorWolfgang Beck <wolfgang.beck@nokia.com>2010-02-10 23:41:37 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-02-16 00:53:36 (GMT)
commitc6ba330bc92ad8704f53a79f8f79d87c22b1db1e (patch)
treea2a5fe116c6d10ef5239a4352aa0215325500861 /src/plugins/imageformats
parent4460d24950614bd7c60ad7ec14e0418f1b06cc86 (diff)
downloadQt-c6ba330bc92ad8704f53a79f8f79d87c22b1db1e.zip
Qt-c6ba330bc92ad8704f53a79f8f79d87c22b1db1e.tar.gz
Qt-c6ba330bc92ad8704f53a79f8f79d87c22b1db1e.tar.bz2
MOBILITY-404 QS Windows.
Diffstat (limited to 'src/plugins/imageformats')
-rw-r--r--src/plugins/imageformats/ico/qicohandler.cpp4
-rw-r--r--src/plugins/imageformats/ico/qicohandler.h4
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 */