-rw-r--r-- | libopie2/opieui/big-screen/obigscreen_p.h | 9 | ||||
-rw-r--r-- | libopie2/opieui/big-screen/osplitter.cpp | 13 | ||||
-rw-r--r-- | libopie2/opieui/big-screen/osplitter.h | 15 | ||||
-rw-r--r-- | libopie2/opieui/big-screen/owidgetstack.cpp | 9 | ||||
-rw-r--r-- | libopie2/opieui/big-screen/owidgetstack.h | 7 |
5 files changed, 31 insertions, 22 deletions
diff --git a/libopie2/opieui/big-screen/obigscreen_p.h b/libopie2/opieui/big-screen/obigscreen_p.h index db8fc83..a85a56c 100644 --- a/libopie2/opieui/big-screen/obigscreen_p.h +++ b/libopie2/opieui/big-screen/obigscreen_p.h @@ -7,6 +7,7 @@ class QWidget; -namespace Opie -{ +namespace Opie { +namespace Ui { +namespace Private{ struct OSplitterContainer @@ -24,5 +25,7 @@ struct OSplitterContainer }; -}; +} +} +} #endif diff --git a/libopie2/opieui/big-screen/osplitter.cpp b/libopie2/opieui/big-screen/osplitter.cpp index 89f3793..bcfd3a6 100644 --- a/libopie2/opieui/big-screen/osplitter.cpp +++ b/libopie2/opieui/big-screen/osplitter.cpp @@ -36,5 +36,6 @@ #include <qvbox.h> -using namespace Opie; +using namespace Opie::Ui; +using namespace Opie::Ui::Private; /** @@ -169,5 +170,5 @@ void OSplitter::addWidget( OSplitter* split ) else { - Opie::OSplitterContainer con; + OSplitterContainer con; con.widget =split; addToBox( con ); @@ -214,5 +215,5 @@ void OSplitter::addWidget( QWidget* wid, const QString& icon, const QString& lab } #endif - Opie::OSplitterContainer cont; + OSplitterContainer cont; cont.widget = wid; cont.icon =icon; @@ -397,5 +398,5 @@ void OSplitter::resizeEvent( QResizeEvent* res ) * or our own */ -void OSplitter::addToTab( const Opie::OSplitterContainer& con ) +void OSplitter::addToTab( const Opie::Ui::Private::OSplitterContainer& con ) { QWidget *wid = con.widget; @@ -411,5 +412,5 @@ void OSplitter::addToTab( const Opie::OSplitterContainer& con ) * adds a container to the box */ -void OSplitter::addToBox( const Opie::OSplitterContainer& con ) +void OSplitter::addToBox( const Opie::Ui::Private::OSplitterContainer& con ) { QWidget* wid = con.widget; @@ -546,5 +547,5 @@ void OSplitter::commonChangeBox() /* tell them the world had changed */ split->setTabWidget( 0 ); - Opie::OSplitterContainer con; + OSplitterContainer con; con.widget = split; // con.widget = split->m_tabWidget ? static_cast<QWidget*>(split->m_tabWidget) diff --git a/libopie2/opieui/big-screen/osplitter.h b/libopie2/opieui/big-screen/osplitter.h index 2daae7f..7b5ea53 100644 --- a/libopie2/opieui/big-screen/osplitter.h +++ b/libopie2/opieui/big-screen/osplitter.h @@ -24,5 +24,5 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - + */ @@ -49,6 +49,6 @@ class QHBox; */ -namespace Opie -{ +namespace Opie{ +namespace Ui { class OTabWidget; @@ -74,5 +74,5 @@ class OSplitter : public QFrame Q_OBJECT public: - typedef QValueList<Opie::OSplitterContainer> ContainerList; + typedef QValueList<Opie::Ui::Private::OSplitterContainer> ContainerList; OSplitter( Qt::Orientation = Horizontal, QWidget *parent = 0, const char* name = 0, WFlags fl = 0 ); @@ -125,6 +125,6 @@ private: // void reparentAll(); void setTabWidget( OTabWidget*); - void addToTab( const Opie::OSplitterContainer& ); - void addToBox( const Opie::OSplitterContainer& ); + void addToTab( const Opie::Ui::Private::OSplitterContainer& ); + void addToBox( const Opie::Ui::Private::OSplitterContainer& ); void removeFromTab( QWidget* ); void changeTab(); @@ -146,5 +146,6 @@ private: Private *d; }; -}; +} +} #endif diff --git a/libopie2/opieui/big-screen/owidgetstack.cpp b/libopie2/opieui/big-screen/owidgetstack.cpp index 57e97e3..a0a6355 100644 --- a/libopie2/opieui/big-screen/owidgetstack.cpp +++ b/libopie2/opieui/big-screen/owidgetstack.cpp @@ -33,9 +33,9 @@ #include <qwidgetstack.h> -namespace { +namespace Opie { +namespace Ui { const int mode_size = 330; -} -using namespace Opie; + /** @@ -434,2 +434,5 @@ void OWidgetStack::switchTop() { m_stack = 0; } + +} +}
\ No newline at end of file diff --git a/libopie2/opieui/big-screen/owidgetstack.h b/libopie2/opieui/big-screen/owidgetstack.h index 53818c8..d2f9a9f 100644 --- a/libopie2/opieui/big-screen/owidgetstack.h +++ b/libopie2/opieui/big-screen/owidgetstack.h @@ -36,6 +36,6 @@ class QWidgetStack; -namespace Opie -{ +namespace Opie { +namespace Ui { /** * @@ -128,5 +128,6 @@ private: }; -}; +} +} #endif |