summaryrefslogtreecommitdiff
path: root/libopie2
Side-by-side diff
Diffstat (limited to 'libopie2') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/oapplicationfactory.h14
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
@@ -57,2 +57,3 @@
namespace Opie {
+namespace Core {
struct NullType;
@@ -96,3 +97,2 @@ struct MakeTypelist<>
-}
@@ -165,3 +165,3 @@ struct OPrivate {
template <>
-struct OPrivate<Opie::NullType > {
+struct OPrivate<Opie::Core::NullType > {
inline static QWidget* multiFactory ( const QString& , QWidget* ,
@@ -190,3 +190,3 @@ 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,
@@ -230,3 +230,3 @@ 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 {
@@ -244,3 +244,3 @@ struct OApplicationFactory< Opie::Typelist<Product, ProductListTail > >
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 );
}
@@ -249,3 +249,3 @@ struct OApplicationFactory< Opie::Typelist<Product, ProductListTail > >
QStringList _list;
- return OPrivate< Opie::Typelist<Product, ProductListTail> >::multiString( _list );
+ return OPrivate< Opie::Core::Typelist<Product, ProductListTail> >::multiString( _list );
}
@@ -255,2 +255,4 @@ struct OApplicationFactory< Opie::Typelist<Product, ProductListTail > >
+}
+}