Diffstat (limited to 'libopie2/opieui/ofontselector.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opieui/ofontselector.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/libopie2/opieui/ofontselector.cpp b/libopie2/opieui/ofontselector.cpp index f93781f..b19c26e 100644 --- a/libopie2/opieui/ofontselector.cpp +++ b/libopie2/opieui/ofontselector.cpp @@ -37,12 +37,12 @@ #include <qcombobox.h> #include <qlabel.h> #include <qmultilineedit.h> -using namespace Opie; -namespace Opie -{ +namespace Opie { +namespace Ui { +namespace Private { class OFontSelectorPrivate { public: @@ -55,13 +55,8 @@ public: FontDatabase m_fdb; }; -}; - -namespace -{ - class FontListItem : public QListBoxText { public: FontListItem ( const QString &t, const QStringList &styles, const QValueList<int> &sizes ) : QListBoxText() @@ -94,9 +89,15 @@ private: QStringList m_styles; QValueList<int> m_sizes; QString m_name; }; +} +} +} + +using namespace Opie::Ui; +using namespace Opie::Ui::Private; static int findItemCB( QComboBox *box, const QString &str ) { for ( int i = 0; i < box->count(); i++ ) @@ -106,9 +107,8 @@ static int findItemCB( QComboBox *box, const QString &str ) } return -1; } -} /* static same as anon. namespace */ static int qt_version() { const char *qver = qVersion(); @@ -425,4 +425,5 @@ void OFontSelector::resizeEvent ( QResizeEvent *re ) if ( d->m_preview ) d->m_preview->setFixedHeight ( d->m_preview->height()); } + |