author | zecke <zecke> | 2004-03-13 20:18:55 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-13 20:18:55 (UTC) |
commit | cf61e44678f1b74e97c61e57ffb63a7bcf794577 (patch) (unidiff) | |
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 | |||
@@ -55,6 +55,7 @@ | |||
55 | #include <qtopia/applicationinterface.h> | 55 | #include <qtopia/applicationinterface.h> |
56 | 56 | ||
57 | namespace Opie { | 57 | namespace Opie { |
58 | namespace Core { | ||
58 | struct NullType; | 59 | struct NullType; |
59 | 60 | ||
60 | template <class T, class U> | 61 | template <class T, class U> |
@@ -94,7 +95,6 @@ struct MakeTypelist<> | |||
94 | typedef NullType Result; | 95 | typedef NullType Result; |
95 | }; | 96 | }; |
96 | 97 | ||
97 | } | ||
98 | 98 | ||
99 | /** | 99 | /** |
100 | * To allow your application to be quick launched some one needs | 100 | * To allow your application to be quick launched some one needs |
@@ -163,7 +163,7 @@ struct OPrivate { | |||
163 | }; | 163 | }; |
164 | 164 | ||
165 | template <> | 165 | template <> |
166 | struct OPrivate<Opie::NullType > { | 166 | struct OPrivate<Opie::Core::NullType > { |
167 | inline static QWidget* multiFactory ( const QString& , QWidget* , | 167 | inline static QWidget* multiFactory ( const QString& , QWidget* , |
168 | const char* , Qt::WFlags ) { | 168 | const char* , Qt::WFlags ) { |
169 | return 0l; | 169 | return 0l; |
@@ -188,7 +188,7 @@ struct OPrivate <Opie::NullType, Opie::NullType > { | |||
188 | */ | 188 | */ |
189 | 189 | ||
190 | template <class Product, class ProductListTail> | 190 | template <class Product, class ProductListTail> |
191 | struct OPrivate< Opie::Typelist<Product, ProductListTail> > { | 191 | struct OPrivate< Opie::Core::Typelist<Product, ProductListTail> > { |
192 | inline static QWidget* multiFactory( const QString& appName, QWidget* parent, | 192 | inline static QWidget* multiFactory( const QString& appName, QWidget* parent, |
193 | const char* name, Qt::WFlags fl) { | 193 | const char* name, Qt::WFlags fl) { |
194 | QWidget* wid = OPrivate<Product>::multiFactory( appName, parent, name, fl ); | 194 | QWidget* wid = OPrivate<Product>::multiFactory( appName, parent, name, fl ); |
@@ -228,7 +228,7 @@ struct OPrivate< Opie::Typelist<Product, ProductListTail> > { | |||
228 | */ | 228 | */ |
229 | 229 | ||
230 | template<class Product, class ProductListTail> | 230 | template<class Product, class ProductListTail> |
231 | struct OApplicationFactory< Opie::Typelist<Product, ProductListTail > > | 231 | struct OApplicationFactory< Opie::Core::Typelist<Product, ProductListTail > > |
232 | : ApplicationInterface { | 232 | : ApplicationInterface { |
233 | QRESULT queryInterface( const QUuid &uuid, QUnknownInterface **iface ) { | 233 | QRESULT queryInterface( const QUuid &uuid, QUnknownInterface **iface ) { |
234 | *iface = 0; | 234 | *iface = 0; |
@@ -242,17 +242,19 @@ struct OApplicationFactory< Opie::Typelist<Product, ProductListTail > > | |||
242 | QWidget* createMainWindow ( const QString& appName, QWidget* parent, | 242 | QWidget* createMainWindow ( const QString& appName, QWidget* parent, |
243 | const char* name, Qt::WFlags fl ) { | 243 | const char* name, Qt::WFlags fl ) { |
244 | qWarning("StringList is %s", applications().join(":").latin1() ); | 244 | qWarning("StringList is %s", applications().join(":").latin1() ); |
245 | return OPrivate< Opie::Typelist<Product, ProductListTail > >::multiFactory( appName, parent, name, fl ); | 245 | return OPrivate< Opie::Core::Typelist<Product, ProductListTail > >::multiFactory( appName, parent, name, fl ); |
246 | } | 246 | } |
247 | 247 | ||
248 | QStringList applications()const { | 248 | QStringList applications()const { |
249 | QStringList _list; | 249 | QStringList _list; |
250 | return OPrivate< Opie::Typelist<Product, ProductListTail> >::multiString( _list ); | 250 | return OPrivate< Opie::Core::Typelist<Product, ProductListTail> >::multiString( _list ); |
251 | } | 251 | } |
252 | 252 | ||
253 | Q_REFCOUNT | 253 | Q_REFCOUNT |
254 | }; | 254 | }; |
255 | 255 | ||
256 | } | ||
257 | } | ||
256 | 258 | ||
257 | /* If the library version should be build */ | 259 | /* If the library version should be build */ |
258 | #ifdef OPIE_APP_INTERFACE | 260 | #ifdef OPIE_APP_INTERFACE |