Fixed namespace issues, now works on Symbian under namespace

22 files changed, 53 insertions, 44 deletions

diff --git a/demos/embedded/desktopservices/contenttab.h b/demos/embedded/desktopservices/contenttab.h
index bfbb044722..60fabc84bd 100644
--- a/demos/embedded/desktopservices/contenttab.h
+++ b/demos/embedded/desktopservices/contenttab.h
@@ -23,7 +23,9 @@
 // INTERNAL INCLUDES
 
 // FORWARD DECLARATIONS
+QT_BEGIN_NAMESPACE
 class QListWidgetItem;
+QT_END_NAMESPACE
 
 // CLASS DECLARATION
 
diff --git a/demos/embedded/desktopservices/desktopwidget.h b/demos/embedded/desktopservices/desktopwidget.h
index 5b74e483b6..a947e80e78 100644
--- a/demos/embedded/desktopservices/desktopwidget.h
+++ b/demos/embedded/desktopservices/desktopwidget.h
@@ -18,7 +18,9 @@
 // INTERNAL INCLUDES
 
 // FORWARD DECLARATIONS
+QT_BEGIN_NAMESPACE
 class QTabWidget;
+QT_END_NAMESPACE
 
 // CLASS DECLARATION
 /**
diff --git a/demos/embedded/desktopservices/linktab.h b/demos/embedded/desktopservices/linktab.h
index 02ad4946d7..f88c334964 100644
--- a/demos/embedded/desktopservices/linktab.h
+++ b/demos/embedded/desktopservices/linktab.h
@@ -18,8 +18,10 @@
 #include "contenttab.h"
 
 // FORWARD DECLARATIONS
+QT_BEGIN_NAMESPACE
 class QWidget;
 class QListWidgetItem;
+QT_END_NAMESPACE
 
 // CLASS DECLARATION
 
diff --git a/src/corelib/arch/generic/qatomic_generic_unix.cpp b/src/corelib/arch/generic/qatomic_generic_unix.cpp
index f8d5450226..876042fff9 100644
--- a/src/corelib/arch/generic/qatomic_generic_unix.cpp
+++ b/src/corelib/arch/generic/qatomic_generic_unix.cpp
@@ -45,6 +45,7 @@
 
 #include <QtCore/qatomic.h>
 
+QT_BEGIN_NAMESPACE
 static pthread_mutex_t qAtomicMutex = PTHREAD_MUTEX_INITIALIZER;
 
 Q_CORE_EXPORT
@@ -118,4 +119,5 @@ void *QBasicAtomicPointer_fetchAndAddOrdered(void * volatile *_q_value, qptrdiff
     pthread_mutex_unlock(&qAtomicMutex);
     return returnValue;
 }
+QT_END_NAMESPACE
 #endif //!defined(Q_OS_SYMBIAN) && !defined(Q_CC_RVCT)
diff --git a/src/gui/dialogs/qfilesystemmodel.cpp b/src/gui/dialogs/qfilesystemmodel.cpp
index 8b68411824..e802cabb04 100644
--- a/src/gui/dialogs/qfilesystemmodel.cpp
+++ b/src/gui/dialogs/qfilesystemmodel.cpp
@@ -1929,8 +1929,8 @@ bool QFileSystemModelPrivate::passNameFilters(const QFileSystemNode *node) const
     return true;
 }
 
-#include "moc_qfilesystemmodel.cpp"
+QT_END_NAMESPACE
 
-#endif // QT_NO_FILESYSTEMMODEL
+#include "moc_qfilesystemmodel.cpp"
 
-QT_END_NAMESPACE
+#endif // QT_NO_FILESYSTEMMODEL
\ No newline at end of file
diff --git a/src/gui/inputmethod/qinputcontext.h b/src/gui/inputmethod/qinputcontext.h
index b84c52b0eb..bc4c63c9ab 100644
--- a/src/gui/inputmethod/qinputcontext.h
+++ b/src/gui/inputmethod/qinputcontext.h
@@ -67,6 +67,10 @@
 
 QT_BEGIN_HEADER
 
+#ifdef Q_WS_S60
+class TWsEvent;
+#endif
+
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Gui)
@@ -76,11 +80,6 @@ class QFont;
 class QPopupMenu;
 class QInputContextPrivate;
 
-#ifdef Q_WS_S60
-class TWsEvent;
-#endif
-
-
 class Q_GUI_EXPORT QInputContext : public QObject
 {
     Q_OBJECT
diff --git a/src/gui/kernel/qapplication.h b/src/gui/kernel/qapplication.h
index 807d3472d6..a42f47a4df 100644
--- a/src/gui/kernel/qapplication.h
+++ b/src/gui/kernel/qapplication.h
@@ -61,6 +61,10 @@
 
 QT_BEGIN_HEADER
 
+#if defined(Q_WS_S60)
+class TWsEvent;
+#endif
+
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Gui)
@@ -84,9 +88,6 @@ class QApplicationPrivate;
 #endif
 #define qApp (static_cast<QApplication *>(QCoreApplication::instance()))
 
-#if defined(Q_WS_S60)
-class TWsEvent;
-#endif
 
 class Q_GUI_EXPORT QApplication : public QCoreApplication
 {
diff --git a/src/gui/kernel/qclipboard_s60.cpp b/src/gui/kernel/qclipboard_s60.cpp
index 1ba1dfeb5b..ec595b5fd9 100644
--- a/src/gui/kernel/qclipboard_s60.cpp
+++ b/src/gui/kernel/qclipboard_s60.cpp
@@ -25,9 +25,6 @@
 #include <baclipb.h>
 QT_BEGIN_NAMESPACE
 
-QT_USE_NAMESPACE
-
-
 //###  Mime Type mapping to UIDs
 
 const TUid KQtCbDataStream = {0x666777};
@@ -246,7 +243,5 @@ void QClipboard::connectNotify( const char * )
 void QClipboard::ownerDestroyed()
 {
 }
-
-#endif // QT_NO_CLIPBOARD
-
 QT_END_NAMESPACE
+#endif // QT_NO_CLIPBOARD
\ No newline at end of file
diff --git a/src/gui/kernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp
index ed7e020d23..c24abc4a9a 100644
--- a/src/gui/kernel/qcursor.cpp
+++ b/src/gui/kernel/qcursor.cpp
@@ -559,7 +559,6 @@ QCursor::operator QVariant() const
 {
     return QVariant(QVariant::Cursor, this);
 }
-
+QT_END_NAMESPACE
 #endif // QT_NO_CURSOR
 
-QT_END_NAMESPACE
diff --git a/src/gui/kernel/qcursor_s60.cpp b/src/gui/kernel/qcursor_s60.cpp
index 0670b6f4fe..4d3f067380 100644
--- a/src/gui/kernel/qcursor_s60.cpp
+++ b/src/gui/kernel/qcursor_s60.cpp
@@ -14,6 +14,7 @@
 #include <qt_s60_p.h>
 
 #ifdef QT_NO_CURSOR
+QT_BEGIN_NAMESPACE
 
 QPoint QCursor::pos()
 {
diff --git a/src/gui/kernel/qdnd_s60.cpp b/src/gui/kernel/qdnd_s60.cpp
index 5b888f704b..09605bec4d 100644
--- a/src/gui/kernel/qdnd_s60.cpp
+++ b/src/gui/kernel/qdnd_s60.cpp
@@ -26,8 +26,6 @@
 #include <w32std.h>
 #include <gdi.h>
 QT_BEGIN_NAMESPACE
-
-QT_USE_NAMESPACE
 //### artistic impression of Symbians default DnD cursor ?
 
 static QPixmap *defaultPm = 0;
@@ -363,8 +361,5 @@ QStringList QDropData::formats_sys() const
     return QStringList();
 }
 
-
-#endif // QT_NO_DRAGANDDROP
-
-
 QT_END_NAMESPACE
+#endif // QT_NO_DRAGANDDROP
diff --git a/src/gui/kernel/qkeymapper_s60.cpp b/src/gui/kernel/qkeymapper_s60.cpp
index 96dfa03e29..29195513f6 100644
--- a/src/gui/kernel/qkeymapper_s60.cpp
+++ b/src/gui/kernel/qkeymapper_s60.cpp
@@ -14,9 +14,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QT_USE_NAMESPACE
-
-
 QKeyMapperPrivate::QKeyMapperPrivate()
 {
     fillKeyMap();
diff --git a/src/gui/kernel/qsound_s60.cpp b/src/gui/kernel/qsound_s60.cpp
index 3ab52304ed..2ac7e269dc 100644
--- a/src/gui/kernel/qsound_s60.cpp
+++ b/src/gui/kernel/qsound_s60.cpp
@@ -25,8 +25,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QT_USE_NAMESPACE
-
 class QAuServerS60;
 
 class QAuBucketS60 : public QAuBucket, public MMdaAudioPlayerCallback
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index 362571fd62..16d4fd4e91 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -79,6 +79,13 @@
 #include "QtGui/qscreen_qws.h"
 #endif
 
+#if defined(Q_WS_S60)
+class RDrawableWindow;
+class CCoeControl;
+class CAknTitlePane;
+class CAknContextPane;
+#endif
+
 QT_BEGIN_NAMESPACE
 
 // Extra QWidget data
@@ -90,12 +97,6 @@ class QWSManager;
 #if defined(Q_WS_MAC)
 class QCoreGraphicsPaintEnginePrivate;
 #endif
-#if defined(Q_WS_S60)
-class RDrawableWindow;
-class CCoeControl;
-class CAknTitlePane;
-class CAknContextPane;
-#endif
 class QPaintEngine;
 class QPixmap;
 class QWidgetBackingStore;
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
index 116dc355b2..46e05712d8 100644
--- a/src/gui/kernel/qwidget_s60.cpp
+++ b/src/gui/kernel/qwidget_s60.cpp
@@ -940,3 +940,5 @@ void QWidget::activateWindow()
         rw->SetOrdinalPosition(0);
     }
 }
+
+QT_END_NAMESPACE
diff --git a/src/gui/painting/qwindowsurface_s60_p.h b/src/gui/painting/qwindowsurface_s60_p.h
index a238f5bff7..7b70fd5d03 100644
--- a/src/gui/painting/qwindowsurface_s60_p.h
+++ b/src/gui/painting/qwindowsurface_s60_p.h
@@ -26,10 +26,11 @@
 #include <qglobal.h>
 #include "private/qwindowsurface_p.h"
 
+class CFbsBitmap;
+
 QT_BEGIN_NAMESPACE
 
 struct QS60WindowSurfacePrivate;
-class CFbsBitmap;
 
 class QS60WindowSurface : public QWindowSurface
 {
diff --git a/src/gui/text/qfontengine_s60.cpp b/src/gui/text/qfontengine_s60.cpp
index 0c6d5b96f3..580291ad2f 100644
--- a/src/gui/text/qfontengine_s60.cpp
+++ b/src/gui/text/qfontengine_s60.cpp
@@ -22,6 +22,8 @@
 #include <EIKENV.H>
 #include <GDI.H>
 
+QT_BEGIN_NAMESPACE
+
 static const int maxFontSizeInPixels = 60;
 
 QFontEngineS60Extensions::QFontEngineS60Extensions(COpenFont *font)
diff --git a/src/gui/text/qfontengine_s60_p.h b/src/gui/text/qfontengine_s60_p.h
index 0b20c74633..ef4a5081e5 100644
--- a/src/gui/text/qfontengine_s60_p.h
+++ b/src/gui/text/qfontengine_s60_p.h
@@ -28,13 +28,13 @@
 #include "qsize.h"
 #include <OPENFONT.H>
 
-QT_BEGIN_NAMESPACE
-
 class CFbsBitmap;
 class CFbsBitmapDevice;
 class CFbsBitGc;
 class CFont;
 
+QT_BEGIN_NAMESPACE
+
 // ..gives us access to truetype tables, UTF-16<->GlyphID mapping, and glyph outlines
 class QFontEngineS60Extensions
 {
diff --git a/src/gui/widgets/qmenu.h b/src/gui/widgets/qmenu.h
index 1e544f73c6..1676eb87a3 100644
--- a/src/gui/widgets/qmenu.h
+++ b/src/gui/widgets/qmenu.h
@@ -52,13 +52,15 @@
 #endif
 
 QT_BEGIN_HEADER
+#ifdef Q_OS_SYMBIAN
+    class CEikMenuPane;
+#endif
 
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Gui)
 
 #ifdef Q_OS_SYMBIAN
-    class CEikMenuPane;
     IMPORT_C void qt_symbian_show_toplevel(CEikMenuPane* menuPane);
     IMPORT_C void qt_symbian_show_submenu(CEikMenuPane* menuPane, int id);
 #endif
diff --git a/src/gui/widgets/qmenu_p.h b/src/gui/widgets/qmenu_p.h
index 61cc3db5cc..d47749f29f 100644
--- a/src/gui/widgets/qmenu_p.h
+++ b/src/gui/widgets/qmenu_p.h
@@ -61,6 +61,9 @@
 #include "QtCore/qbasictimer.h"
 #include "private/qwidget_p.h"
 
+#ifdef Q_OS_SYMBIAN
+class CEikMenuPane;
+#endif
 QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_MENU
@@ -121,7 +124,6 @@ struct QWceMenuAction {
 };
 #endif
 #ifdef Q_OS_SYMBIAN
-class CEikMenuPane;
 struct QSymbianMenuAction {
     uint command;
     int parent;
diff --git a/src/gui/widgets/qmenu_symbian.cpp b/src/gui/widgets/qmenu_symbian.cpp
index a50c5c0c2f..37c5fdbf8d 100644
--- a/src/gui/widgets/qmenu_symbian.cpp
+++ b/src/gui/widgets/qmenu_symbian.cpp
@@ -367,4 +367,7 @@ void QMenuBarPrivate::QSymbianMenuBarPrivate::rebuild()
 
     rebuildMenu();
  }
+
+QT_END_NAMESPACE
+
 #endif //QT_NO_MENUBAR
diff --git a/src/gui/widgets/qmenubar_p.h b/src/gui/widgets/qmenubar_p.h
index f617d80c65..d562cd9182 100644
--- a/src/gui/widgets/qmenubar_p.h
+++ b/src/gui/widgets/qmenubar_p.h
@@ -61,14 +61,17 @@
 #include "qguifunctions_wince.h"
 #endif
 
-QT_BEGIN_NAMESPACE
-
 #ifndef QT_NO_MENUBAR
-class QMenuBarExtension;
 #ifdef Q_OS_SYMBIAN
 class CCoeControl;
 class CEikMenuBar;
 #endif
+#endif
+
+QT_BEGIN_NAMESPACE
+
+#ifndef QT_NO_MENUBAR
+class QMenuBarExtension;
 class QMenuBarPrivate : public QWidgetPrivate
 {
     Q_DECLARE_PUBLIC(QMenuBar)