-rw-r--r-- | libopie2/opiecore/oapplicationfactory.h | 2 | ||||
-rw-r--r-- | libopie2/opiecore/oprocess.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libopie2/opiecore/oapplicationfactory.h b/libopie2/opiecore/oapplicationfactory.h index cabaf79..8516565 100644 --- a/libopie2/opiecore/oapplicationfactory.h +++ b/libopie2/opiecore/oapplicationfactory.h | |||
@@ -202,49 +202,49 @@ struct OPrivate< Opie::Core::Typelist<Product, ProductListTail> > { | |||
202 | inline static QStringList multiString( const QStringList& _list ) { | 202 | inline static QStringList multiString( const QStringList& _list ) { |
203 | QStringList list = _list; | 203 | QStringList list = _list; |
204 | 204 | ||
205 | list = OPrivate<Product>::multiString( list ); | 205 | list = OPrivate<Product>::multiString( list ); |
206 | list = OPrivate<ProductListTail>::multiString( list ); | 206 | list = OPrivate<ProductListTail>::multiString( list ); |
207 | 207 | ||
208 | return list; | 208 | return list; |
209 | } | 209 | } |
210 | }; | 210 | }; |
211 | 211 | ||
212 | 212 | ||
213 | 213 | ||
214 | 214 | ||
215 | 215 | ||
216 | 216 | ||
217 | 217 | ||
218 | 218 | ||
219 | /* Internal END */ | 219 | /* Internal END */ |
220 | 220 | ||
221 | /* | 221 | /* |
222 | * If you want to export more than one Widget use that function | 222 | * If you want to export more than one Widget use that function |
223 | * Make sure all your Widgets provide the appName() static method | 223 | * Make sure all your Widgets provide the appName() static method |
224 | * otherwise you'll get a compiler error | 224 | * otherwise you'll get a compiler error |
225 | * | 225 | * |
226 | * typedef Opie::MakeTypeList<MyWidget, MyDialog, MyMediaPlayer >::Result MyTypes; | 226 | * typedef Opie::Core::MakeTypelist<MyWidget, MyDialog, MyMediaPlayer >::Result MyTypes; |
227 | * OPIE_EXPORT_APP( OApplicationFactory<MyTypes> ) | 227 | * OPIE_EXPORT_APP( OApplicationFactory<MyTypes> ) |
228 | */ | 228 | */ |
229 | 229 | ||
230 | template<class Product, class ProductListTail> | 230 | template<class Product, class ProductListTail> |
231 | struct OApplicationFactory< Opie::Core::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; |
235 | if ( uuid == IID_QUnknown ) *iface = this; | 235 | if ( uuid == IID_QUnknown ) *iface = this; |
236 | else if ( uuid ==IID_QtopiaApplication ) *iface = this; | 236 | else if ( uuid ==IID_QtopiaApplication ) *iface = this; |
237 | else return QS_FALSE; | 237 | else return QS_FALSE; |
238 | (*iface)->addRef(); | 238 | (*iface)->addRef(); |
239 | return QS_OK; | 239 | return QS_OK; |
240 | } | 240 | } |
241 | 241 | ||
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::Core::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::Core::Typelist<Product, ProductListTail> >::multiString( _list ); | 250 | return OPrivate< Opie::Core::Typelist<Product, ProductListTail> >::multiString( _list ); |
diff --git a/libopie2/opiecore/oprocess.h b/libopie2/opiecore/oprocess.h index ac6be98..23e9b10 100644 --- a/libopie2/opiecore/oprocess.h +++ b/libopie2/opiecore/oprocess.h | |||
@@ -80,50 +80,50 @@ class OProcessPrivate; | |||
80 | *Since this signal is @em not emitted from within a UN*X | 80 | *Since this signal is @em not emitted from within a UN*X |
81 | *signal handler, arbitrary function calls can be made. | 81 | *signal handler, arbitrary function calls can be made. |
82 | * | 82 | * |
83 | *Be aware: When the OProcess objects gets destructed, the child | 83 | *Be aware: When the OProcess objects gets destructed, the child |
84 | *process will be killed if it is still running! | 84 | *process will be killed if it is still running! |
85 | *This means in particular, that you cannot use a OProcess on the stack | 85 | *This means in particular, that you cannot use a OProcess on the stack |
86 | *with OProcess::NotifyOnExit. | 86 | *with OProcess::NotifyOnExit. |
87 | * | 87 | * |
88 | *@li OProcess::Block -- The child process starts and the parent process | 88 | *@li OProcess::Block -- The child process starts and the parent process |
89 | *is suspended until the child process exits. (@em Really not recommended | 89 | *is suspended until the child process exits. (@em Really not recommended |
90 | *for programs with a GUI.) | 90 | *for programs with a GUI.) |
91 | * | 91 | * |
92 | *OProcess also provides several functions for determining the exit status | 92 | *OProcess also provides several functions for determining the exit status |
93 | *and the pid of the child process it represents. | 93 | *and the pid of the child process it represents. |
94 | * | 94 | * |
95 | *Furthermore it is possible to supply command-line arguments to the process | 95 | *Furthermore it is possible to supply command-line arguments to the process |
96 | *in a clean fashion (no null -- terminated stringlists and such...) | 96 | *in a clean fashion (no null -- terminated stringlists and such...) |
97 | * | 97 | * |
98 | *A small usage example: | 98 | *A small usage example: |
99 | *<pre> | 99 | *<pre> |
100 | *OProcess *proc = new OProcess; | 100 | *OProcess *proc = new OProcess; |
101 | * | 101 | * |
102 | **proc << "my_executable"; | 102 | **proc << "my_executable"; |
103 | **proc << "These" << "are" << "the" << "command" << "line" << "args"; | 103 | **proc << "These" << "are" << "the" << "command" << "line" << "args"; |
104 | *QApplication::connect(proc, SIGNAL(processExited(Opie::Core::OProcess *)), | 104 | *QObject::connect(proc, SIGNAL(processExited(Opie::Core::OProcess *)), |
105 | * pointer_to_my_object, SLOT(my_objects_slot(Opie::Core::OProcess *))); | 105 | * pointer_to_my_object, SLOT(my_objects_slot(Opie::Core::OProcess *))); |
106 | *proc->start(); | 106 | *proc->start(); |
107 | *</pre> | 107 | *</pre> |
108 | * | 108 | * |
109 | *This will start "my_executable" with the commandline arguments "These"... | 109 | *This will start "my_executable" with the commandline arguments "These"... |
110 | * | 110 | * |
111 | *When the child process exits, the respective Qt signal will be emitted. | 111 | *When the child process exits, the respective Qt signal will be emitted. |
112 | * | 112 | * |
113 | *@par Communication with the child process | 113 | *@par Communication with the child process |
114 | * | 114 | * |
115 | *OProcess supports communication with the child process through | 115 | *OProcess supports communication with the child process through |
116 | *stdin/stdout/stderr. | 116 | *stdin/stdout/stderr. |
117 | * | 117 | * |
118 | *The following functions are provided for getting data from the child | 118 | *The following functions are provided for getting data from the child |
119 | *process or sending data to the child's stdin (For more information, | 119 | *process or sending data to the child's stdin (For more information, |
120 | *have a look at the documentation of each function): | 120 | *have a look at the documentation of each function): |
121 | * | 121 | * |
122 | *@li bool @ref writeStdin(char *buffer, int buflen); | 122 | *@li bool @ref writeStdin(char *buffer, int buflen); |
123 | *@li -- Transmit data to the child process's stdin. | 123 | *@li -- Transmit data to the child process's stdin. |
124 | * | 124 | * |
125 | *@li bool @ref closeStdin(); | 125 | *@li bool @ref closeStdin(); |
126 | *@li -- Closes the child process's stdin (which causes it to see an feof(stdin)). | 126 | *@li -- Closes the child process's stdin (which causes it to see an feof(stdin)). |
127 | *Returns false if you try to close stdin for a process that has been started | 127 | *Returns false if you try to close stdin for a process that has been started |
128 | *without a communication channel to stdin. | 128 | *without a communication channel to stdin. |
129 | * | 129 | * |