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 | |||
@@ -56,4 +56,5 @@ | |||
56 | 56 | ||
57 | namespace Opie { | 57 | namespace Opie { |
58 | namespace Core { | ||
58 | struct NullType; | 59 | struct NullType; |
59 | 60 | ||
@@ -95,5 +96,4 @@ struct MakeTypelist<> | |||
95 | }; | 96 | }; |
96 | 97 | ||
97 | } | ||
98 | 98 | ||
99 | /** | 99 | /** |
@@ -164,5 +164,5 @@ struct OPrivate { | |||
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 ) { |
@@ -189,5 +189,5 @@ struct OPrivate <Opie::NullType, Opie::NullType > { | |||
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) { |
@@ -229,5 +229,5 @@ struct OPrivate< Opie::Typelist<Product, ProductListTail> > { | |||
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 ) { |
@@ -243,10 +243,10 @@ struct OApplicationFactory< Opie::Typelist<Product, ProductListTail > > | |||
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 | ||
@@ -254,4 +254,6 @@ struct OApplicationFactory< Opie::Typelist<Product, ProductListTail > > | |||
254 | }; | 254 | }; |
255 | 255 | ||
256 | } | ||
257 | } | ||
256 | 258 | ||
257 | /* If the library version should be build */ | 259 | /* If the library version should be build */ |