-rw-r--r-- | libopie2/opiecore/oapplicationfactory.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libopie2/opiecore/oapplicationfactory.h b/libopie2/opiecore/oapplicationfactory.h index 8516565..8cb0ddd 100644 --- a/libopie2/opiecore/oapplicationfactory.h +++ b/libopie2/opiecore/oapplicationfactory.h | |||
@@ -41,32 +41,34 @@ | |||
41 | permission notice appear in supporting documentation. | 41 | permission notice appear in supporting documentation. |
42 | The author or Addison-Welsey Longman make no representations about the | 42 | The author or Addison-Welsey Longman make no representations about the |
43 | suitability of this software for any purpose. It is provided "as is" | 43 | suitability of this software for any purpose. It is provided "as is" |
44 | without express or implied warranty. | 44 | without express or implied warranty. |
45 | ---- | 45 | ---- |
46 | 46 | ||
47 | And KGenericFactor et all from Simon Hausmann <tronical@kde.org> | 47 | And KGenericFactor et all from Simon Hausmann <tronical@kde.org> |
48 | 48 | ||
49 | */ | 49 | */ |
50 | 50 | ||
51 | #include <qstring.h> | 51 | #include <qstring.h> |
52 | #include <qmetaobject.h> | 52 | #include <qmetaobject.h> |
53 | 53 | ||
54 | #include <qtopia/qcom.h> | 54 | #include <qtopia/qcom.h> |
55 | #include <qtopia/applicationinterface.h> | 55 | #include <qtopia/applicationinterface.h> |
56 | 56 | ||
57 | #include <opie2/odebug.h> | ||
58 | |||
57 | namespace Opie { | 59 | namespace Opie { |
58 | namespace Core { | 60 | namespace Core { |
59 | struct NullType; | 61 | struct NullType; |
60 | 62 | ||
61 | template <class T, class U> | 63 | template <class T, class U> |
62 | struct Typelist | 64 | struct Typelist |
63 | { | 65 | { |
64 | typedef T Head; | 66 | typedef T Head; |
65 | typedef U Tail; | 67 | typedef U Tail; |
66 | }; | 68 | }; |
67 | template< | 69 | template< |
68 | typename T1 = NullType, typename T2 = NullType, typename T3 = NullType, | 70 | typename T1 = NullType, typename T2 = NullType, typename T3 = NullType, |
69 | typename T4 = NullType, typename T5 = NullType, typename T6 = NullType, | 71 | typename T4 = NullType, typename T5 = NullType, typename T6 = NullType, |
70 | typename T7 = NullType, typename T8 = NullType, typename T9 = NullType, | 72 | typename T7 = NullType, typename T8 = NullType, typename T9 = NullType, |
71 | typename T10 = NullType, typename T11 = NullType, typename T12 = NullType, | 73 | typename T10 = NullType, typename T11 = NullType, typename T12 = NullType, |
72 | typename T13 = NullType, typename T14 = NullType, typename T15 = NullType, | 74 | typename T13 = NullType, typename T14 = NullType, typename T15 = NullType, |
@@ -115,34 +117,39 @@ struct OApplicationFactory : public ApplicationInterface { | |||
115 | QRESULT queryInterface( const QUuid &uuid, QUnknownInterface **iface ) { | 117 | QRESULT queryInterface( const QUuid &uuid, QUnknownInterface **iface ) { |
116 | *iface = 0; | 118 | *iface = 0; |
117 | if ( uuid == IID_QUnknown ) *iface = this; | 119 | if ( uuid == IID_QUnknown ) *iface = this; |
118 | else if ( uuid == IID_QtopiaApplication ) *iface = this; | 120 | else if ( uuid == IID_QtopiaApplication ) *iface = this; |
119 | else return QS_FALSE; | 121 | else return QS_FALSE; |
120 | (*iface)->addRef(); | 122 | (*iface)->addRef(); |
121 | return QS_OK; | 123 | return QS_OK; |
122 | } | 124 | } |
123 | 125 | ||
124 | /* | 126 | /* |
125 | * | 127 | * |
126 | */ | 128 | */ |
127 | virtual QWidget *createMainWindow( const QString& appName, QWidget* parent, | 129 | virtual QWidget *createMainWindow( const QString& appName, QWidget* parent, |
128 | const char* name, Qt::WFlags f ) { | 130 | const char* name, Qt::WFlags f ) { |
129 | if (appName == Product::appName() ) | 131 | if (appName == Product::appName() ) |
130 | return new Product(parent, name, f ); | 132 | return new Product(parent, name, f ); |
131 | else | 133 | else{ |
134 | odebug << "Application Name = " << appName.latin1() << oendl; | ||
135 | odebug << "ProductName = " << Product::appName().latin1() << oendl; | ||
136 | odebug << "The application name is not equal to the product name!" << oendl; | ||
137 | odebug << "Please compare TARGET entry in the project file (*.pro) and the call of the OApplicationFactory< productName >" << oendl; | ||
132 | return 0l; | 138 | return 0l; |
139 | } | ||
133 | } | 140 | } |
134 | 141 | ||
135 | virtual QStringList applications()const { | 142 | virtual QStringList applications()const { |
136 | QStringList list; | 143 | QStringList list; |
137 | list << Product::appName() ; | 144 | list << Product::appName() ; |
138 | 145 | ||
139 | return list; | 146 | return list; |
140 | } | 147 | } |
141 | Q_REFCOUNT | 148 | Q_REFCOUNT |
142 | 149 | ||
143 | }; | 150 | }; |
144 | 151 | ||
145 | 152 | ||
146 | /* Internal */ | 153 | /* Internal */ |
147 | 154 | ||
148 | template< class Product > | 155 | template< class Product > |