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
@@ -68,17 +68,18 @@
 #include <qtoolbutton.h>
 #include <qwindowsstyle.h>
 #include <qlistview.h>
 #include <qheader.h>
 #include <qvbox.h>
 #include <qwhatsthis.h>
 
 using namespace Opie;
-
+using namespace Opie::Ui;
+using namespace Opie::Core;
 
 class DefaultWindowDecoration : public WindowDecorationInterface
 {
 public:
     DefaultWindowDecoration() : ref(0) {}
     QString name() const
     {
         return "Default";
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
@@ -30,29 +30,29 @@
 #define APPEARANCESETTINGS_H
 
 #include <opie2/ofontselector.h>
 
 #include <qpe/fontdatabase.h>
 
 #include <qdialog.h>
 
-using Opie::OFontSelector;
+using Opie::Ui::OFontSelector;
 
 class QCheckBox;
 class QComboBox;
 class QLabel;
 class QLineEdit;
 class QListBox;
 class QMultiLineEdit;
 class QPushButton;
 class QRadioButton;
 class QToolButton;
 class SampleWindow;
-class OFontSelector;
+namespace Opie {namespace Ui {class OFontSelector;}}
 class QListView;
 class QListViewItem;
 class Config;
 
 class Appearance : public QDialog
 {
     Q_OBJECT
 
@@ -107,17 +107,17 @@ private:
 
     QListBox *    m_style_list;
     QPushButton * m_style_settings;
 
     QListBox *    m_deco_list;
 
     QListBox *    m_color_list;
 
-    OFontSelector *m_fontselect;
+    Opie::Ui::OFontSelector *m_fontselect;
 
     SampleWindow *m_sample;
 
     QComboBox *   m_tabstyle_list;
     QRadioButton *m_tabstyle_top;
     QRadioButton *m_tabstyle_bottom;
 
     QRadioButton *m_rotdir_cw;
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
@@ -31,33 +31,34 @@
 #include <qaction.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpopupmenu.h>
 #include <qscrollview.h>
 #include <qtoolbutton.h>
 #include <qwhatsthis.h>
 
+using namespace Opie::Ui;
 EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent,  const char* name, bool modal, WFlags )
     : QDialog ( parent, name, modal, WStyle_ContextHelp )
 {
     setCaption ( tr( "Edit scheme" ) );
     QGridLayout *layout = new QGridLayout ( this, 0, 0, 4, 4 );
 
     m_count = cnt;
-    m_buttons = new OColorButton * [cnt];
+    m_buttons = new Opie::OColorButton * [cnt];
     m_colors = colors;
 
     for ( int i = 0; i < cnt; i++ )
     {
         QLabel *l = new QLabel ( labels [i], this );
         layout-> addWidget ( l, i, 0 );
         QWhatsThis::add( l, tr( "Click here to select a color for: " ).arg( labels [i] ) );
 
-        m_buttons [i] = new OColorButton ( this, colors [i] );
+        m_buttons [i] = new Opie::OColorButton ( this, colors [i] );
         layout-> addWidget ( m_buttons [i], i, 1 );
         QWhatsThis::add( m_buttons [i], tr( "Click here to select a color for: " ).arg( labels [i] ) );
     }
 }
 
 EditScheme::~EditScheme ( )
 {
     delete [] m_buttons;
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
@@ -28,30 +28,28 @@
 
 #ifndef EDITSCHEME_H
 #define EDITSCHEME_H
 
 #include <opie2/ocolorbutton.h>
 
 #include <qdialog.h>
 
-using Opie::OColorButton;
-
 class QColor;
-class OColorButton;
+namespace Opie {namespace Ui {class OColor;}}
 
 class EditScheme : public QDialog {
     Q_OBJECT
 
 public:
     EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     virtual ~EditScheme ( );
 
 protected slots:
     virtual void accept ( );
 
 private:
     int m_count;
     QColor *m_colors;
-    OColorButton **m_buttons;
+    Opie::OColorButton **m_buttons;
 };
 
 #endif
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
@@ -25,9 +25,10 @@
 
 */
 
 #include "appearance.h"
 
 #include <opie2/oapplicationfactory.h>
 
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<Appearance> )