From cede8b4bdf0d77d6fd5a51db840e9c22eea03834 Mon Sep 17 00:00:00 2001
From: alwin <alwin>
Date: Sun, 14 Mar 2004 12:04:54 +0000
Subject: namespaces fixed

---
(limited to 'noncore/settings')

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
@@ -73,7 +73,8 @@
 #include <qwhatsthis.h>
 
 using namespace Opie;
-
+using namespace Opie::Ui;
+using namespace Opie::Core;
 
 class DefaultWindowDecoration : public WindowDecorationInterface
 {
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
@@ -35,7 +35,7 @@
 
 #include <qdialog.h>
 
-using Opie::OFontSelector;
+using Opie::Ui::OFontSelector;
 
 class QCheckBox;
 class QComboBox;
@@ -47,7 +47,7 @@ class QPushButton;
 class QRadioButton;
 class QToolButton;
 class SampleWindow;
-class OFontSelector;
+namespace Opie {namespace Ui {class OFontSelector;}}
 class QListView;
 class QListViewItem;
 class Config;
@@ -112,7 +112,7 @@ private:
 
     QListBox *    m_color_list;
 
-    OFontSelector *m_fontselect;
+    Opie::Ui::OFontSelector *m_fontselect;
 
     SampleWindow *m_sample;
 
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
@@ -36,6 +36,7 @@
 #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 )
 {
@@ -43,7 +44,7 @@ EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget
     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++ )
@@ -52,7 +53,7 @@ EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget
         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] ) );
     }
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
@@ -33,10 +33,8 @@
 
 #include <qdialog.h>
 
-using Opie::OColorButton;
-
 class QColor;
-class OColorButton;
+namespace Opie {namespace Ui {class OColor;}}
 
 class EditScheme : public QDialog {
     Q_OBJECT
@@ -51,7 +49,7 @@ protected slots:
 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
@@ -30,4 +30,5 @@
 #include <opie2/oapplicationfactory.h>
 
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<Appearance> )
--
cgit v0.9.0.2