author | alwin <alwin> | 2004-03-14 12:04:54 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-03-14 12:04:54 (UTC) |
commit | cede8b4bdf0d77d6fd5a51db840e9c22eea03834 (patch) (unidiff) | |
tree | 3c2abeeb9e06f3e6af0885712745251b8cdc39de /noncore/settings | |
parent | ced17a6b39a2b4e282b5912dbb58262d4ad2b6d1 (diff) | |
download | opie-cede8b4bdf0d77d6fd5a51db840e9c22eea03834.zip opie-cede8b4bdf0d77d6fd5a51db840e9c22eea03834.tar.gz opie-cede8b4bdf0d77d6fd5a51db840e9c22eea03834.tar.bz2 |
namespaces fixed
-rw-r--r-- | noncore/settings/appearance2/appearance.cpp | 3 | ||||
-rw-r--r-- | noncore/settings/appearance2/appearance.h | 6 | ||||
-rw-r--r-- | noncore/settings/appearance2/editScheme.cpp | 5 | ||||
-rw-r--r-- | noncore/settings/appearance2/editScheme.h | 6 | ||||
-rw-r--r-- | noncore/settings/appearance2/main.cpp | 1 |
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 | |||
@@ -74,5 +74,6 @@ | |||
74 | 74 | ||
75 | using namespace Opie; | 75 | using namespace Opie; |
76 | 76 | using namespace Opie::Ui; | |
77 | using namespace Opie::Core; | ||
77 | 78 | ||
78 | class DefaultWindowDecoration : public WindowDecorationInterface | 79 | 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 | |||
@@ -36,5 +36,5 @@ | |||
36 | #include <qdialog.h> | 36 | #include <qdialog.h> |
37 | 37 | ||
38 | using Opie::OFontSelector; | 38 | using Opie::Ui::OFontSelector; |
39 | 39 | ||
40 | class QCheckBox; | 40 | class QCheckBox; |
@@ -48,5 +48,5 @@ class QRadioButton; | |||
48 | class QToolButton; | 48 | class QToolButton; |
49 | class SampleWindow; | 49 | class SampleWindow; |
50 | class OFontSelector; | 50 | namespace Opie {namespace Ui {class OFontSelector;}} |
51 | class QListView; | 51 | class QListView; |
52 | class QListViewItem; | 52 | class QListViewItem; |
@@ -113,5 +113,5 @@ private: | |||
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; |
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 | |||
@@ -37,4 +37,5 @@ | |||
37 | #include <qwhatsthis.h> | 37 | #include <qwhatsthis.h> |
38 | 38 | ||
39 | using namespace Opie::Ui; | ||
39 | EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent, const char* name, bool modal, WFlags ) | 40 | EditScheme::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 ) |
@@ -44,5 +45,5 @@ EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget | |||
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 | ||
@@ -53,5 +54,5 @@ EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget | |||
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] ) ); |
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 | |||
@@ -34,8 +34,6 @@ | |||
34 | #include <qdialog.h> | 34 | #include <qdialog.h> |
35 | 35 | ||
36 | using Opie::OColorButton; | ||
37 | |||
38 | class QColor; | 36 | class QColor; |
39 | class OColorButton; | 37 | namespace Opie {namespace Ui {class OColor;}} |
40 | 38 | ||
41 | class EditScheme : public QDialog { | 39 | class EditScheme : public QDialog { |
@@ -52,5 +50,5 @@ private: | |||
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 | ||
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 | |||
@@ -31,3 +31,4 @@ | |||
31 | 31 | ||
32 | 32 | ||
33 | using namespace Opie::Core; | ||
33 | OPIE_EXPORT_APP( OApplicationFactory<Appearance> ) | 34 | OPIE_EXPORT_APP( OApplicationFactory<Appearance> ) |