author | zecke <zecke> | 2004-03-13 20:18:55 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-13 20:18:55 (UTC) |
commit | cf61e44678f1b74e97c61e57ffb63a7bcf794577 (patch) (side-by-side diff) | |
tree | 2a85e577d92a818447d866c70460196d2fc8c32f /libopie2/opiecore/oapplicationfactory.h | |
parent | 6d08277737e22b7a1527124623f3571969073ddf (diff) | |
download | opie-cf61e44678f1b74e97c61e57ffb63a7bcf794577.zip opie-cf61e44678f1b74e97c61e57ffb63a7bcf794577.tar.gz opie-cf61e44678f1b74e97c61e57ffb63a7bcf794577.tar.bz2 |
Change OApplicationFactory to be in Opie::Core as well
Diffstat (limited to 'libopie2/opiecore/oapplicationfactory.h') (more/less context) (show whitespace changes)
-rw-r--r-- | libopie2/opiecore/oapplicationfactory.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libopie2/opiecore/oapplicationfactory.h b/libopie2/opiecore/oapplicationfactory.h index 6e10552..4518174 100644 --- a/libopie2/opiecore/oapplicationfactory.h +++ b/libopie2/opiecore/oapplicationfactory.h @@ -52,12 +52,13 @@ #include <qmetaobject.h> #include <qtopia/qcom.h> #include <qtopia/applicationinterface.h> namespace Opie { +namespace Core { struct NullType; template <class T, class U> struct Typelist { typedef T Head; @@ -91,13 +92,12 @@ public: template<> struct MakeTypelist<> { typedef NullType Result; }; -} /** * To allow your application to be quick launched some one needs * to create the QWidget. * This is this factory. Make surce your widget has static QString Widget::appName() * as one of its functions. @@ -160,13 +160,13 @@ struct OPrivate { list << Product::appName(); return list; } }; template <> -struct OPrivate<Opie::NullType > { +struct OPrivate<Opie::Core::NullType > { inline static QWidget* multiFactory ( const QString& , QWidget* , const char* , Qt::WFlags ) { return 0l; } inline static QStringList multiString( const QStringList& _list ) { return _list; @@ -185,13 +185,13 @@ struct OPrivate <Opie::NullType, Opie::NullType > { return _list; } }; */ template <class Product, class ProductListTail> -struct OPrivate< Opie::Typelist<Product, ProductListTail> > { +struct OPrivate< Opie::Core::Typelist<Product, ProductListTail> > { inline static QWidget* multiFactory( const QString& appName, QWidget* parent, const char* name, Qt::WFlags fl) { QWidget* wid = OPrivate<Product>::multiFactory( appName, parent, name, fl ); if (!wid ) wid = OPrivate<ProductListTail>::multiFactory( appName, parent, name, fl ); @@ -225,13 +225,13 @@ struct OPrivate< Opie::Typelist<Product, ProductListTail> > { * * typedef Opie::MakeTypeList<MyWidget, MyDialog, MyMediaPlayer >::Result MyTypes; * OPIE_EXPORT_APP( OApplicationFactory<MyTypes> ) */ template<class Product, class ProductListTail> -struct OApplicationFactory< Opie::Typelist<Product, ProductListTail > > +struct OApplicationFactory< Opie::Core::Typelist<Product, ProductListTail > > : ApplicationInterface { QRESULT queryInterface( const QUuid &uuid, QUnknownInterface **iface ) { *iface = 0; if ( uuid == IID_QUnknown ) *iface = this; else if ( uuid ==IID_QtopiaApplication ) *iface = this; else return QS_FALSE; @@ -239,23 +239,25 @@ struct OApplicationFactory< Opie::Typelist<Product, ProductListTail > > return QS_OK; } QWidget* createMainWindow ( const QString& appName, QWidget* parent, const char* name, Qt::WFlags fl ) { qWarning("StringList is %s", applications().join(":").latin1() ); - return OPrivate< Opie::Typelist<Product, ProductListTail > >::multiFactory( appName, parent, name, fl ); + return OPrivate< Opie::Core::Typelist<Product, ProductListTail > >::multiFactory( appName, parent, name, fl ); } QStringList applications()const { QStringList _list; - return OPrivate< Opie::Typelist<Product, ProductListTail> >::multiString( _list ); + return OPrivate< Opie::Core::Typelist<Product, ProductListTail> >::multiString( _list ); } Q_REFCOUNT }; +} +} /* If the library version should be build */ #ifdef OPIE_APP_INTERFACE #define OPIE_EXPORT_APP( factory ) Q_EXPORT_INTERFACE() { Q_CREATE_INSTANCE( factory ) } #else |