5 files changed, 11 insertions, 10 deletions

diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index 8ae87fe..6b9fe4d 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -75,3 +75,4 @@
 using namespace Opie;
-
+using namespace Opie::Ui;
+using namespace Opie::Core;
 
diff --git a/noncore/settings/appearance2/appearance.h b/noncore/settings/appearance2/appearance.h
index f45f549..134a918 100644
--- a/noncore/settings/appearance2/appearance.h
+++ b/noncore/settings/appearance2/appearance.h
@@ -37,3 +37,3 @@
 
-using Opie::OFontSelector;
+using Opie::Ui::OFontSelector;
 
@@ -49,3 +49,3 @@ class QToolButton;
 class SampleWindow;
-class OFontSelector;
+namespace Opie {namespace Ui {class OFontSelector;}}
 class QListView;
@@ -114,3 +114,3 @@ private:
 
-    OFontSelector *m_fontselect;
+    Opie::Ui::OFontSelector *m_fontselect;
 
diff --git a/noncore/settings/appearance2/editScheme.cpp b/noncore/settings/appearance2/editScheme.cpp
index 0f3702f..18c69a5 100644
--- a/noncore/settings/appearance2/editScheme.cpp
+++ b/noncore/settings/appearance2/editScheme.cpp
@@ -38,2 +38,3 @@
 
+using namespace Opie::Ui;
 EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent,  const char* name, bool modal, WFlags )
@@ -45,3 +46,3 @@ EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget
     m_count = cnt;
-    m_buttons = new OColorButton * [cnt];
+    m_buttons = new Opie::OColorButton * [cnt];
     m_colors = colors;
@@ -54,3 +55,3 @@ EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget
 
-        m_buttons [i] = new OColorButton ( this, colors [i] );
+        m_buttons [i] = new Opie::OColorButton ( this, colors [i] );
         layout-> addWidget ( m_buttons [i], i, 1 );
diff --git a/noncore/settings/appearance2/editScheme.h b/noncore/settings/appearance2/editScheme.h
index c7539cb..302652c 100644
--- a/noncore/settings/appearance2/editScheme.h
+++ b/noncore/settings/appearance2/editScheme.h
@@ -35,6 +35,4 @@
 
-using Opie::OColorButton;
-
 class QColor;
-class OColorButton;
+namespace Opie {namespace Ui {class OColor;}}
 
@@ -53,3 +51,3 @@ private:
     QColor *m_colors;
-    OColorButton **m_buttons;
+    Opie::OColorButton **m_buttons;
 };
diff --git a/noncore/settings/appearance2/main.cpp b/noncore/settings/appearance2/main.cpp
index 8ac45d8..87061e3 100644
--- a/noncore/settings/appearance2/main.cpp
+++ b/noncore/settings/appearance2/main.cpp
@@ -32,2 +32,3 @@
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<Appearance> )