From d8aad8299125da82d95406577b281dfab5c12853 Mon Sep 17 00:00:00 2001
From: Sarah Smith <sarah.j.smith@nokia.com>
Date: Wed, 16 Nov 2011 11:53:46 +1000
Subject: Fix compile with -qtnamespace

Also fix header includes to match Qt core style.

RevBy: Patrick Burke
---
 src/plugins/imageformats/tga/main.cpp        | 4 ++--
 src/plugins/imageformats/tga/qtgafile.cpp    | 6 +++---
 src/plugins/imageformats/tga/qtgafile.h      | 8 ++++++--
 src/plugins/imageformats/tga/qtgahandler.cpp | 7 +++----
 src/plugins/imageformats/tga/qtgahandler.h   | 2 +-
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/plugins/imageformats/tga/main.cpp b/src/plugins/imageformats/tga/main.cpp
index 8b1e070..5650be2 100644
--- a/src/plugins/imageformats/tga/main.cpp
+++ b/src/plugins/imageformats/tga/main.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <qimageiohandler.h>
-#include <qdebug.h>
+#include <QtGui/QImageIOHandler>
+#include <QtCore/QDebug>
 
 #ifndef QT_NO_IMAGEFORMATPLUGIN
 
diff --git a/src/plugins/imageformats/tga/qtgafile.cpp b/src/plugins/imageformats/tga/qtgafile.cpp
index af7c876..dfb5a01 100644
--- a/src/plugins/imageformats/tga/qtgafile.cpp
+++ b/src/plugins/imageformats/tga/qtgafile.cpp
@@ -41,9 +41,9 @@
 
 #include "qtgafile.h"
 
-#include <QtCore/qiodevice.h>
-#include <QtCore/qdebug.h>
-#include <QtCore/qdatetime.h>
+#include <QtCore/QIODevice>
+#include <QtCore/QDebug>
+#include <QtCore/QDateTime>
 
 struct TgaReader
 {
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
diff --git a/src/plugins/imageformats/tga/qtgahandler.cpp b/src/plugins/imageformats/tga/qtgahandler.cpp
index 2464daa..ddea4f2 100644
--- a/src/plugins/imageformats/tga/qtgahandler.cpp
+++ b/src/plugins/imageformats/tga/qtgahandler.cpp
@@ -42,10 +42,9 @@
 #include "qtgahandler.h"
 #include "qtgafile.h"
 
-#include <qvariant.h>
-#include <qdebug.h>
-#include <qimage.h>
-#include <qglobal.h>
+#include <QtCore/QVariant>
+#include <QtCore/QDebug>
+#include <QtGui/QImage>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/imageformats/tga/qtgahandler.h b/src/plugins/imageformats/tga/qtgahandler.h
index 88e2b94..f0eb2b0 100644
--- a/src/plugins/imageformats/tga/qtgahandler.h
+++ b/src/plugins/imageformats/tga/qtgahandler.h
@@ -42,7 +42,7 @@
 #ifndef QTGAHANDLER_H
 #define QTGAHANDLER_H
 
-#include <QtGui/qimageiohandler.h>
+#include <QtGui/QImageIOHandler>
 
 QT_BEGIN_NAMESPACE
 
-- 
cgit v0.12