1 files changed, 9 insertions, 6 deletions

diff --git a/core/tools/quicklauncher/main.cpp b/core/tools/quicklauncher/main.cpp
index b1befce..fb2ca44 100644
--- a/core/tools/quicklauncher/main.cpp
+++ b/core/tools/quicklauncher/main.cpp
@@ -70,24 +70,25 @@ void setproctitle (const char *fmt,...) {
     if (!argv0)
     return;
 
     va_start(ap, fmt);
     (void) vsnprintf(buf, SPT_BUFSIZE, fmt, ap);
     va_end(ap);
 
     i = strlen (buf);
     if (i > argv_lth - 2) {
     i = argv_lth - 2;
     buf[i] = '\0';
     }
+
     memset(argv0[0], '\0', argv_lth);       /* clear the memory area */
     (void) strcpy (argv0[0], buf);
 
     argv0[1] = NULL;
 }
 #endif
 
 
 class QuickLauncher : public QObject
 {
     Q_OBJECT
 public:
@@ -102,24 +103,25 @@ public:
 
     static void exec( int /*argc*/, char **argv )
     {
     QString appName = argv[0];
     int sep = appName.findRev( '/' );
     if ( sep > 0 )
         appName = appName.mid( sep+1 );
 
     appIface = 0;
     if ( loader->queryInterface(appName, IID_QtopiaApplication, (QUnknownInterface**)&appIface) == QS_OK ) {
         mainWindow = appIface->createMainWindow( appName );
     }
+
     if ( mainWindow ) {
         if ( mainWindow->metaObject()->slotNames().contains("setDocument(const QString&)") ) {
         app->showMainDocumentWidget( mainWindow );
         } else {
         app->showMainWidget( mainWindow );
         }
     } else {
         owarn << "Could not create application main window" << oendl;
         exit(-1);
     }
     }
 
@@ -145,28 +147,30 @@ private slots:
         QStrList argList;
         argList.append( arg.utf8() );
         doQuickLaunch( argList );
         delete this;
     }
     }
 
 private:
     void doQuickLaunch( QStrList &argList )
     {
     static int myargc = argList.count();
     static char **myargv = new char *[myargc + 1];
+
     for ( int j = 0; j < myargc; j++ ) {
         myargv[j] = new char [strlen(argList.at(j))+1];
         strcpy( myargv[j], argList.at(j) );
     }
+
     myargv[myargc] = NULL;
 #ifdef _OS_LINUX_
     // Change name of process
     setproctitle(myargv[0]);
 #endif
 
     connect(app, SIGNAL(lastWindowClosed()), app, SLOT(hideOrQuit()));
     app->exit_loop();
     app->initApp( myargc, myargv );
     exec( myargc, myargv );
     }
 
@@ -175,26 +179,28 @@ private:
 };
 
 int main( int argc, char** argv )
 {
     app = new QPEApplication( argc, argv );
 
     loader = new PluginLoader( "application" );
 
     unsetenv( "LD_BIND_NOW" );
 
     QCString arg0 = argv[0];
     int sep = arg0.findRev( '/' );
+
     if ( sep > 0 )
     arg0 = arg0.mid( sep+1 );
+
     if ( arg0 != "quicklauncher" ) {
     odebug << "QuickLauncher invoked as: " << arg0.data() << oendl;
     QuickLauncher::exec( argc, argv );
     } else {
 #ifdef _OS_LINUX_
     // Setup to change proc title
     int i;
     char **envp = environ;
     /* Move the environment so we can reuse the memory.
      * (Code borrowed from sendmail.) */
     for (i = 0; envp[i] != NULL; i++)
         continue;
@@ -216,55 +222,52 @@ int main( int argc, char** argv )
     odebug << "QuickLauncher running" << oendl;
     // Pre-load default fonts
     QFontMetrics fm( QApplication::font() );
     fm.ascent(); // causes font load.
     QFont f( QApplication::font() );
     f.setWeight( QFont::Bold );
     QFontMetrics fmb( f );
     fmb.ascent(); // causes font load.
 
     // Each of the following force internal structures/internal
     // initialization to be performed.  This may mean allocating
     // memory that is not needed by all applications.
-#if 0
-    TimeZone::current().isValid(); // popuplate timezone cache
-    TimeString::currentDateFormat(); // create internal structures
-    TimeString::currentAMPM();
-#endif
     Resource::loadIconSet("new"); // do internal init
 
         /* make sure libopie gets lined in */
         {
             Opie::Ui::OWait item;
         }
 
     // Create a widget to force initialization of title bar images, etc.
     QObject::disconnect(app, SIGNAL(lastWindowClosed()), app, SLOT(hideOrQuit()));
     QWidget *w = new QWidget(0,0,Qt::WDestructiveClose|Qt::WStyle_ContextHelp|Qt::WStyle_Tool);
     w->setGeometry( -100, -100, 10, 10 );
     w->show();
     QTimer::singleShot( 0, w, SLOT(close()) );
 
     app->enter_loop();
     }
 
     int rv = app->exec();
 
     if ( mainWindow )
     delete (QWidget*)mainWindow;
-
     delete app;
+
     if ( appIface )
     loader->releaseInterface( appIface );
     delete loader;
+
+
     // Neither QLibrary nor my Dropin is a QObject and they don't depend
     // on a qApp so we destroy QWidget::destroyMapper() without
     // crashing the app
     //
     // The problem is there are some 'static' resources not freed
     // in the apps and on destructing these objects are not available
     // anymore. In future fix up the apps but for now
     // we just skip deletion and hope things go well -zecke
 //    delete app;
     // hack instead -zecke
 //    delete app->pidChannel;
 //    app->pidChannel = 0;