summaryrefslogtreecommitdiff
authorzecke <zecke>2004-11-03 22:46:40 (UTC)
committer zecke <zecke>2004-11-03 22:46:40 (UTC)
commitc85842bfd4b008eb6bd7527f0511f36dbf693ba5 (patch) (unidiff)
treead58890264a783108700f019a69f9e672f856780
parent3c446259f59c03abe2a64b2eba9a65cb11a81a1b (diff)
downloadopie-c85842bfd4b008eb6bd7527f0511f36dbf693ba5.zip
opie-c85842bfd4b008eb6bd7527f0511f36dbf693ba5.tar.gz
opie-c85842bfd4b008eb6bd7527f0511f36dbf693ba5.tar.bz2
Construct a OApplication instead of a QPEApplication
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/tools/quicklauncher/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/tools/quicklauncher/main.cpp b/core/tools/quicklauncher/main.cpp
index 286aed2..5f0d80b 100644
--- a/core/tools/quicklauncher/main.cpp
+++ b/core/tools/quicklauncher/main.cpp
@@ -10,33 +10,33 @@
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#define QTOPIA_INTERNAL_INITAPP 21#define QTOPIA_INTERNAL_INITAPP
22#include "dropins.h" 22#include "dropins.h"
23 23
24/* OPIE */ 24/* OPIE */
25#include <opie2/odebug.h> 25#include <opie2/odebug.h>
26using namespace Opie::Core; 26#include <opie2/oapplication.h>
27 27
28/* QT */ 28/* QT */
29#include <qpainter.h> 29#include <qpainter.h>
30#include <qstrlist.h> 30#include <qstrlist.h>
31#include <qtimer.h> 31#include <qtimer.h>
32#include <qguardedptr.h> 32#include <qguardedptr.h>
33#include <qcopchannel_qws.h> 33#include <qcopchannel_qws.h>
34 34
35#ifdef private 35#ifdef private
36# undef private 36# undef private
37#endif 37#endif
38#define private public 38#define private public
39#include <qtopia/qpeapplication.h> 39#include <qtopia/qpeapplication.h>
40#undef private 40#undef private
41 41
42/* STD */ 42/* STD */
@@ -176,33 +176,33 @@ private:
176 setproctitle(myargv[0]); 176 setproctitle(myargv[0]);
177 prctl( PR_SET_NAME, (unsigned long)myargv[0], 0, 0, 0 ); 177 prctl( PR_SET_NAME, (unsigned long)myargv[0], 0, 0, 0 );
178#endif 178#endif
179 179
180 connect(app, SIGNAL(lastWindowClosed()), app, SLOT(hideOrQuit())); 180 connect(app, SIGNAL(lastWindowClosed()), app, SLOT(hideOrQuit()));
181 app->exit_loop(); 181 app->exit_loop();
182 app->initApp( myargc, myargv ); 182 app->initApp( myargc, myargv );
183 exec( myargc, myargv ); 183 exec( myargc, myargv );
184 } 184 }
185 185
186private: 186private:
187 QCopChannel *qlChannel; 187 QCopChannel *qlChannel;
188}; 188};
189 189
190int main( int argc, char** argv ) 190int main( int argc, char** argv )
191{ 191{
192 app = new QPEApplication( argc, argv ); 192 app = new Opie::Core::OApplication( argc, argv );
193 193
194 loader = new PluginLoader( "application" ); 194 loader = new PluginLoader( "application" );
195 195
196 unsetenv( "LD_BIND_NOW" ); 196 unsetenv( "LD_BIND_NOW" );
197 197
198 QCString arg0 = argv[0]; 198 QCString arg0 = argv[0];
199 int sep = arg0.findRev( '/' ); 199 int sep = arg0.findRev( '/' );
200 200
201 if ( sep > 0 ) 201 if ( sep > 0 )
202 arg0 = arg0.mid( sep+1 ); 202 arg0 = arg0.mid( sep+1 );
203 203
204 if ( arg0 != "quicklauncher" ) { 204 if ( arg0 != "quicklauncher" ) {
205 odebug << "QuickLauncher invoked as: " << arg0.data() << oendl; 205 odebug << "QuickLauncher invoked as: " << arg0.data() << oendl;
206 QuickLauncher::exec( argc, argv ); 206 QuickLauncher::exec( argc, argv );
207 } else { 207 } else {
208#ifdef _OS_LINUX_ 208#ifdef _OS_LINUX_