author | zecke <zecke> | 2004-03-13 19:51:45 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-13 19:51:45 (UTC) |
commit | 6d08277737e22b7a1527124623f3571969073ddf (patch) (side-by-side diff) | |
tree | 4129e674e21df767b31299e873dd44e33a308e1b /libopie2/opieui | |
parent | 8e28911f7199f4450ac5eef09482069f9b9caea2 (diff) | |
download | opie-6d08277737e22b7a1527124623f3571969073ddf.zip opie-6d08277737e22b7a1527124623f3571969073ddf.tar.gz opie-6d08277737e22b7a1527124623f3571969073ddf.tar.bz2 |
Move XML class to internal PIM
Add namespaces!!!
Opie::Core and Opie::Core::Private
Opie::Net and Opie::Net::Private
Opie::Ui and Opie::Ui::Private
Opie::MM and Opie::MM::Private
Opie::DB and Opie::DB::Private
PIM classes are not yet converted because we will do other work
on it as well
48 files changed, 309 insertions, 152 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 @@ -8,4 +8,5 @@ class QWidget; -namespace Opie -{ +namespace Opie { +namespace Ui { +namespace Private{ @@ -25,3 +26,5 @@ struct OSplitterContainer -}; +} +} +} 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 @@ -37,3 +37,4 @@ -using namespace Opie; +using namespace Opie::Ui; +using namespace Opie::Ui::Private; @@ -170,3 +171,3 @@ void OSplitter::addWidget( OSplitter* split ) { - Opie::OSplitterContainer con; + OSplitterContainer con; con.widget =split; @@ -215,3 +216,3 @@ void OSplitter::addWidget( QWidget* wid, const QString& icon, const QString& lab #endif - Opie::OSplitterContainer cont; + OSplitterContainer cont; cont.widget = wid; @@ -398,3 +399,3 @@ void OSplitter::resizeEvent( QResizeEvent* res ) */ -void OSplitter::addToTab( const Opie::OSplitterContainer& con ) +void OSplitter::addToTab( const Opie::Ui::Private::OSplitterContainer& con ) { @@ -412,3 +413,3 @@ void OSplitter::addToTab( const Opie::OSplitterContainer& con ) */ -void OSplitter::addToBox( const Opie::OSplitterContainer& con ) +void OSplitter::addToBox( const Opie::Ui::Private::OSplitterContainer& con ) { @@ -547,3 +548,3 @@ void OSplitter::commonChangeBox() split->setTabWidget( 0 ); - Opie::OSplitterContainer con; + OSplitterContainer con; con.widget = split; 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 @@ -50,4 +50,4 @@ class QHBox; -namespace Opie -{ +namespace Opie{ +namespace Ui { class OTabWidget; @@ -75,3 +75,3 @@ class OSplitter : public QFrame public: - typedef QValueList<Opie::OSplitterContainer> ContainerList; + typedef QValueList<Opie::Ui::Private::OSplitterContainer> ContainerList; OSplitter( Qt::Orientation = Horizontal, QWidget *parent = 0, @@ -126,4 +126,4 @@ private: 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* ); @@ -147,3 +147,4 @@ private: }; -}; +} +} 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 @@ -34,7 +34,7 @@ -namespace { +namespace Opie { +namespace Ui { const int mode_size = 330; -} -using namespace Opie; + @@ -435 +435,4 @@ void OWidgetStack::switchTop() { } + +} +}
\ 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 @@ -37,4 +37,4 @@ class QWidgetStack; -namespace Opie -{ +namespace Opie { +namespace Ui { /** @@ -129,3 +129,4 @@ private: -}; +} +} diff --git a/libopie2/opieui/fileselector/ofiledialog.cpp b/libopie2/opieui/fileselector/ofiledialog.cpp index e7daead..beb4d6c 100644 --- a/libopie2/opieui/fileselector/ofiledialog.cpp +++ b/libopie2/opieui/fileselector/ofiledialog.cpp @@ -41,3 +41,3 @@ -using namespace Opie; +using namespace Opie::Ui; diff --git a/libopie2/opieui/fileselector/ofiledialog.h b/libopie2/opieui/fileselector/ofiledialog.h index 01a599b..dfecf3d 100644 --- a/libopie2/opieui/fileselector/ofiledialog.h +++ b/libopie2/opieui/fileselector/ofiledialog.h @@ -37,4 +37,4 @@ -namespace Opie -{ +namespace Opie { +namespace Ui { @@ -106,3 +106,4 @@ private slots: -}; +} +} diff --git a/libopie2/opieui/fileselector/ofileselector.cpp b/libopie2/opieui/fileselector/ofileselector.cpp index 15cadd4..c4d5033 100644 --- a/libopie2/opieui/fileselector/ofileselector.cpp +++ b/libopie2/opieui/fileselector/ofileselector.cpp @@ -57,4 +57,7 @@ -using namespace Opie; +using namespace Opie::Ui::Private; +namespace Opie { +namespace Ui { +namespace Private { OFileViewInterface::OFileViewInterface( OFileSelector* selector ) @@ -812,2 +815,4 @@ void OFileViewFileSystem::activate( const QString& str) + +} /* Selector */ @@ -1166 +1171,3 @@ void OFileSelector::setNameVisible( bool b ) +} +} diff --git a/libopie2/opieui/fileselector/ofileselector.h b/libopie2/opieui/fileselector/ofileselector.h index 7fa657b..2205963 100644 --- a/libopie2/opieui/fileselector/ofileselector.h +++ b/libopie2/opieui/fileselector/ofileselector.h @@ -54,7 +54,9 @@ typedef QMap<QString, QStringList> MimeTypes; -namespace Opie -{ +namespace Opie { +namespace Ui { +namespace Private { class OFileViewInterface; class OFileViewFileListView; +} @@ -75,4 +77,4 @@ class OFileSelector : public QWidget Q_OBJECT - friend class Opie::OFileViewInterface; - friend class Opie::OFileViewFileListView; + friend class Private::OFileViewInterface; + friend class Private::OFileViewFileListView; @@ -187,4 +189,4 @@ private: QWidgetStack* m_stack; // our widget stack which will contain the views - OFileViewInterface* currentView() const; // returns the currentView - OFileViewInterface* m_current; // here is the view saved + Private::OFileViewInterface* currentView() const; // returns the currentView + Private::OFileViewInterface* m_current; // here is the view saved bool m_shNew : 1; // should we show New? @@ -193,3 +195,3 @@ private: - QMap<QString, OFileViewInterface*> m_views; // QString translated view name + ViewInterface Ptr + QMap<QString, Private::OFileViewInterface*> m_views; // QString translated view name + ViewInterface Ptr QHBox* m_nameBox; // the LineEdit + Label is hold here @@ -216,3 +218,4 @@ private slots: -}; +} +} diff --git a/libopie2/opieui/fileselector/ofileselector_p.h b/libopie2/opieui/fileselector/ofileselector_p.h index 818ced9..376dc98 100644 --- a/libopie2/opieui/fileselector/ofileselector_p.h +++ b/libopie2/opieui/fileselector/ofileselector_p.h @@ -58,6 +58,6 @@ class QToolButton; -namespace Opie -{ - +namespace Opie{ +namespace Ui{ class OFileSelector; +namespace Private { @@ -188,3 +188,5 @@ private: -}; +} +} +} diff --git a/libopie2/opieui/fileselector/ofileview.h b/libopie2/opieui/fileselector/ofileview.h index 495401b..aaf56b1 100644 --- a/libopie2/opieui/fileselector/ofileview.h +++ b/libopie2/opieui/fileselector/ofileview.h @@ -39,4 +39,5 @@ class DocLnk; -namespace Opie -{ +namespace Opie { +namespace Ui { +namespace Private { @@ -92,3 +93,5 @@ public: -}; +} +} +} diff --git a/libopie2/opieui/oclickablelabel.cpp b/libopie2/opieui/oclickablelabel.cpp index 4c4e581..53cb77a 100644 --- a/libopie2/opieui/oclickablelabel.cpp +++ b/libopie2/opieui/oclickablelabel.cpp @@ -31,3 +31,3 @@ -using namespace Opie; +using namespace Opie::Ui; diff --git a/libopie2/opieui/oclickablelabel.h b/libopie2/opieui/oclickablelabel.h index b224d61..90859a0 100644 --- a/libopie2/opieui/oclickablelabel.h +++ b/libopie2/opieui/oclickablelabel.h @@ -35,4 +35,4 @@ -namespace Opie -{ +namespace Opie{ +namespace Ui { @@ -100,3 +100,4 @@ private: -}; +} +} diff --git a/libopie2/opieui/odialog.cpp b/libopie2/opieui/odialog.cpp index 4d269d4..27f8d20 100644 --- a/libopie2/opieui/odialog.cpp +++ b/libopie2/opieui/odialog.cpp @@ -34,2 +34,4 @@ +using namespace Opie::Ui; + int ODialog::mMarginSize = 5; diff --git a/libopie2/opieui/odialog.h b/libopie2/opieui/odialog.h index ceff612..57f534c 100644 --- a/libopie2/opieui/odialog.h +++ b/libopie2/opieui/odialog.h @@ -57,2 +57,5 @@ class QLayoutItem; +namespace Opie { +namespace Ui { + class ODialog : public QDialog @@ -90,2 +93,4 @@ class ODialog : public QDialog }; +} +} #endif // ODIALOG_H 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 @@ -40,6 +40,6 @@ -using namespace Opie; -namespace Opie -{ +namespace Opie { +namespace Ui { +namespace Private { @@ -58,7 +58,2 @@ public: -}; - -namespace -{ - class FontListItem : public QListBoxText @@ -97,3 +92,9 @@ private: }; +} +} +} + +using namespace Opie::Ui; +using namespace Opie::Ui::Private; @@ -109,3 +110,2 @@ static int findItemCB( QComboBox *box, const QString &str ) -} /* static same as anon. namespace */ @@ -428 +428,2 @@ void OFontSelector::resizeEvent ( QResizeEvent *re ) } + diff --git a/libopie2/opieui/ofontselector.h b/libopie2/opieui/ofontselector.h index ad51819..1d97233 100644 --- a/libopie2/opieui/ofontselector.h +++ b/libopie2/opieui/ofontselector.h @@ -37,6 +37,7 @@ class QListBox; -namespace Opie -{ - +namespace Opie { +namespace Ui { +namespace Private { class OFontSelectorPrivate; +} @@ -97,6 +98,7 @@ private: private: - OFontSelectorPrivate *d; + Private::OFontSelectorPrivate *d; }; -}; +} +} diff --git a/libopie2/opieui/oimageeffect.cpp b/libopie2/opieui/oimageeffect.cpp index 9a58bb9..be47eb2 100644 --- a/libopie2/opieui/oimageeffect.cpp +++ b/libopie2/opieui/oimageeffect.cpp @@ -43,2 +43,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. using namespace std; +using namespace Opie::Core; + +namespace Opie { +namespace Ui { @@ -3767,2 +3771,3 @@ void OImageEffect::contrastHSV(QImage &img, bool sharpen) - +} +} diff --git a/libopie2/opieui/oimageeffect.h b/libopie2/opieui/oimageeffect.h index fb4d22d..4f86d5b 100644 --- a/libopie2/opieui/oimageeffect.h +++ b/libopie2/opieui/oimageeffect.h @@ -41,2 +41,4 @@ class QColor; +namespace Opie { +namespace Ui { /** @@ -558,2 +560,5 @@ private: +} +} + #endif diff --git a/libopie2/opieui/olistview.cpp b/libopie2/opieui/olistview.cpp index 0ee2fde..38670b4 100644 --- a/libopie2/opieui/olistview.cpp +++ b/libopie2/opieui/olistview.cpp @@ -38,2 +38,7 @@ +using namespace Opie::Core; + + +namespace Opie { +namespace Ui { /*====================================================================================== @@ -757 +762,3 @@ ONamedListViewItem* ONamedListViewItem::find( const QString& column, const QStri +} +} diff --git a/libopie2/opieui/olistview.h b/libopie2/opieui/olistview.h index 59b0973..8195a62 100644 --- a/libopie2/opieui/olistview.h +++ b/libopie2/opieui/olistview.h @@ -38,2 +38,5 @@ + +namespace Opie { +namespace Ui { class OListViewItem; @@ -56,2 +59,3 @@ class OListView: public QListView { + Q_OBJECT public: @@ -141,4 +145,6 @@ class OListView: public QListView QColor m_alternateBackground; - bool m_fullWidth; + bool m_fullWidth : 1; QPen m_columnSeparator; + class Private; + Private *d; }; @@ -244,4 +250,6 @@ class OListViewItem: public QListViewItem private: - bool m_known; - bool m_odd; + bool m_known : 1; + bool m_odd : 1; + class Private; + Private *d; }; @@ -356,2 +364,5 @@ class ONamedListView: public OListView virtual ONamedListViewItem* find( const QString& column, const QString& text, int recurse = -1 ) const; + private: + class Private; + Private *d; }; @@ -405,4 +416,10 @@ class ONamedListViewItem: public OListViewItem virtual ONamedListViewItem* find( const QString& column, const QString& text, int recurse = -1 ) const; -}; + private: + class Private; + Private *d; + +}; +} +} diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro index 1be8db5..e895edc 100644 --- a/libopie2/opieui/opieui.pro +++ b/libopie2/opieui/opieui.pro @@ -8,3 +8,2 @@ HEADERS = oclickablelabel.h \ olistview.h \ - omessagebox.h \ opixmapeffect.h \ @@ -12,3 +11,2 @@ HEADERS = oclickablelabel.h \ opixmapprovider.h \ - oresource.h \ oselector.h \ @@ -33,3 +31,2 @@ SOURCES = oclickablelabel.cpp \ opixmapprovider.cpp \ - oresource.cpp \ oselector.cpp \ diff --git a/libopie2/opieui/opixmapeffect.cpp b/libopie2/opieui/opixmapeffect.cpp index 05f851d..794c7b2 100644 --- a/libopie2/opieui/opixmapeffect.cpp +++ b/libopie2/opieui/opixmapeffect.cpp @@ -19,2 +19,4 @@ + +using namespace Opie::Ui; //====================================================================== diff --git a/libopie2/opieui/opixmapeffect.h b/libopie2/opieui/opixmapeffect.h index 283fe2d..b780f9f 100644 --- a/libopie2/opieui/opixmapeffect.h +++ b/libopie2/opieui/opixmapeffect.h @@ -17,2 +17,5 @@ class QColor; + +namespace Opie { +namespace Ui { /** @@ -212,3 +215,4 @@ public: }; - +} +} diff --git a/libopie2/opieui/opixmapprovider.cpp b/libopie2/opieui/opixmapprovider.cpp index 7be9e3b..7eb67a2 100644 --- a/libopie2/opieui/opixmapprovider.cpp +++ b/libopie2/opieui/opixmapprovider.cpp @@ -22,2 +22,4 @@ +using namespace Opie::Ui; + OPixmapProvider::~OPixmapProvider() {} diff --git a/libopie2/opieui/opixmapprovider.h b/libopie2/opieui/opixmapprovider.h index 5b76647..9d9bd69 100644 --- a/libopie2/opieui/opixmapprovider.h +++ b/libopie2/opieui/opixmapprovider.h @@ -25,3 +25,6 @@ +namespace Opie { +namespace Ui { /** + * \todo make usefull * A tiny abstract class with just one method: @@ -50,4 +53,9 @@ protected: virtual void virtual_hook( int id, void* data ); +private: + class Private; + Private *d; }; +} +} diff --git a/libopie2/opieui/opopupmenu.cpp b/libopie2/opieui/opopupmenu.cpp index d5cc575..3ab8490 100644 --- a/libopie2/opieui/opopupmenu.cpp +++ b/libopie2/opieui/opopupmenu.cpp @@ -29,2 +29,5 @@ +using namespace Opie::Core; +using namespace Opie::Ui; + OPopupTitle::OPopupTitle(QWidget *parent, const char *name) diff --git a/libopie2/opieui/opopupmenu.h b/libopie2/opieui/opopupmenu.h index 54e4301..419a954 100644 --- a/libopie2/opieui/opopupmenu.h +++ b/libopie2/opieui/opopupmenu.h @@ -33,2 +33,4 @@ +namespace Opie { +namespace Ui { /** @@ -258,2 +260,5 @@ private: +} +} + #endif diff --git a/libopie2/opieui/oselector.cpp b/libopie2/opieui/oselector.cpp index 23b3ce3..5f6f10f 100644 --- a/libopie2/opieui/oselector.cpp +++ b/libopie2/opieui/oselector.cpp @@ -38,2 +38,4 @@ +using namespace Opie::Ui; + OXYSelector::OXYSelector( QWidget *parent, const char *name ) diff --git a/libopie2/opieui/oselector.h b/libopie2/opieui/oselector.h index f832239..fe75a46 100644 --- a/libopie2/opieui/oselector.h +++ b/libopie2/opieui/oselector.h @@ -29,2 +29,5 @@ + +namespace Opie { +namespace Ui { /** @@ -514,2 +517,4 @@ private: +} +} diff --git a/libopie2/opieui/oseparator.cpp b/libopie2/opieui/oseparator.cpp index b93c225..bbc4381 100644 --- a/libopie2/opieui/oseparator.cpp +++ b/libopie2/opieui/oseparator.cpp @@ -38,2 +38,4 @@ +using namespace Opie::Core; +using namespace Opie::Ui; diff --git a/libopie2/opieui/oseparator.h b/libopie2/opieui/oseparator.h index e59b3f4..6fc4344 100644 --- a/libopie2/opieui/oseparator.h +++ b/libopie2/opieui/oseparator.h @@ -37,2 +37,5 @@ +namespace Opie { +namespace Ui { + /** @@ -88,2 +91,4 @@ private: +} +} diff --git a/libopie2/opieui/otabbar.cpp b/libopie2/opieui/otabbar.cpp index cd3a34b..a62e18b 100644 --- a/libopie2/opieui/otabbar.cpp +++ b/libopie2/opieui/otabbar.cpp @@ -33,3 +33,3 @@ -using namespace Opie; +using namespace Opie::Ui; diff --git a/libopie2/opieui/otabbar.h b/libopie2/opieui/otabbar.h index 2f35c85..925ae96 100644 --- a/libopie2/opieui/otabbar.h +++ b/libopie2/opieui/otabbar.h @@ -37,4 +37,4 @@ -namespace Opie -{ +namespace Opie { +namespace Ui { @@ -82,3 +82,4 @@ private: -}; +} +} diff --git a/libopie2/opieui/otabinfo.h b/libopie2/opieui/otabinfo.h index 4a6ce14..426c45a 100644 --- a/libopie2/opieui/otabinfo.h +++ b/libopie2/opieui/otabinfo.h @@ -40,4 +40,4 @@ class QWidget; -namespace Opie -{ +namespace Opie{ +namespace Ui { @@ -137,3 +137,4 @@ typedef QList<OTabInfo> OTabInfoList; -}; +} +} diff --git a/libopie2/opieui/otabwidget.cpp b/libopie2/opieui/otabwidget.cpp index f47c90b..a9f7da9 100644 --- a/libopie2/opieui/otabwidget.cpp +++ b/libopie2/opieui/otabwidget.cpp @@ -43,3 +43,3 @@ -using namespace Opie; +using namespace Opie::Ui; diff --git a/libopie2/opieui/otabwidget.h b/libopie2/opieui/otabwidget.h index 092f22c..6a64b7d 100644 --- a/libopie2/opieui/otabwidget.h +++ b/libopie2/opieui/otabwidget.h @@ -40,3 +40,2 @@ -using namespace Opie; @@ -47,4 +46,4 @@ class QWidgetStack; -namespace Opie -{ +namespace Opie { +namespace Ui { @@ -289,3 +288,4 @@ private: -}; +} +} diff --git a/libopie2/opieui/otaskbarapplet.cpp b/libopie2/opieui/otaskbarapplet.cpp index a67356d..b5268f0 100644 --- a/libopie2/opieui/otaskbarapplet.cpp +++ b/libopie2/opieui/otaskbarapplet.cpp @@ -30,3 +30,53 @@ */ +#include <opie2/otaskbarapplet.h> + +#include <qpe/qpeapplication.h> +#include <qframe.h> + +using namespace Opie::Ui; + + +/** + * \todo no example yet!!! + * If you want to implement an Applet for the Opie Taskbar + * use this interface. + * The only specail thing about applets is that you need to build + * it as plugin/library and do EXPORT_OPIE_APPLET_v1( YourApplet ) + * at the bottom of your application. This takes care of + * the activation and implementing the TaskbarAppletInterface. + * You also need to add a static int position() functions to your + * application. + * \code + * class MyApplet : public OTaskBarApplet { + * public: + * static int position() { return 3: } + * void doStuff() { + * popup( myWidget ); + * } + * }; + * EXPORT_OPIE_APPLET_v1( MyApplet ) + * \endcode + * + * @author Michael Lauer + * @version 0.5 + * @see TaskbarAppletInterface + */ +OTaskbarApplet::OTaskbarApplet( QWidget* parent, const char* name ) + :QWidget( parent, name ){ + setFixedHeight( 18 ); + setFixedWidth( 14 ); +} + +OTaskbarApplet::~OTaskbarApplet(){ +} + +void OTaskbarApplet::popup( QWidget* widget ){ + QPoint curPos = mapToGlobal( QPoint( 0, 0 ) ); + int w = widget->sizeHint().width(); + int x = curPos.x() - (w/2 ); + if ( (x+w) > QPEApplication::desktop()->width() ) + x = QPEApplication::desktop()->width()-w; + widget->move( x, curPos.y()-widget->sizeHint().height() ); + widget->show(); +} -// Empty on purpose until we shipped Opie 1.0 (see otaskbarapplet.h for explanation) diff --git a/libopie2/opieui/otaskbarapplet.h b/libopie2/opieui/otaskbarapplet.h index 074367f..0c85ee7 100644 --- a/libopie2/opieui/otaskbarapplet.h +++ b/libopie2/opieui/otaskbarapplet.h @@ -35,3 +35,11 @@ #include <qpe/taskbarappletinterface.h> +#include <qpe/qcom.h> +#include <qwidget.h> + +class QMouseEvent; + +namespace Opie { +namespace Ui { +namespace Private { /*====================================================================================== @@ -40,2 +48,3 @@ +class OTaskbarAppletWrapperPrivate; template<class T> class OTaskbarAppletWrapper : public TaskbarAppletInterface @@ -82,10 +91,6 @@ template<class T> class OTaskbarAppletWrapper : public TaskbarAppletInterface T* _applet; + OTaskbarAppletWrapperPrivate *d; }; -#include <qframe.h> -#include <qwidget.h> -#include <qpe/qpeapplication.h> - -class QMouseEvent; - +} /*====================================================================================== @@ -105,24 +110,18 @@ class OTaskbarApplet : public QWidget public: - OTaskbarApplet( QWidget* parent, const char* name = 0 ):QWidget( parent, name ) - { - setFixedHeight( 18 ); - setFixedWidth( 14 ); - } + OTaskbarApplet( QWidget* parent, const char* name = 0 ); + virtual ~OTaskbarApplet(); - virtual ~OTaskbarApplet() - { + protected: + virtual void popup( QWidget* widget ); +private: + class Private; + Private *d; +}; +} } - protected: - virtual void popup( QWidget* widget ) - { - QPoint curPos = mapToGlobal( QPoint( 0, 0 ) ); - int w = widget->sizeHint().width(); - int x = curPos.x() - (w/2 ); - if ( (x+w) > QPEApplication::desktop()->width() ) - x = QPEApplication::desktop()->width()-w; - widget->move( x, curPos.y()-widget->sizeHint().height() ); - widget->show(); +#define EXPORT_OPIE_APPLET_v1( AppLet ) \ + Q_EXPORT_INTERFACE() { \ + Q_CREATE_INSTANCE( Opie::Ui::Private::OTaskbarAppletWrapper<AppLet> ) \ } -}; diff --git a/libopie2/opieui/otimepicker.cpp b/libopie2/opieui/otimepicker.cpp index 66f9ce0..7de0fd3 100644 --- a/libopie2/opieui/otimepicker.cpp +++ b/libopie2/opieui/otimepicker.cpp @@ -29,3 +29,7 @@ +/* OPIE */ +#include <opie2/otimepicker.h> + /* QT */ +#include <qgroupbox.h> #include <qlayout.h> @@ -33,6 +37,6 @@ -/* OPIE */ -#include <opie2/otimepicker.h> -using namespace Opie; + +namespace Opie { +namespace Ui { @@ -222,2 +226,4 @@ OTimePickerDialog::OTimePickerDialog ( QWidget* parent, const char* name, WFlags { + m_timePicker = new OTimePicker( GroupBox1, "m_timePicker" ); + GroupBox1Layout->addWidget( m_timePicker, 0, 0 ); @@ -292 +298,4 @@ void OTimePickerDialog::setMinute ( const QString& minute ) } + +} +} diff --git a/libopie2/opieui/otimepicker.h b/libopie2/opieui/otimepicker.h index 2da7773..01bb557 100644 --- a/libopie2/opieui/otimepicker.h +++ b/libopie2/opieui/otimepicker.h @@ -34,3 +34,3 @@ #include <opie2/oclickablelabel.h> -#include "otimepickerbase.h" +#include <opie2/otimepickerbase.h> @@ -42,6 +42,5 @@ -using namespace Opie; -// namespace Opie -// { +namespace Opie { +namespace Ui { @@ -116,2 +115,3 @@ public slots: private: + OTimePicker *m_timePicker; QTime m_time; @@ -121,4 +121,11 @@ private: -// }; +} +} +/* for Qt2 */ +#if ( QT_VERSION-0 >= 0x030000 ) +#error "Fix the UI File to use namespaces" +#else +typedef Opie::Ui::OTimePicker OUIOTimePicker; +#endif #endif diff --git a/libopie2/opieui/otimepickerbase.ui b/libopie2/opieui/otimepickerbase.ui index 3e7f2fb..c2eb7c5 100644 --- a/libopie2/opieui/otimepickerbase.ui +++ b/libopie2/opieui/otimepickerbase.ui @@ -13,3 +13,3 @@ <y>0</y> - <width>210</width> + <width>182</width> <height>137</height> @@ -251,16 +251,2 @@ </property> - <widget row="0" column="0" > - <class>OTimePicker</class> - <property stdset="1"> - <name>name</name> - <cstring>m_timePicker</cstring> - </property> - <property stdset="1"> - <name>sizePolicy</name> - <sizepolicy> - <hsizetype>3</hsizetype> - <vsizetype>3</vsizetype> - </sizepolicy> - </property> - </widget> </grid> @@ -269,24 +255,2 @@ </widget> -<customwidgets> - <customwidget> - <class>OTimePicker</class> - <header location="local">otimepicker.h</header> - <sizehint> - <width>-1</width> - <height>-1</height> - </sizehint> - <container>0</container> - <sizepolicy> - <hordata>7</hordata> - <verdata>1</verdata> - </sizepolicy> - <pixmap>image0</pixmap> - </customwidget> -</customwidgets> -<images> - <image> - <name>image0</name> - <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1ddec44f503c0ae2a154410f53d0ed20e2bf6bdb656dd6861dd23d9a66591b0587fd1654235ebded6f0edcd53e419d87ae7b1f4f9b8f906d0bfe012317426a70b07bdc2f3ec77f8ed6b89559061a0343d06a124cc105596482585094bc0ae599b04646c9018926491b2205e140c485cace25755c175d0a967b622ff900b8cc9c7d29af594ea722d589167f813aa852ba07d94b9dce296e883fe7bb163f23896753</data> - </image> -</images> </UI> diff --git a/libopie2/opieui/oversatileview.cpp b/libopie2/opieui/oversatileview.cpp index 78154b7..f6c6410 100644 --- a/libopie2/opieui/oversatileview.cpp +++ b/libopie2/opieui/oversatileview.cpp @@ -42,2 +42,5 @@ +using namespace Opie::Core; +using namespace Opie::Ui; + /* XPM */ diff --git a/libopie2/opieui/oversatileview.h b/libopie2/opieui/oversatileview.h index 8af21dc..61b61db 100644 --- a/libopie2/opieui/oversatileview.h +++ b/libopie2/opieui/oversatileview.h @@ -47,3 +47,2 @@ class QIconSet; class QIconViewItem; -class OListView; class QListViewItem; @@ -56,2 +55,6 @@ class QIconDragItem; +namespace Opie { +namespace Ui { +class OListView; + class OVersatileView : public QWidgetStack @@ -392,2 +395,4 @@ public: +} +} #endif diff --git a/libopie2/opieui/oversatileviewitem.cpp b/libopie2/opieui/oversatileviewitem.cpp index 66de8eb..03c6738 100644 --- a/libopie2/opieui/oversatileviewitem.cpp +++ b/libopie2/opieui/oversatileviewitem.cpp @@ -33,2 +33,4 @@ +using namespace Opie::Ui; + OVersatileViewItem::OVersatileViewItem( OVersatileView * parent ) diff --git a/libopie2/opieui/oversatileviewitem.h b/libopie2/opieui/oversatileviewitem.h index ee8ee20..c4977af 100644 --- a/libopie2/opieui/oversatileviewitem.h +++ b/libopie2/opieui/oversatileviewitem.h @@ -42,2 +42,5 @@ +namespace Opie { +namespace Ui { + class OVersatileView; @@ -99,2 +102,4 @@ class OVersatileViewItem : public OListViewItem, public QIconViewItem +} +} #endif diff --git a/libopie2/opieui/owait.cpp b/libopie2/opieui/owait.cpp index 8bb4ed6..9519888 100644 --- a/libopie2/opieui/owait.cpp +++ b/libopie2/opieui/owait.cpp @@ -40,2 +40,4 @@ +using namespace Opie::Ui; + static int frame = 0; diff --git a/libopie2/opieui/owait.h b/libopie2/opieui/owait.h index 3267064..03c33e4 100644 --- a/libopie2/opieui/owait.h +++ b/libopie2/opieui/owait.h @@ -39,2 +39,5 @@ + +namespace Opie { +namespace Ui { /** @@ -84,3 +87,4 @@ class OWait : public QDialog }; - +} +} #endif |