Fixed namespace issues, now works on Symbian under namespace

9 files changed, 17 insertions, 28 deletions

diff --git a/src/gui/kernel/qapplication.h b/src/gui/kernel/qapplication.h
index 807d347..a42f47a 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 1ba1dfe..ec595b5 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 ed7e020..c24abc4 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 0670b6f..4d3f067 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 5b888f7..09605be 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 96dfa03..2919551 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 3ab5230..2ac7e26 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 362571f..16d4fd4 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 116dc35..46e0571 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