the examples compile with namespace

35 files changed, 113 insertions, 10 deletions

diff --git a/examples/audiorecorder/audiorecorder.h b/examples/audiorecorder/audiorecorder.h
index 0b845c5852..3b996d1ad9 100644
--- a/examples/audiorecorder/audiorecorder.h
+++ b/examples/audiorecorder/audiorecorder.h
@@ -50,7 +50,11 @@
 class QComboBox;
 class QLabel;
 
+QTM_BEGIN_NAMESPACE
 class QAudioCaptureSource;
+QTM_END_NAMESPACE
+
+QTM_USE_NAMESPACE
 
 class AudioRecorder : public QMainWindow
 {
diff --git a/examples/bearercloud/bearercloud.h b/examples/bearercloud/bearercloud.h
index f9fa0603eb..c18ffd3df3 100644
--- a/examples/bearercloud/bearercloud.h
+++ b/examples/bearercloud/bearercloud.h
@@ -45,6 +45,8 @@
 #include <QMap>
 #include <QHash>
 
+QTM_USE_NAMESPACE
+
 class Cloud;
 
 class BearerCloud : public QGraphicsScene
diff --git a/examples/bearercloud/cloud.h b/examples/bearercloud/cloud.h
index 27351b6910..4ce43df0d2 100644
--- a/examples/bearercloud/cloud.h
+++ b/examples/bearercloud/cloud.h
@@ -43,6 +43,7 @@
 #include <qnetworksession.h>
 
 #include <QGraphicsItem>
+QTM_USE_NAMESPACE
 
 class QGraphicsTextItem;
 class QGraphicsSvgItem;
diff --git a/examples/bearermonitor/bearermonitor.h b/examples/bearermonitor/bearermonitor.h
index 667a73cc25..d1f46016f9 100644
--- a/examples/bearermonitor/bearermonitor.h
+++ b/examples/bearermonitor/bearermonitor.h
@@ -50,6 +50,8 @@
 #include "ui_bearermonitor_640_480.h"
 #endif
 
+QTM_USE_NAMESPACE
+
 class SessionWidget;
 
 class BearerMonitor : public QWidget, public Ui_BearerMonitor
diff --git a/examples/bearermonitor/sessionwidget.h b/examples/bearermonitor/sessionwidget.h
index 5d664974ac..cb6591e9f2 100644
--- a/examples/bearermonitor/sessionwidget.h
+++ b/examples/bearermonitor/sessionwidget.h
@@ -46,6 +46,8 @@
 
 #include <qnetworksession.h>
 
+QTM_USE_NAMESPACE
+
 class SessionWidget : public QWidget, public Ui_SessionWidget
 {
     Q_OBJECT
diff --git a/examples/bluetoothtransferplugin/bluetoothtransferplugin.h b/examples/bluetoothtransferplugin/bluetoothtransferplugin.h
index d9211f9716..c8efba0190 100644
--- a/examples/bluetoothtransferplugin/bluetoothtransferplugin.h
+++ b/examples/bluetoothtransferplugin/bluetoothtransferplugin.h
@@ -46,11 +46,13 @@
 
 #include <qserviceplugininterface.h>
 
+QTM_USE_NAMESPACE
+
 class BluetoothTransferPlugin : public QObject,
                                 public QServicePluginInterface
 {
     Q_OBJECT
-    Q_INTERFACES(QServicePluginInterface)
+    Q_INTERFACES(QtMobility::QServicePluginInterface)
 public:
     QObject* createInstance(const QServiceInterfaceDescriptor& descriptor,
                             QServiceContext* context,
diff --git a/examples/cameracapture/cameracapture.h b/examples/cameracapture/cameracapture.h
index e69846ce4a..56d7daf7c5 100644
--- a/examples/cameracapture/cameracapture.h
+++ b/examples/cameracapture/cameracapture.h
@@ -52,9 +52,7 @@ namespace Ui {
 #include <QMainWindow>
 #include <QDir>
 
-class QMediaRecorder;
-class QCamera;
-class QMediaService;
+QTM_USE_NAMESPACE
 
 class CameraCapture : public QMainWindow
 {
diff --git a/examples/cameracapture/settings.h b/examples/cameracapture/settings.h
index 2cfde38822..02f4c221b1 100644
--- a/examples/cameracapture/settings.h
+++ b/examples/cameracapture/settings.h
@@ -46,7 +46,11 @@
 #include <qmediaencodersettings.h>
 
 class QComboBox;
+QTM_BEGIN_NAMESPACE
 class QMediaRecorder;
+QTM_END_NAMESPACE
+
+QTM_USE_NAMESPACE
 
 namespace Ui {
     class Settings;
diff --git a/examples/fetchgooglemaps/mapwindow.h b/examples/fetchgooglemaps/mapwindow.h
index d66bb89553..d62087eeb5 100644
--- a/examples/fetchgooglemaps/mapwindow.h
+++ b/examples/fetchgooglemaps/mapwindow.h
@@ -41,13 +41,18 @@
 #ifndef MAPWINDOW_H
 #define MAPWINDOW_H
 
+#include <qmobilityglobal.h>
 #include <QMainWindow>
 
 class QWebView;
 class QLabel;
 
+QTM_BEGIN_NAMESPACE
 class QGeoPositionInfo;
 class QNmeaPositionInfoSource;
+QTM_END_NAMESPACE
+
+QTM_USE_NAMESPACE
 
 class MapWindow : public QMainWindow
 {
diff --git a/examples/filemanagerplugin/filemanagerplugin.h b/examples/filemanagerplugin/filemanagerplugin.h
index b0e6b27835..a4431add71 100644
--- a/examples/filemanagerplugin/filemanagerplugin.h
+++ b/examples/filemanagerplugin/filemanagerplugin.h
@@ -46,11 +46,13 @@
 
 #include <qserviceplugininterface.h>
 
+QTM_USE_NAMESPACE
+
 class FileManagerPlugin : public QObject,
                           public QServicePluginInterface
 {
     Q_OBJECT
-    Q_INTERFACES(QServicePluginInterface)
+    Q_INTERFACES(QtMobility::QServicePluginInterface)
 public:
     QObject* createInstance(const QServiceInterfaceDescriptor& descriptor,
                             QServiceContext* context,
diff --git a/examples/incomingcalls/filterdialog.h b/examples/incomingcalls/filterdialog.h
index 01c3b08873..1b48dd25db 100644
--- a/examples/incomingcalls/filterdialog.h
+++ b/examples/incomingcalls/filterdialog.h
@@ -66,6 +66,8 @@ class QFormLayout;
 class QVBoxLayout;
 class QHBoxLayout;
 
+QTM_USE_NAMESPACE
+
 class FilterDialog : public QWidget
 {
     Q_OBJECT
diff --git a/examples/incomingcalls/qcontactlistmodel.h b/examples/incomingcalls/qcontactlistmodel.h
index 5366bc79fb..91d1eade8e 100644
--- a/examples/incomingcalls/qcontactlistmodel.h
+++ b/examples/incomingcalls/qcontactlistmodel.h
@@ -61,9 +61,13 @@
 #include <QAbstractListModel>
 #include <QSharedData>
 
+QTM_BEGIN_NAMESPACE
 class QContactManager;
 class QContactFetchRequest;
 class QContactLocalIdFetchRequest;
+QTM_END_NAMESPACE
+
+QTM_USE_NAMESPACE
 
 class QContactListModelPrivate;
 class QContactListModel : public QAbstractListModel
diff --git a/examples/incomingcalls/qcontactlistmodel_p.h b/examples/incomingcalls/qcontactlistmodel_p.h
index f812fbe565..3f3c967474 100644
--- a/examples/incomingcalls/qcontactlistmodel_p.h
+++ b/examples/incomingcalls/qcontactlistmodel_p.h
@@ -63,6 +63,8 @@
 #include <QSharedData>
 #include <QMap>
 
+QTM_USE_NAMESPACE
+
 class QContactListModelPrivate : public QSharedData
 {
 public:
diff --git a/examples/incomingcalls/testmodelui.h b/examples/incomingcalls/testmodelui.h
index 99195d2515..e72246781f 100644
--- a/examples/incomingcalls/testmodelui.h
+++ b/examples/incomingcalls/testmodelui.h
@@ -65,8 +65,12 @@ class QTextEdit;
 class QLabel;
 class QPushButton;
 
+QTM_BEGIN_NAMESPACE
 class QContactFetchRequest;
 class QContactManager;
+QTM_END_NAMESPACE
+
+QTM_USE_NAMESPACE
 class TestModelView : public QListView
 {
     Q_OBJECT
diff --git a/examples/keepintouch/addressfinder.h b/examples/keepintouch/addressfinder.h
index b55053e56d..827fe8a161 100644
--- a/examples/keepintouch/addressfinder.h
+++ b/examples/keepintouch/addressfinder.h
@@ -54,6 +54,8 @@ class QListWidget;
 class QPushButton;
 class QTabWidget;
 
+QTM_USE_NAMESPACE
+
 class AddressFinder : public QMainWindow
 {
     Q_OBJECT
diff --git a/examples/logfilepositionsource/clientapplication.h b/examples/logfilepositionsource/clientapplication.h
index 4557701081..5035aa442c 100644
--- a/examples/logfilepositionsource/clientapplication.h
+++ b/examples/logfilepositionsource/clientapplication.h
@@ -41,10 +41,15 @@
 #ifndef CLIENTAPPLICATION_H
 #define CLIENTAPPLICATION_H
 
+#include <qmobilityglobal.h>
 #include <QObject>
 
+
+QTM_BEGIN_NAMESPACE
 class QGeoPositionInfo;
+QTM_END_NAMESPACE
 
+QTM_USE_NAMESPACE
 class ClientApplication : public QObject
 {
     Q_OBJECT
diff --git a/examples/logfilepositionsource/logfilepositionsource.h b/examples/logfilepositionsource/logfilepositionsource.h
index d8494620fc..f40eaf10e1 100644
--- a/examples/logfilepositionsource/logfilepositionsource.h
+++ b/examples/logfilepositionsource/logfilepositionsource.h
@@ -43,6 +43,8 @@
 
 #include <qgeopositioninfosource.h>
 
+QTM_USE_NAMESPACE
+
 class QFile;
 class QTimer;
 
diff --git a/examples/player/player.h b/examples/player/player.h
index b561d72767..78205522ea 100644
--- a/examples/player/player.h
+++ b/examples/player/player.h
@@ -50,10 +50,15 @@
 
 class QAbstractItemView;
 class QLabel;
-class QMediaPlayer;
 class QModelIndex;
 class QSlider;
+
+QTM_BEGIN_NAMESPACE
+class QMediaPlayer;
 class QVideoWidget;
+QTM_END_NAMESPACE
+
+QTM_USE_NAMESPACE
 
 class PlaylistModel;
 
diff --git a/examples/player/playercontrols.h b/examples/player/playercontrols.h
index 2a0a6cbb88..5e7d85965d 100644
--- a/examples/player/playercontrols.h
+++ b/examples/player/playercontrols.h
@@ -50,6 +50,8 @@ class QAbstractButton;
 class QAbstractSlider;
 class QComboBox;
 
+QTM_USE_NAMESPACE
+
 class PlayerControls : public QWidget
 {
     Q_OBJECT
diff --git a/examples/player/playlistmodel.h b/examples/player/playlistmodel.h
index bd01667fec..f41d73e412 100644
--- a/examples/player/playlistmodel.h
+++ b/examples/player/playlistmodel.h
@@ -42,9 +42,14 @@
 #ifndef PLAYLISTMODEL_H
 #define PLAYLISTMODEL_H
 
+#include <qmobilityglobal.h>
 #include <QtCore/qabstractitemmodel.h>
 
+QTM_BEGIN_NAMESPACE
 class QMediaPlaylist;
+QTM_END_NAMESPACE
+
+QTM_USE_NAMESPACE
 
 class PlaylistModel : public QAbstractItemModel
 {
diff --git a/examples/player/videowidget.h b/examples/player/videowidget.h
index 6c27752a72..c02b62be21 100644
--- a/examples/player/videowidget.h
+++ b/examples/player/videowidget.h
@@ -43,6 +43,8 @@
 
 #include <qvideowidget.h>
 
+QTM_USE_NAMESPACE
+
 class VideoWidget : public QVideoWidget
 {
     Q_OBJECT
diff --git a/examples/publish-subscribe/consumerdialog.h b/examples/publish-subscribe/consumerdialog.h
index 90a75c5764..d4a90f0ad8 100644
--- a/examples/publish-subscribe/consumerdialog.h
+++ b/examples/publish-subscribe/consumerdialog.h
@@ -42,9 +42,14 @@
 #ifndef CONSUMERDIALOG_H
 #define CONSUMERDIALOG_H
 
+#include <qmobilityglobal.h>
 #include <QDialog>
 
+QTM_BEGIN_NAMESPACE
 class QValueSpaceSubscriber;
+QTM_END_NAMESPACE
+
+QTM_USE_NAMESPACE
 
 namespace Ui {
     class ConsumerDialog;
diff --git a/examples/publish-subscribe/providerdialog.h b/examples/publish-subscribe/providerdialog.h
index c3ea7787bb..8f57603caf 100644
--- a/examples/publish-subscribe/providerdialog.h
+++ b/examples/publish-subscribe/providerdialog.h
@@ -42,9 +42,14 @@
 #ifndef PROVIDERDIALOG_H
 #define PROVIDERDIALOG_H
 
+#include <qmobilityglobal.h>
 #include <QDialog>
 
+QTM_BEGIN_NAMESPACE
 class QValueSpaceProvider;
+QTM_END_NAMESPACE
+
+QTM_USE_NAMESPACE
 
 namespace Ui {
     class ProviderDialog;
diff --git a/examples/querymessages/main.cpp b/examples/querymessages/main.cpp
index da2d84c70a..aa82430fa3 100644
--- a/examples/querymessages/main.cpp
+++ b/examples/querymessages/main.cpp
@@ -44,6 +44,8 @@
 #include <qmessagestore.h>
 #include <qdebug.h>
 
+QTM_USE_NAMESPACE
+
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
diff --git a/examples/samplephonebook/finddialog.h b/examples/samplephonebook/finddialog.h
index a589bc2f39..838f660c46 100644
--- a/examples/samplephonebook/finddialog.h
+++ b/examples/samplephonebook/finddialog.h
@@ -53,6 +53,8 @@ QT_END_NAMESPACE
 
 class FilterDialog;
 
+QTM_USE_NAMESPACE
+
 class FindDialog : public QDialog
 {
     Q_OBJECT
diff --git a/examples/samplephonebook/groupdetailsdialog.h b/examples/samplephonebook/groupdetailsdialog.h
index de20b9c979..dcebbe2382 100644
--- a/examples/samplephonebook/groupdetailsdialog.h
+++ b/examples/samplephonebook/groupdetailsdialog.h
@@ -49,7 +49,12 @@ class QPushButton;
 class QListWidget;
 class QListWidgetItem;
 class QLineEdit;
+
+QTM_BEGIN_NAMESPACE
 class QContactManager;
+QTM_END_NAMESPACE
+
+QTM_USE_NAMESPACE
 
 class GroupDetailsDialog : public QDialog
 {
diff --git a/examples/samplephonebook/groupeditdialog.h b/examples/samplephonebook/groupeditdialog.h
index 9f90c9f855..f27a4160a0 100644
--- a/examples/samplephonebook/groupeditdialog.h
+++ b/examples/samplephonebook/groupeditdialog.h
@@ -42,13 +42,19 @@
 #ifndef GROUPEDITDIALOG_H
 #define GROUPEDITDIALOG_H
 
+#include <qmobilityglobal.h>
 #include <QDialog>
 
 class QPushButton;
 class QListWidget;
 class QListWidgetItem;
 class QLineEdit;
+
+QTM_BEGIN_NAMESPACE
 class QContactManager;
+QTM_END_NAMESPACE
+
+QTM_USE_NAMESPACE
 
 class GroupEditDialog : public QDialog
 {
diff --git a/examples/samplephonebook/serialiser.h b/examples/samplephonebook/serialiser.h
index 0c1e927562..174a28eb74 100644
--- a/examples/samplephonebook/serialiser.h
+++ b/examples/samplephonebook/serialiser.h
@@ -47,6 +47,8 @@
 #include <QString>
 #include <QStringList>
 
+QTM_USE_NAMESPACE
+
 class Serialiser
 {
 public:
diff --git a/examples/sendmessage/messagesender.h b/examples/sendmessage/messagesender.h
index 1231f0f96b..4b79a0ebd0 100644
--- a/examples/sendmessage/messagesender.h
+++ b/examples/sendmessage/messagesender.h
@@ -51,6 +51,8 @@ class QListWidget;
 class QTextEdit;
 class QPushButton;
 
+QTM_USE_NAMESPACE
+
 class MessageSender : public QWidget
 {
     Q_OBJECT
diff --git a/examples/serviceactions/mainwindow.h b/examples/serviceactions/mainwindow.h
index d40e027692..3cd718aa9c 100644
--- a/examples/serviceactions/mainwindow.h
+++ b/examples/serviceactions/mainwindow.h
@@ -51,6 +51,8 @@ class QTabWidget;
 class QMenuBar;
 class QStackedWidget;
 
+QTM_USE_NAMESPACE
+
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
diff --git a/examples/servicebrowser/servicebrowser.h b/examples/servicebrowser/servicebrowser.h
index 4603b69fad..c8df89b532 100644
--- a/examples/servicebrowser/servicebrowser.h
+++ b/examples/servicebrowser/servicebrowser.h
@@ -45,6 +45,8 @@
 #include <QWidget>
 #include <QObject>
 
+#include <qmobilityglobal.h>
+
 class QAbstractButton;
 class QGroupBox;
 class QListWidget;
@@ -52,7 +54,11 @@ class QListWidgetItem;
 class QPushButton;
 class QRadioButton;
 
+QTM_BEGIN_NAMESPACE
 class QServiceManager;
+QTM_END_NAMESPACE
+
+QTM_USE_NAMESPACE
 
 class ServiceBrowser : public QWidget
 {
diff --git a/examples/slideshow/slideshow.h b/examples/slideshow/slideshow.h
index 446bd7b809..e59d2ef824 100644
--- a/examples/slideshow/slideshow.h
+++ b/examples/slideshow/slideshow.h
@@ -48,7 +48,11 @@
 class QAbstractButton;
 class QLabel;
 
+QTM_BEGIN_NAMESPACE
 class QMediaPlaylist;
+QTM_END_NAMESPACE
+
+QTM_USE_NAMESPACE
 
 class SlideShow : public QWidget
 {
diff --git a/examples/streamplayer/streamplayer.h b/examples/streamplayer/streamplayer.h
index 21ba86bfa3..89ae532434 100644
--- a/examples/streamplayer/streamplayer.h
+++ b/examples/streamplayer/streamplayer.h
@@ -42,12 +42,17 @@
 #ifndef STREAMPLAYER_H
 #define STREAMPLAYER_H
 
+#include <qmobilityglobal.h>
 #include <QtCore/qfile.h>
 #include <QtGui/qwidget.h>
 
-class QMediaPlayer;
 class QProgressBar;
 
+QTM_BEGIN_NAMESPACE
+class QMediaPlayer;
+QTM_END_NAMESPACE
+
+QTM_USE_NAMESPACE
 class StreamPlayer : public QWidget
 {
     Q_OBJECT
diff --git a/examples/sysinfo/dialog.h b/examples/sysinfo/dialog.h
index bbd5a990be..aa87dcf9fd 100644
--- a/examples/sysinfo/dialog.h
+++ b/examples/sysinfo/dialog.h
@@ -43,10 +43,10 @@
 #define DIALOG_H
 
 #include <QDialog>
-class QSystemScreenSaver;
-class QSystemInfo;
 #include <qsysteminfo.h>
 
+QTM_USE_NAMESPACE
+
 namespace Ui {
     class Dialog;
 }
diff --git a/src/contacts/qcontactmanagerenginefactory.h b/src/contacts/qcontactmanagerenginefactory.h
index 74844ed56f..ef7f52b537 100644
--- a/src/contacts/qcontactmanagerenginefactory.h
+++ b/src/contacts/qcontactmanagerenginefactory.h
@@ -72,6 +72,6 @@ public:
 QTM_END_NAMESPACE
 
 #define QT_CONTACTS_BACKEND_INTERFACE "com.nokia.qt.mobility.contacts.enginefactory/1.0"
-Q_DECLARE_INTERFACE(QTM_PREPEND_NAMESPACE(QContactManagerEngineFactory), QT_CONTACTS_BACKEND_INTERFACE);
+Q_DECLARE_INTERFACE(QtMobility::QContactManagerEngineFactory, QT_CONTACTS_BACKEND_INTERFACE);
 
 #endif