Diffstat (limited to 'libopie2/opiecore/oapplicationfactory.h') (more/less context) (ignore 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 @@ -54,8 +54,9 @@ #include <qtopia/qcom.h> #include <qtopia/applicationinterface.h> namespace Opie { +namespace Core { struct NullType; template <class T, class U> struct Typelist @@ -93,9 +94,8 @@ struct MakeTypelist<> { typedef NullType Result; }; -} /** * To allow your application to be quick launched some one needs * to create the QWidget. @@ -162,9 +162,9 @@ struct OPrivate { } }; template <> -struct OPrivate<Opie::NullType > { +struct OPrivate<Opie::Core::NullType > { inline static QWidget* multiFactory ( const QString& , QWidget* , const char* , Qt::WFlags ) { return 0l; } @@ -187,9 +187,9 @@ struct OPrivate <Opie::NullType, Opie::NullType > { }; */ 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 ); @@ -227,9 +227,9 @@ struct OPrivate< Opie::Typelist<Product, ProductListTail> > { * 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; @@ -241,19 +241,21 @@ struct OApplicationFactory< Opie::Typelist<Product, ProductListTail > > 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 ) } |