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 | |
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 | |||
@@ -70,13 +70,14 @@ | |||
70 | #include <qlistview.h> | 70 | #include <qlistview.h> |
71 | #include <qheader.h> | 71 | #include <qheader.h> |
72 | #include <qvbox.h> | 72 | #include <qvbox.h> |
73 | #include <qwhatsthis.h> | 73 | #include <qwhatsthis.h> |
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 |
79 | { | 80 | { |
80 | public: | 81 | public: |
81 | DefaultWindowDecoration() : ref(0) {} | 82 | DefaultWindowDecoration() : ref(0) {} |
82 | QString name() const | 83 | QString name() const |
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 | |||
@@ -32,25 +32,25 @@ | |||
32 | #include <opie2/ofontselector.h> | 32 | #include <opie2/ofontselector.h> |
33 | 33 | ||
34 | #include <qpe/fontdatabase.h> | 34 | #include <qpe/fontdatabase.h> |
35 | 35 | ||
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; |
41 | class QComboBox; | 41 | class QComboBox; |
42 | class QLabel; | 42 | class QLabel; |
43 | class QLineEdit; | 43 | class QLineEdit; |
44 | class QListBox; | 44 | class QListBox; |
45 | class QMultiLineEdit; | 45 | class QMultiLineEdit; |
46 | class QPushButton; | 46 | class QPushButton; |
47 | class QRadioButton; | 47 | 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; |
53 | class Config; | 53 | class Config; |
54 | 54 | ||
55 | class Appearance : public QDialog | 55 | class Appearance : public QDialog |
56 | { | 56 | { |
@@ -109,13 +109,13 @@ private: | |||
109 | QPushButton * m_style_settings; | 109 | QPushButton * m_style_settings; |
110 | 110 | ||
111 | QListBox * m_deco_list; | 111 | QListBox * m_deco_list; |
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 | ||
119 | QComboBox * m_tabstyle_list; | 119 | QComboBox * m_tabstyle_list; |
120 | QRadioButton *m_tabstyle_top; | 120 | QRadioButton *m_tabstyle_top; |
121 | QRadioButton *m_tabstyle_bottom; | 121 | QRadioButton *m_tabstyle_bottom; |
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 | |||
@@ -33,29 +33,30 @@ | |||
33 | #include <qlayout.h> | 33 | #include <qlayout.h> |
34 | #include <qpopupmenu.h> | 34 | #include <qpopupmenu.h> |
35 | #include <qscrollview.h> | 35 | #include <qscrollview.h> |
36 | #include <qtoolbutton.h> | 36 | #include <qtoolbutton.h> |
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 ) |
41 | { | 42 | { |
42 | setCaption ( tr( "Edit scheme" ) ); | 43 | setCaption ( tr( "Edit scheme" ) ); |
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++ ) |
50 | { | 51 | { |
51 | QLabel *l = new QLabel ( labels [i], this ); | 52 | QLabel *l = new QLabel ( labels [i], this ); |
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 | } |
59 | } | 60 | } |
60 | 61 | ||
61 | EditScheme::~EditScheme ( ) | 62 | EditScheme::~EditScheme ( ) |
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 | |||
@@ -30,16 +30,14 @@ | |||
30 | #define EDITSCHEME_H | 30 | #define EDITSCHEME_H |
31 | 31 | ||
32 | #include <opie2/ocolorbutton.h> | 32 | #include <opie2/ocolorbutton.h> |
33 | 33 | ||
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 { |
42 | Q_OBJECT | 40 | Q_OBJECT |
43 | 41 | ||
44 | public: | 42 | public: |
45 | EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); | 43 | EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); |
@@ -48,10 +46,10 @@ public: | |||
48 | protected slots: | 46 | protected slots: |
49 | virtual void accept ( ); | 47 | virtual void accept ( ); |
50 | 48 | ||
51 | private: | 49 | 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 | ||
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 | |||
@@ -27,7 +27,8 @@ | |||
27 | 27 | ||
28 | #include "appearance.h" | 28 | #include "appearance.h" |
29 | 29 | ||
30 | #include <opie2/oapplicationfactory.h> | 30 | #include <opie2/oapplicationfactory.h> |
31 | 31 | ||
32 | 32 | ||
33 | using namespace Opie::Core; | ||
33 | OPIE_EXPORT_APP( OApplicationFactory<Appearance> ) | 34 | OPIE_EXPORT_APP( OApplicationFactory<Appearance> ) |