From b90a0139a4f63c730bb4668e04ab3f8c81ead04f Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Mon, 15 Aug 2011 15:26:28 +0200
Subject: examples: fix compilation with namespaced Qt.

---
 examples/webkit/simplewebplugin/csvfactory.h | 2 ++
 examples/webkit/simplewebplugin/csvview.h    | 2 ++
 examples/webkit/webftpclient/downloader.h    | 2 ++
 examples/webkit/webftpclient/ftpreply.h      | 3 +--
 examples/webkit/webftpclient/ftpview.h       | 1 -
 examples/webkit/webplugin/csvfactory.h       | 2 ++
 examples/webkit/webplugin/csvview.h          | 2 ++
 examples/widgets/orientation/mainwindow.h    | 4 +---
 8 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/examples/webkit/simplewebplugin/csvfactory.h b/examples/webkit/simplewebplugin/csvfactory.h
index 0b046c5..e3013b1 100644
--- a/examples/webkit/simplewebplugin/csvfactory.h
+++ b/examples/webkit/simplewebplugin/csvfactory.h
@@ -44,8 +44,10 @@
 #include <QNetworkRequest>
 #include <QWebPluginFactory>
 
+QT_BEGIN_NAMESPACE
 class QNetworkAccessManager;
 class QNetworkReply;
+QT_END_NAMESPACE
 
 //! [plugin factory]
 class CSVFactory : public QWebPluginFactory
diff --git a/examples/webkit/simplewebplugin/csvview.h b/examples/webkit/simplewebplugin/csvview.h
index 0a136f3..f457d0a 100644
--- a/examples/webkit/simplewebplugin/csvview.h
+++ b/examples/webkit/simplewebplugin/csvview.h
@@ -46,8 +46,10 @@
 #include <QTableView>
 #include <QWebPluginFactory>
 
+QT_BEGIN_NAMESPACE
 class QNetworkAccessManager;
 class QNetworkReply;
+QT_END_NAMESPACE
 
 //! [definition]
 class CSVView : public QTableView
diff --git a/examples/webkit/webftpclient/downloader.h b/examples/webkit/webftpclient/downloader.h
index 8201cea..dd2f8ec 100644
--- a/examples/webkit/webftpclient/downloader.h
+++ b/examples/webkit/webftpclient/downloader.h
@@ -46,10 +46,12 @@
 #include <QObject>
 #include <QUrl>
 
+QT_BEGIN_NAMESPACE
 class QNetworkAccessManager;
 class QNetworkRequest;
 class QNetworkReply;
 class QWidget;
+QT_END_NAMESPACE
 
 class Downloader : public QObject
 {
diff --git a/examples/webkit/webftpclient/ftpreply.h b/examples/webkit/webftpclient/ftpreply.h
index becd4e4..ca0a271 100644
--- a/examples/webkit/webftpclient/ftpreply.h
+++ b/examples/webkit/webftpclient/ftpreply.h
@@ -44,8 +44,7 @@
 #include <QNetworkReply>
 #include <QStringList>
 #include <QUrlInfo>
-
-class QFtp;
+#include <QFtp>
 
 //! [class definition]
 class FtpReply : public QNetworkReply
diff --git a/examples/webkit/webftpclient/ftpview.h b/examples/webkit/webftpclient/ftpview.h
index 2538812..544c0a9 100644
--- a/examples/webkit/webftpclient/ftpview.h
+++ b/examples/webkit/webftpclient/ftpview.h
@@ -41,7 +41,6 @@
 #include <QWebView>
 
 class Downloader;
-class QNetworkAccessManager;
 
 class FtpView : public QWebView
 {
diff --git a/examples/webkit/webplugin/csvfactory.h b/examples/webkit/webplugin/csvfactory.h
index 5a44c50..d1d6b9c 100644
--- a/examples/webkit/webplugin/csvfactory.h
+++ b/examples/webkit/webplugin/csvfactory.h
@@ -44,8 +44,10 @@
 #include <QNetworkRequest>
 #include <QWebPluginFactory>
 
+QT_BEGIN_NAMESPACE
 class QNetworkAccessManager;
 class QNetworkReply;
+QT_END_NAMESPACE
 class QWebView;
 
 class CSVFactory : public QWebPluginFactory
diff --git a/examples/webkit/webplugin/csvview.h b/examples/webkit/webplugin/csvview.h
index bf8918b..4cbb069 100644
--- a/examples/webkit/webplugin/csvview.h
+++ b/examples/webkit/webplugin/csvview.h
@@ -46,8 +46,10 @@
 #include <QTableView>
 #include <QWebPluginFactory>
 
+QT_BEGIN_NAMESPACE
 class QNetworkAccessManager;
 class QNetworkReply;
+QT_END_NAMESPACE
 class QWebFrame;
 
 //! [definition]
diff --git a/examples/widgets/orientation/mainwindow.h b/examples/widgets/orientation/mainwindow.h
index 400a6a5..745497c 100644
--- a/examples/widgets/orientation/mainwindow.h
+++ b/examples/widgets/orientation/mainwindow.h
@@ -41,13 +41,11 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QWidget>
+#include <QAbstractButton>
 
 #include "ui_landscape.h"
 #include "ui_portrait.h"
 
-class QAbstractButton;
-
 //! [0]
 class MainWindow : public QWidget
 {
-- 
cgit v0.12