summaryrefslogtreecommitdiffstats
path: root/src/plugins/imageformats/tga/qtgafile.h
diff options
context:
space:
mode:
authorSarah Smith <sarah.j.smith@nokia.com>2011-11-16 01:53:46 (GMT)
committerSarah Smith <sarah.j.smith@nokia.com>2011-11-16 01:53:46 (GMT)
commitd8aad8299125da82d95406577b281dfab5c12853 (patch)
tree4958e00ede987a56abcc40b9d5a6a4a5a6e422dd /src/plugins/imageformats/tga/qtgafile.h
parentdfb518b8ff1de2423c7f8d3d9a3a63c258acb06d (diff)
downloadQt-d8aad8299125da82d95406577b281dfab5c12853.zip
Qt-d8aad8299125da82d95406577b281dfab5c12853.tar.gz
Qt-d8aad8299125da82d95406577b281dfab5c12853.tar.bz2
Fix compile with -qtnamespace
Also fix header includes to match Qt core style. RevBy: Patrick Burke
Diffstat (limited to 'src/plugins/imageformats/tga/qtgafile.h')
-rw-r--r--src/plugins/imageformats/tga/qtgafile.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/imageformats/tga/qtgafile.h b/src/plugins/imageformats/tga/qtgafile.h
index 034200e..68c5a0c 100644
--- a/src/plugins/imageformats/tga/qtgafile.h
+++ b/src/plugins/imageformats/tga/qtgafile.h
@@ -42,8 +42,10 @@
#ifndef QTGAFILE_H
#define QTGAFILE_H
-#include <QtGui/qcolor.h>
-#include <QtGui/qimage.h>
+#include <QtGui/QColor>
+#include <QtGui/QImage>
+
+QT_BEGIN_NAMESPACE
class QIODevice;
@@ -143,4 +145,6 @@ inline QTgaFile::Compression QTgaFile::compression() const
return NoCompression;
}
+QT_END_NAMESPACE
+
#endif // QTGAFILE_H