6 files changed, 36 insertions, 20 deletions

diff --git a/libopie2/opieui/fileselector/ofiledialog.cpp b/libopie2/opieui/fileselector/ofiledialog.cpp
index e7daead..beb4d6c 100644
--- a/libopie2/opieui/fileselector/ofiledialog.cpp
+++ b/libopie2/opieui/fileselector/ofiledialog.cpp
@@ -41,3 +41,3 @@
 
-using namespace Opie;
+using namespace Opie::Ui;
 
diff --git a/libopie2/opieui/fileselector/ofiledialog.h b/libopie2/opieui/fileselector/ofiledialog.h
index 01a599b..dfecf3d 100644
--- a/libopie2/opieui/fileselector/ofiledialog.h
+++ b/libopie2/opieui/fileselector/ofiledialog.h
@@ -37,4 +37,4 @@
 
-namespace Opie
-{
+namespace Opie {
+namespace Ui   {
 
@@ -106,3 +106,4 @@ private slots:
 
-};
+}
+}
 
diff --git a/libopie2/opieui/fileselector/ofileselector.cpp b/libopie2/opieui/fileselector/ofileselector.cpp
index 15cadd4..c4d5033 100644
--- a/libopie2/opieui/fileselector/ofileselector.cpp
+++ b/libopie2/opieui/fileselector/ofileselector.cpp
@@ -57,4 +57,7 @@
 
-using namespace Opie;
+using namespace Opie::Ui::Private;
 
+namespace Opie {
+namespace Ui   {
+namespace Private {
 OFileViewInterface::OFileViewInterface( OFileSelector* selector )
@@ -812,2 +815,4 @@ void OFileViewFileSystem::activate( const QString& str)
 
+
+}
 /* Selector */
@@ -1166 +1171,3 @@ void OFileSelector::setNameVisible( bool b )
 
+}
+}
diff --git a/libopie2/opieui/fileselector/ofileselector.h b/libopie2/opieui/fileselector/ofileselector.h
index 7fa657b..2205963 100644
--- a/libopie2/opieui/fileselector/ofileselector.h
+++ b/libopie2/opieui/fileselector/ofileselector.h
@@ -54,7 +54,9 @@ typedef QMap<QString, QStringList> MimeTypes;
 
-namespace Opie
-{
+namespace Opie {
+namespace Ui   {
 
+namespace Private {
 class OFileViewInterface;
 class OFileViewFileListView;
+}
 
@@ -75,4 +77,4 @@ class OFileSelector : public QWidget
     Q_OBJECT
-    friend class Opie::OFileViewInterface;
-    friend class Opie::OFileViewFileListView;
+    friend class Private::OFileViewInterface;
+    friend class Private::OFileViewFileListView;
 
@@ -187,4 +189,4 @@ private:
     QWidgetStack* m_stack;  // our widget stack which will contain the views
-    OFileViewInterface* currentView() const; // returns the currentView
-    OFileViewInterface* m_current; // here is the view saved
+    Private::OFileViewInterface* currentView() const; // returns the currentView
+    Private::OFileViewInterface* m_current; // here is the view saved
     bool m_shNew   : 1; // should we show New?
@@ -193,3 +195,3 @@ private:
 
-    QMap<QString, OFileViewInterface*> m_views; // QString translated view name + ViewInterface Ptr
+    QMap<QString, Private::OFileViewInterface*> m_views; // QString translated view name + ViewInterface Ptr
     QHBox* m_nameBox; // the LineEdit + Label is hold here
@@ -216,3 +218,4 @@ private slots:
 
-};
+}
+}
 
diff --git a/libopie2/opieui/fileselector/ofileselector_p.h b/libopie2/opieui/fileselector/ofileselector_p.h
index 818ced9..376dc98 100644
--- a/libopie2/opieui/fileselector/ofileselector_p.h
+++ b/libopie2/opieui/fileselector/ofileselector_p.h
@@ -58,6 +58,6 @@ class QToolButton;
 
-namespace Opie
-{
-
+namespace Opie{
+namespace Ui{
 class OFileSelector;
+namespace Private {
 
@@ -188,3 +188,5 @@ private:
 
-};
+}
+}
+}
 
diff --git a/libopie2/opieui/fileselector/ofileview.h b/libopie2/opieui/fileselector/ofileview.h
index 495401b..aaf56b1 100644
--- a/libopie2/opieui/fileselector/ofileview.h
+++ b/libopie2/opieui/fileselector/ofileview.h
@@ -39,4 +39,5 @@ class DocLnk;
 
-namespace Opie
-{
+namespace Opie {
+namespace Ui   {
+namespace Private {
 
@@ -92,3 +93,5 @@ public:
 
-};
+}
+}
+}