author | alwin <alwin> | 2004-03-14 12:04:54 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-03-14 12:04:54 (UTC) |
commit | cede8b4bdf0d77d6fd5a51db840e9c22eea03834 (patch) (side-by-side diff) | |
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 @@ -72,9 +72,10 @@ #include <qvbox.h> #include <qwhatsthis.h> using namespace Opie; - +using namespace Opie::Ui; +using namespace Opie::Core; class DefaultWindowDecoration : public WindowDecorationInterface { public: 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 @@ -34,9 +34,9 @@ #include <qpe/fontdatabase.h> #include <qdialog.h> -using Opie::OFontSelector; +using Opie::Ui::OFontSelector; class QCheckBox; class QComboBox; class QLabel; @@ -46,9 +46,9 @@ class QMultiLineEdit; class QPushButton; class QRadioButton; class QToolButton; class SampleWindow; -class OFontSelector; +namespace Opie {namespace Ui {class OFontSelector;}} class QListView; class QListViewItem; class Config; @@ -111,9 +111,9 @@ private: QListBox * m_deco_list; QListBox * m_color_list; - OFontSelector *m_fontselect; + Opie::Ui::OFontSelector *m_fontselect; SampleWindow *m_sample; QComboBox * m_tabstyle_list; 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 @@ -35,25 +35,26 @@ #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] ) ); } } 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 @@ -32,12 +32,10 @@ #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 @@ -50,8 +48,8 @@ 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 @@ -29,5 +29,6 @@ #include <opie2/oapplicationfactory.h> +using namespace Opie::Core; OPIE_EXPORT_APP( OApplicationFactory<Appearance> ) |