| -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 @@ -56,4 +56,5 @@ namespace Opie { +namespace Core { struct NullType; @@ -95,5 +96,4 @@ struct MakeTypelist<> }; -} /** @@ -164,5 +164,5 @@ struct OPrivate { template <> -struct OPrivate<Opie::NullType > { +struct OPrivate<Opie::Core::NullType > { inline static QWidget* multiFactory ( const QString& , QWidget* , const char* , Qt::WFlags ) { @@ -189,5 +189,5 @@ 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) { @@ -229,5 +229,5 @@ struct OPrivate< Opie::Typelist<Product, ProductListTail> > { 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 ) { @@ -243,10 +243,10 @@ struct OApplicationFactory< Opie::Typelist<Product, ProductListTail > > 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 ); } @@ -254,4 +254,6 @@ struct OApplicationFactory< Opie::Typelist<Product, ProductListTail > > }; +} +} /* If the library version should be build */ |