summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/appearance2/appearance.cpp3
-rw-r--r--noncore/settings/appearance2/appearance.h6
-rw-r--r--noncore/settings/appearance2/editScheme.cpp5
-rw-r--r--noncore/settings/appearance2/editScheme.h6
-rw-r--r--noncore/settings/appearance2/main.cpp1
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
@@ -73,7 +73,8 @@
73#include <qwhatsthis.h> 73#include <qwhatsthis.h>
74 74
75using namespace Opie; 75using namespace Opie;
76 76using namespace Opie::Ui;
77using namespace Opie::Core;
77 78
78class DefaultWindowDecoration : public WindowDecorationInterface 79class DefaultWindowDecoration : public WindowDecorationInterface
79{ 80{
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 @@
35 35
36#include <qdialog.h> 36#include <qdialog.h>
37 37
38using Opie::OFontSelector; 38using Opie::Ui::OFontSelector;
39 39
40class QCheckBox; 40class QCheckBox;
41class QComboBox; 41class QComboBox;
@@ -47,7 +47,7 @@ class QPushButton;
47class QRadioButton; 47class QRadioButton;
48class QToolButton; 48class QToolButton;
49class SampleWindow; 49class SampleWindow;
50class OFontSelector; 50namespace Opie {namespace Ui {class OFontSelector;}}
51class QListView; 51class QListView;
52class QListViewItem; 52class QListViewItem;
53class Config; 53class Config;
@@ -112,7 +112,7 @@ private:
112 112
113 QListBox * m_color_list; 113 QListBox * m_color_list;
114 114
115 OFontSelector *m_fontselect; 115 Opie::Ui::OFontSelector *m_fontselect;
116 116
117 SampleWindow *m_sample; 117 SampleWindow *m_sample;
118 118
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 @@
36#include <qtoolbutton.h> 36#include <qtoolbutton.h>
37#include <qwhatsthis.h> 37#include <qwhatsthis.h>
38 38
39using namespace Opie::Ui;
39EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent, const char* name, bool modal, WFlags ) 40EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent, const char* name, bool modal, WFlags )
40 : QDialog ( parent, name, modal, WStyle_ContextHelp ) 41 : QDialog ( parent, name, modal, WStyle_ContextHelp )
41{ 42{
@@ -43,7 +44,7 @@ EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget
43 QGridLayout *layout = new QGridLayout ( this, 0, 0, 4, 4 ); 44 QGridLayout *layout = new QGridLayout ( this, 0, 0, 4, 4 );
44 45
45 m_count = cnt; 46 m_count = cnt;
46 m_buttons = new OColorButton * [cnt]; 47 m_buttons = new Opie::OColorButton * [cnt];
47 m_colors = colors; 48 m_colors = colors;
48 49
49 for ( int i = 0; i < cnt; i++ ) 50 for ( int i = 0; i < cnt; i++ )
@@ -52,7 +53,7 @@ EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget
52 layout-> addWidget ( l, i, 0 ); 53 layout-> addWidget ( l, i, 0 );
53 QWhatsThis::add( l, tr( "Click here to select a color for: " ).arg( labels [i] ) ); 54 QWhatsThis::add( l, tr( "Click here to select a color for: " ).arg( labels [i] ) );
54 55
55 m_buttons [i] = new OColorButton ( this, colors [i] ); 56 m_buttons [i] = new Opie::OColorButton ( this, colors [i] );
56 layout-> addWidget ( m_buttons [i], i, 1 ); 57 layout-> addWidget ( m_buttons [i], i, 1 );
57 QWhatsThis::add( m_buttons [i], tr( "Click here to select a color for: " ).arg( labels [i] ) ); 58 QWhatsThis::add( m_buttons [i], tr( "Click here to select a color for: " ).arg( labels [i] ) );
58 } 59 }
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 @@
33 33
34#include <qdialog.h> 34#include <qdialog.h>
35 35
36using Opie::OColorButton;
37
38class QColor; 36class QColor;
39class OColorButton; 37namespace Opie {namespace Ui {class OColor;}}
40 38
41class EditScheme : public QDialog { 39class EditScheme : public QDialog {
42 Q_OBJECT 40 Q_OBJECT
@@ -51,7 +49,7 @@ protected slots:
51private: 49private:
52 int m_count; 50 int m_count;
53 QColor *m_colors; 51 QColor *m_colors;
54 OColorButton **m_buttons; 52 Opie::OColorButton **m_buttons;
55}; 53};
56 54
57#endif 55#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 @@
30#include <opie2/oapplicationfactory.h> 30#include <opie2/oapplicationfactory.h>
31 31
32 32
33using namespace Opie::Core;
33OPIE_EXPORT_APP( OApplicationFactory<Appearance> ) 34OPIE_EXPORT_APP( OApplicationFactory<Appearance> )