From cf61e44678f1b74e97c61e57ffb63a7bcf794577 Mon Sep 17 00:00:00 2001 From: zecke Date: Sat, 13 Mar 2004 20:18:55 +0000 Subject: Change OApplicationFactory to be in Opie::Core as well --- 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 @@ -55,6 +55,7 @@ #include namespace Opie { +namespace Core { struct NullType; template @@ -94,7 +95,6 @@ struct MakeTypelist<> typedef NullType Result; }; -} /** * To allow your application to be quick launched some one needs @@ -163,7 +163,7 @@ struct OPrivate { }; template <> -struct OPrivate { +struct OPrivate { inline static QWidget* multiFactory ( const QString& , QWidget* , const char* , Qt::WFlags ) { return 0l; @@ -188,7 +188,7 @@ struct OPrivate { */ template -struct OPrivate< Opie::Typelist > { +struct OPrivate< Opie::Core::Typelist > { inline static QWidget* multiFactory( const QString& appName, QWidget* parent, const char* name, Qt::WFlags fl) { QWidget* wid = OPrivate::multiFactory( appName, parent, name, fl ); @@ -228,7 +228,7 @@ struct OPrivate< Opie::Typelist > { */ template -struct OApplicationFactory< Opie::Typelist > +struct OApplicationFactory< Opie::Core::Typelist > : ApplicationInterface { QRESULT queryInterface( const QUuid &uuid, QUnknownInterface **iface ) { *iface = 0; @@ -242,17 +242,19 @@ struct OApplicationFactory< Opie::Typelist > QWidget* createMainWindow ( const QString& appName, QWidget* parent, const char* name, Qt::WFlags fl ) { qWarning("StringList is %s", applications().join(":").latin1() ); - return OPrivate< Opie::Typelist >::multiFactory( appName, parent, name, fl ); + return OPrivate< Opie::Core::Typelist >::multiFactory( appName, parent, name, fl ); } QStringList applications()const { QStringList _list; - return OPrivate< Opie::Typelist >::multiString( _list ); + return OPrivate< Opie::Core::Typelist >::multiString( _list ); } Q_REFCOUNT }; +} +} /* If the library version should be build */ #ifdef OPIE_APP_INTERFACE -- cgit v0.9.0.2