fix includes

28 files changed, 1 insertions, 110 deletions

diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp
index fed9b34..b2cef55 100644
--- a/core/applets/batteryapplet/battery.cpp
+++ b/core/applets/batteryapplet/battery.cpp
@@ -1,183 +1,182 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "battery.h"
 #include "batterystatus.h"
 
 /* OPIE */
 #include <opie2/otaskbarapplet.h>
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/power.h>
-#include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qpainter.h>
 #include <qtimer.h>
 
 
 BatteryMeter::BatteryMeter( QWidget *parent )
     : QWidget( parent ), charging(false)
 {
     ps = new PowerStatus;
     startTimer( 10000 );
 
     setFixedWidth(  QMAX(AppLnk::smallIconSize()*3/4, 6) );
     setFixedHeight( AppLnk::smallIconSize() );
 
     chargeTimer = new QTimer( this );
     connect( chargeTimer, SIGNAL(timeout()), this, SLOT(chargeTimeout()) );
     timerEvent(0);
     QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold );
     Config c( "qpe" );
     c.setGroup( "Battery" );
     style = c.readNumEntry( "Style", 0 );
 }
 
 BatteryMeter::~BatteryMeter()
 {
     delete ps;
 }
 
 QSize BatteryMeter::sizeHint() const
 {
     return QSize(QMAX(AppLnk::smallIconSize()*3/4, 6), height() );
 }
 
 void BatteryMeter::mousePressEvent( QMouseEvent* e )
 {
     if ( e->button() == RightButton )
     {
         style = 1-style;
         Config c( "qpe" );
         c.setGroup( "Battery" );
         c.writeEntry( "Style", style );
         repaint( true );
     }
     QWidget::mousePressEvent( e );
 }
 
 void BatteryMeter::mouseReleaseEvent( QMouseEvent* /*e*/ )
 {
     if ( batteryView && batteryView->isVisible() ) {
         delete (QWidget *) batteryView;
     } else {
         if ( !batteryView ) batteryView = new BatteryStatus( ps );
         QPEApplication::showWidget( batteryView );
         batteryView->raise();
         batteryView->show();
     }
 }
 
 void BatteryMeter::timerEvent( QTimerEvent * )
 {
     PowerStatus prev = *ps;
 
     *ps = PowerStatusManager::readStatus();
 
     if ( prev != *ps ) {
     percent = ps->batteryPercentRemaining();
     if ( !charging && ps->batteryStatus() == PowerStatus::Charging ) {
         percent = 0;
         charging = true;
         chargeTimer->start( 500 );
     } else if ( charging && ps->batteryStatus() != PowerStatus::Charging ) {
         charging = false;
         chargeTimer->stop();
         if ( batteryView )
         batteryView->updatePercent( percent );
     }
     repaint( style != 0 );
     if ( batteryView )
         batteryView->repaint();
     }
 }
 
 void BatteryMeter::chargeTimeout()
 {
     percent += 20;
     if ( percent > 100 )
     percent = 0;
 
     repaint(FALSE);
     if ( batteryView )
     batteryView->updatePercent( percent );
 }
 
 void BatteryMeter::paintEvent( QPaintEvent* )
 {
 
     if ( style == 1 )
     {
         QPainter p(this);
         QFont f( "Fixed", AppLnk::smallIconSize()/2 );
         QFontMetrics fm( f );
         p.setFont( f );
         p.drawText( 0, height()/2, QString::number( percent ) );
         p.drawText( width()/4, height(), "%" );
         return;
     }
 
     QPainter p(this);
     QColor color;
     QColor g = gray.light( 160 );
     switch ( ps->acStatus() )
     {
         case PowerStatus::Offline: color = blue.light( 150 ); break;
         case PowerStatus::Online: color = green.dark( 130 ).light( 180 ); break;
         default: color = red.light( 160 );
     }
 
     int w = height() / 2;
     if ( !(w%2) ) w--; // should have an odd value to get a real middle line
     int h = height() - 4;
     int pix = (percent * h) / 100;
     int y2 = height() -2;
     int y = y2 - pix;
     int x1 = (width() - w ) / 2;
 
     p.setPen(QColor(80,80,80));
     p.drawLine(x1+w/4,0,x1+w/4+w/2+1,0);  // header
     p.drawRect(x1,1,w,height()-1);      // corpus
     p.setBrush(color);
 
     //int extra = ((percent * h) % 100)/(100/4);
 
     int middle = w/2;
     for ( int i = 0; i < middle; i++ )
     {
         p.setPen( gray.dark( 100+i*20 ) );
         p.drawLine( x1+middle-i, 2, x1+middle-i, y-1 );
         p.drawLine( x1+middle+i, 2, x1+middle+i, y-1 );
         p.setPen( color.dark( 100+i*20 ) );
         p.drawLine( x1+middle-i, y, x1+middle-i, y2 );
         p.drawLine( x1+middle+i, y, x1+middle+i, y2 );
     }
 }
 
 int BatteryMeter::position()
 {
     return 8;
 }
 
 Q_EXPORT_INTERFACE()
 {
     Q_CREATE_INSTANCE( OTaskbarAppletWrapper<BatteryMeter> );
 }
 
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp
index b9ca7b5..ea11495 100644
--- a/core/applets/batteryapplet/batterystatus.cpp
+++ b/core/applets/batteryapplet/batterystatus.cpp
@@ -1,253 +1,251 @@
 
 #include "batterystatus.h"
 
 /* OPIE */
 #include <opie2/odevice.h>
 #include <qpe/power.h>
 
 /* QT */
-#include <qpainter.h>
 #include <qpushbutton.h>
 #include <qdrawutil.h>
 #include <qfile.h>
 #include <qlayout.h>
 #include <qtextstream.h>
-#include <qapplication.h>
 #include <qmessagebox.h>
 
 using namespace Opie;
 
 BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent )
   : QWidget( parent, 0, WDestructiveClose), ps(p), bat2(false) {
   setCaption( tr("Battery status") );
   setMinimumSize( 150, 200 );
 
   QPushButton *pb = new QPushButton( tr("Close"), this );
   QVBoxLayout *layout = new QVBoxLayout ( this );
 
   jackPercent = 0;
 
   pb->setMaximumSize( 120, 40 );
 
   pb->show();
 
   layout->addStretch();
   layout->addWidget( pb );
 
   if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) {
       getProcApmStatusIpaq();
   }
   connect( pb, SIGNAL( clicked() ), this, SLOT( close() ) );
   percent = ps->batteryPercentRemaining();
   show();
 }
 
 BatteryStatus::~BatteryStatus()
 {
 }
 
 /*
  * Make use of the advanced apm interface of the ipaq
  */
 bool BatteryStatus::getProcApmStatusIpaq() {
 
   bat2 = false;
 
   QFile procApmIpaq("/proc/hal/battery");
 
   if (procApmIpaq.open(IO_ReadOnly) ) {
     QStringList list;
     // since it is /proc we _must_ use QTextStream
     QTextStream stream ( &procApmIpaq);
     QString streamIn;
     streamIn = stream.read();
     list = QStringList::split("\n", streamIn);
 
     for(QStringList::Iterator line=list.begin(); line!=list.end(); line++) {
       // not nice, need a rewrite later
       if( (*line).startsWith(" Percentage") ){
         if (bat2 == true) {
       perc2 = (*line).mid(((*line).find('('))+1,(*line).find(')')-(*line).find('(')-2);
     } else {
       perc1 = (*line).mid(((*line).find('('))+1,(*line).find(')')-(*line).find('(')-2);
     }
       }else if( (*line).startsWith(" Life") ){
     if (bat2 == true) {
       sec2 = (*line).mid(((*line).find(':')+2), 5 );
     } else {
       sec1 = (*line).mid(((*line).find(':')+2), 5 );
     }
       }else if( (*line).startsWith("Battery #1") ){
     bat2 = true;
       }else if( (*line).startsWith(" Status") ){
     if (bat2 == true) {
       jackStatus = (*line).mid((*line).find('(')+1, (*line).find(')')-(*line).find('(')-1);
         } else {
       ipaqStatus = (*line).mid((*line).find('(')+1, (*line).find(')')-(*line).find('(')-1);
     }
       }else if( (*line).startsWith(" Chemistry") ) {
     if (bat2 == true) {
       jackChem = (*line).mid((*line).find('('), (*line).find(')')-(*line).find('(')+1);
     } else {
       ipaqChem = (*line).mid((*line).find('('), (*line).find(')')-(*line).find('(')+1);
     }
       }
     }
   } else {
     QMessageBox::warning(this, tr("Failure"),tr("could not open file"));
   }
 
   procApmIpaq.close();
 
   jackPercent = perc2.toInt();
   ipaqPercent = perc1.toInt();
 
   if (perc2.isEmpty()) {
     perc2 = tr("no data");
   } else {
     perc2 += " %";
   }
 
 
   if (sec2 == "0" || sec2 == "" || sec2.isEmpty()) {
     sec2 = tr("no data");
   } else {
     sec2 += " min";
   }
 
   jackStatus == (" ( " + jackStatus + " )");
 
   return true;
 }
 
 
 void BatteryStatus::updatePercent( int pc ) {
   percent = pc;
   repaint(FALSE);
 }
 
 void BatteryStatus::drawSegment( QPainter *p, const QRect &r, const QColor &topgrad, const QColor &botgrad, const QColor &highlight, int hightlight_height ) {
   int h1, h2, s1, s2, v1, v2, ng = r.height(), hy = ng*30/100, hh = hightlight_height;
   topgrad.hsv( &h1, &s1, &v1 );
   botgrad.hsv( &h2, &s2, &v2 );
   for ( int j = 0; j < hy-2; j++ ) {
     p->setPen( QColor( h1 + ((h2-h1)*j)/(ng-1), s1 + ((s2-s1)*j)/(ng-1),
                v1 + ((v2-v1)*j)/(ng-1),  QColor::Hsv ) );
     p->drawLine( r.x(), r.top()+hy-2-j, r.x()+r.width(), r.top()+hy-2-j );
   }
   for ( int j = 0; j < hh; j++ ) {
     p->setPen( highlight );
     p->drawLine( r.x(), r.top()+hy-2+j, r.x()+r.width(), r.top()+hy-2+j );
     }
   for ( int j = 0; j < ng-hy-hh; j++ ) {
     p->setPen( QColor( h1 + ((h2-h1)*j)/(ng-1), s1 + ((s2-s1)*j)/(ng-1),
                v1 + ((v2-v1)*j)/(ng-1),  QColor::Hsv ) );
     p->drawLine( r.x(), r.top()+hy+hh-2+j, r.x()+r.width(), r.top()+hy+hh-2+j );
   }
 }
 
 void BatteryStatus::paintEvent( QPaintEvent * ) {
 
   QPainter p(this);
   QString text;
   if ( ps->batteryStatus() == PowerStatus::Charging ) {
     if (bat2) {
       text = tr("Charging both devices");
     } else {
       text = tr("Charging");
     }
   } else if ( ps->batteryPercentAccurate() ) {
     text.sprintf( tr("Percentage battery remaining") + ": %i%%", percent );
   } else {
     text = tr("Battery status: ");
     switch ( ps->batteryStatus() ) {
     case PowerStatus::High:
       text += tr("Good");
       break;
     case PowerStatus::Low:
       text += tr("Low");
       break;
     case PowerStatus::VeryLow:
       text += tr("Very Low");
       break;
     case PowerStatus::Critical:
       text += tr("Critical");
       break;
     default: // NotPresent, etc.
       text += tr("Unknown");
     }
   }
   p.drawText( 10, 90, text );
 
   if ( ps->acStatus() == PowerStatus::Backup )
     p.drawText( 10, 110, tr("On backup power") );
   else if ( ps->acStatus() == PowerStatus::Online )
     p.drawText( 10, 110, tr("Power on-line") );
   else if ( ps->acStatus() == PowerStatus::Offline )
     p.drawText( 10, 110, tr("External power disconnected") );
 
   if ( ps->batteryTimeRemaining() >= 0 ) {
     text.sprintf( tr("Battery time remaining") + ": %im %02is",
           ps->batteryTimeRemaining() / 60, ps->batteryTimeRemaining() % 60 );
     p.drawText( 10, 130, text );
   }
 
   QColor c;
   QColor darkc;
   QColor lightc;
   if ( ps->acStatus() == PowerStatus::Offline ) {
     c = blue.light(120);
     darkc = c.dark(280);
     lightc = c.light(145);
   } else if ( ps->acStatus() == PowerStatus::Online ) {
     c = green.dark(130);
     darkc = c.dark(200);
     lightc = c.light(220);
   } else {
     c = red;
     darkc = c.dark(280);
     lightc = c.light(140);
   }
   if ( percent < 0 )
     return;
 
   int rightEnd1 = width() - 47;
   int rightEnd2 = width() - 35;
   int percent2 = ( percent / 100 ) * rightEnd1 ;
   p.setPen( black );
   qDrawShadePanel( &p,   9, 30, rightEnd1 , 39, colorGroup(), TRUE, 1, NULL);
   qDrawShadePanel( &p, rightEnd2, 37,  12, 24, colorGroup(), TRUE, 1, NULL);
   drawSegment( &p, QRect( 10, 30, percent2, 40 ), lightc, darkc, lightc.light(115), 6 );
   drawSegment( &p, QRect( 11 + percent2, 30,  rightEnd1 - percent2, 40 ), white.light(80), black, white.light(90), 6 );
   drawSegment( &p, QRect( rightEnd2, 37, 10, 25 ), white.light(80), black, white.light(90), 2 );
   p.setPen( black);
 
 
   if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) {
 
       p.drawText(15, 50, tr ("Ipaq  ") + ipaqChem);
 
       QString jacketMsg;
       if (bat2) {
           p.setPen(black);
           p.drawText(10,220, tr("Percentage battery remaining: ") + perc2 + " " + jackStatus);
           p.drawText(10,240, tr("Battery time remaining: ") + sec2);
           jacketMsg = tr("Jacket  ") + jackChem;
       } else {
           jackPercent = 0;
           jacketMsg = tr("No jacket with battery inserted");
       }
 
       int jackPerc =  ( jackPercent / 100 ) * ( width() - 47 ) ;
 
       qDrawShadePanel( &p,   9, 160, rightEnd1, 39, colorGroup(), TRUE, 1, NULL);
       qDrawShadePanel( &p, rightEnd2, 167,  12, 24, colorGroup(), TRUE, 1, NULL);
       drawSegment( &p, QRect( 10, 160, jackPerc, 40 ), lightc, darkc, lightc.light(115), 6 );
       drawSegment( &p, QRect( 11 + jackPerc, 160, rightEnd1 - jackPerc, 40 ), white.light(80), black, white.light(90), 6 );
       drawSegment( &p, QRect( rightEnd2, 167, 10, 25 ), white.light(80), black, white.light(90), 2 );
       p.setPen( black );
       p.drawText(15, 180, jacketMsg);
   }
 
 }
 
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 8ffaada..7625545 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -1,425 +1,423 @@
 /*
 * cardmon.cpp
 *
 * ---------------------
 *
 * copyright   : (c) 2002 by Maximilian Reiss
 * email       : max.reiss@gmx.de
 * based on two apps by Devin Butterfield
 */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "cardmon.h"
 
 /* OPIE */
 #include <opie2/odevice.h>
 #include <opie2/otaskbarapplet.h>
 #include <qpe/applnk.h>
 #include <qpe/resource.h>
 
 /* QT */
-#include <qapplication.h>
 #include <qcopchannel_qws.h>
 #include <qpainter.h>
-#include <qmessagebox.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qsound.h>
 #include <qtimer.h>
 
 /* STD */
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
 
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
 #include <sys/vfs.h>
 #include <mntent.h>
 #endif
 
 using namespace Opie;
 
 CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent ),
         pm( Resource::loadPixmap( "cardmon/pcmcia" ) )
 {
 
     QCopChannel * pcmciaChannel = new QCopChannel( "QPE/Card", this );
     connect( pcmciaChannel,
              SIGNAL( received( const QCString &, const QByteArray & ) ), this,
              SLOT( cardMessage( const QCString &, const QByteArray & ) ) );
 
     QCopChannel *sdChannel = new QCopChannel( "QPE/Card", this );
     connect( sdChannel,
              SIGNAL( received( const QCString &, const QByteArray & ) ), this,
              SLOT( cardMessage( const QCString &, const QByteArray & ) ) );
 
     cardInPcmcia0 = FALSE;
     cardInPcmcia1 = FALSE;
     cardInSd = FALSE;
 
     setFocusPolicy( NoFocus );
 
     setFixedWidth ( AppLnk::smallIconSize() );
     setFixedHeight ( AppLnk::smallIconSize() );
 
     getStatusPcmcia( TRUE );
     getStatusSd( TRUE );
     repaint( FALSE );
     popupMenu = 0;
 }
 
 CardMonitor::~CardMonitor()
 {
     if ( popupMenu )
     {
         delete popupMenu;
     }
 }
 
 void CardMonitor::popUp( QString message, QString icon )
 {
     if ( !popupMenu )
     {
         popupMenu = new QPopupMenu( this );
     }
 
     popupMenu->clear();
     if ( icon.isEmpty() )
     {
         popupMenu->insertItem( message, 0 );
     }
     else
     {
         popupMenu->insertItem( QIconSet( Resource::loadPixmap( icon ) ),
                                message, 0 );
     }
 
     QPoint p = mapToGlobal( QPoint( 0, 0 ) );
     QSize s = popupMenu->sizeHint();
     popupMenu->popup( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ),
                               p.y() - s.height() ), 0 );
 
     QTimer::singleShot( 2000, this, SLOT( popupTimeout() ) );
 }
 
 void CardMonitor::popupTimeout()
 {
     popupMenu->hide();
 }
 
 void CardMonitor::mousePressEvent( QMouseEvent * )
 {
     QPopupMenu * menu = new QPopupMenu( this );
     QString cmd;
     int err = 0;
 
     if ( cardInSd )
     {
         menu->insertItem( QIconSet( Resource::loadPixmap( "cardmon/ide" ) ),
                           tr( "Eject SD/MMC card" ), 0 );
     }
 
     if ( cardInPcmcia0 )
     {
         menu->
         insertItem( QIconSet
                     ( Resource::loadPixmap( "cardmon/" + cardInPcmcia0Type ) ),
                     tr( "Eject card 0: %1" ).arg( cardInPcmcia0Name ), 1 );
     }
 
     if ( cardInPcmcia1 )
     {
         menu->
         insertItem( QIconSet
                     ( Resource::loadPixmap( "cardmon/" + cardInPcmcia1Type ) ),
                     tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 );
     }
 
     QPoint p = mapToGlobal( QPoint( 0, 0 ) );
     QSize s = menu->sizeHint();
     int opt = menu->exec( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ),
                                   p.y() - s.height() ), 0 );
 
     if ( opt == 1 )
     {
         cmd = "/sbin/cardctl eject 0";
         err = system( ( const char * ) cmd );
         if ( err != 0 )
         {
             qDebug( "Could not execute `/sbin/cardctl eject 0'! err=%d",
                     err );
             popUp( tr( "CF/PCMCIA card eject failed!" ) );
         }
     }
     else if ( opt == 0 )
     {
         if ( ODevice::inst() ->system() == System_Familiar )
         {
             cmd = "umount /dev/mmc/part1";
         }
         else
         {
             cmd = "umount /dev/mmcda1";
         }
         err = system( ( const char * ) cmd );
         if ( err != 0 )
         {
             popUp( tr( "SD/MMC card eject failed!" ) );
         }
     }
     else if ( opt == 2 )
     {
         cmd = "/sbin/cardctl eject 1";
         err = system( ( const char * ) cmd );
         if ( err != 0 )
         {
             qDebug( "Could not execute `/sbin/cardctl eject 1'! err=%d",
                     err );
             popUp( tr( "CF/PCMCIA card eject failed!" ) );
         }
     }
     delete menu;
 }
 
 
 void CardMonitor::cardMessage( const QCString & msg, const QByteArray & )
 {
     if ( msg == "stabChanged()" )
     {
         // qDebug("Pcmcia: stabchanged");
         getStatusPcmcia();
     }
     else if ( msg == "mtabChanged()" )
     {
         // qDebug("CARDMONAPPLET: mtabchanged");
         getStatusSd();
     }
 }
 
 bool CardMonitor::getStatusPcmcia( int showPopUp )
 {
 
     bool cardWas0 = cardInPcmcia0;	// remember last state
     bool cardWas1 = cardInPcmcia1;
 
     QString fileName;
 
     // one of these 3 files should exist
     if ( QFile::exists( "/var/run/stab" ) )
     {
         fileName = "/var/run/stab";
     }
     else if ( QFile::exists( "/var/state/pcmcia/stab" ) )
     {
         fileName = "/var/state/pcmcia/stab";
     }
     else
     {
         fileName = "/var/lib/pcmcia/stab";
     }
 
     QFile f( fileName );
 
     if ( f.open( IO_ReadOnly ) )
     {
         QStringList list;
         QTextStream stream( &f );
         QString streamIn;
         streamIn = stream.read();
         list = QStringList::split( "\n", streamIn );
         for ( QStringList::Iterator line = list.begin(); line != list.end();
                 line++ )
         {
             if ( ( *line ).startsWith( "Socket 0:" ) )
             {
                 if ( ( *line ).startsWith( "Socket 0: empty" ) && cardInPcmcia0 )
                 {
                     cardInPcmcia0 = FALSE;
                 }
                 else if ( !( *line ).startsWith( "Socket 0: empty" )
                           && !cardInPcmcia0 )
                 {
                     cardInPcmcia0Name =
                         ( *line ).mid( ( ( *line ).find( ':' ) + 1 ),
                                        ( *line ).length() - 9 );
                     cardInPcmcia0Name.stripWhiteSpace();
                     cardInPcmcia0 = TRUE;
                     show();
                     line++;
                     int pos = ( *line ).find( '\t' ) + 1;
                     cardInPcmcia0Type =
                         ( *line ).mid( pos, ( *line ).find( "\t", pos ) - pos );
                 }
             }
             else if ( ( *line ).startsWith( "Socket 1:" ) )
             {
                 if ( ( *line ).startsWith( "Socket 1: empty" ) && cardInPcmcia1 )
                 {
                     cardInPcmcia1 = FALSE;
                 }
                 else if ( !( *line ).startsWith( "Socket 1: empty" )
                           && !cardInPcmcia1 )
                 {
                     cardInPcmcia1Name =
                         ( *line ).mid( ( ( *line ).find( ':' ) + 1 ),
                                        ( *line ).length() - 9 );
                     cardInPcmcia1Name.stripWhiteSpace();
                     cardInPcmcia1 = TRUE;
                     show();
                     line++;
                     int pos = ( *line ).find( '\t' ) + 1;
                     cardInPcmcia1Type =
                         ( *line ).mid( pos, ( *line ).find( "\t", pos ) - pos );
                 }
             }
         }
         f.close();
 
         if ( !showPopUp
                 && ( cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1 ) )
         {
             QString text = QString::null;
             QString what = QString::null;
             if ( cardWas0 != cardInPcmcia0 )
             {
                 if ( cardInPcmcia0 )
                 {
                     text += tr( "New card: " );
                     what = "on";
                 }
                 else
                 {
                     text += tr( "Ejected: " );
                     what = "off";
                 }
                 text += cardInPcmcia0Name;
                 popUp( text, "cardmon/" + cardInPcmcia0Type );
             }
 
             if ( cardWas1 != cardInPcmcia1 )
             {
                 if ( cardInPcmcia1 )
                 {
                     text += tr( "New card: " );
                     what = "on";
                 }
                 else
                 {
                     text += tr( "Ejected: " );
                     what = "off";
                 }
                 text += cardInPcmcia1Name;
                 popUp( text, "cardmon/" + cardInPcmcia1Type );
             }
 #ifndef QT_NO_SOUND
             QSound::play( Resource::findSound( "cardmon/card" + what ) );
 #endif
 
         }
     }
     else
     {
         // no file found
         qDebug( "no file found" );
         cardInPcmcia0 = FALSE;
         cardInPcmcia1 = FALSE;
     }
     repaint( FALSE );
     return ( ( cardWas0 == cardInPcmcia0
                && cardWas1 == cardInPcmcia1 ) ? FALSE : TRUE );
 
 }
 
 
 bool CardMonitor::getStatusSd( int showPopUp )
 {
 
     bool cardWas = cardInSd;	// remember last state
     cardInSd = FALSE;
 
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
     struct mntent *me;
     FILE *mntfp = setmntent( "/etc/mtab", "r" );
 
     if ( mntfp )
     {
         while ( ( me = getmntent( mntfp ) ) != 0 )
         {
             QString fs = me->mnt_fsname;
             //qDebug( fs );
             if ( fs.left( 14 ) == "/dev/mmc/part1" || fs.left( 7 ) == "/dev/sd"
                     || fs.left( 9 ) == "/dev/mmcd" )
             {
                 cardInSd = TRUE;
                 show();
             }
             //            else {
             //                 cardInSd = FALSE;
             //             }
         }
         endmntent( mntfp );
     }
 
     if ( !showPopUp && cardWas != cardInSd )
     {
         QString text = QString::null;
         QString what = QString::null;
         if ( cardInSd )
         {
             text += "New card: SD/MMC";
             what = "on";
         }
         else
         {
             text += "Ejected: SD/MMC";
             what = "off";
         }
         //qDebug("TEXT: " + text );
 #ifndef QT_NO_SOUND
         QSound::play( Resource::findSound( "cardmon/card" + what ) );
 #endif
         popUp( text, "cardmon/ide" );	// XX add SD pic
     }
 #else
 #error "Not on Linux"
 #endif
     repaint( FALSE );
     return ( ( cardWas == cardInSd ) ? FALSE : TRUE );
 }
 
 void CardMonitor::paintEvent( QPaintEvent * )
 {
 
     QPainter p( this );
 
     if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd )
     {
         p.drawPixmap( 0, 0, pm );
         show();
     }
     else
     {
         //p.eraseRect(rect());
         hide();
     }
 }
 
 int CardMonitor::position()
 {
     return 7;
 }
 
 Q_EXPORT_INTERFACE()
 {
     Q_CREATE_INSTANCE( OTaskbarAppletWrapper<CardMonitor> );
 }
 
diff --git a/core/applets/homeapplet/home.cpp b/core/applets/homeapplet/home.cpp
index 455575f..8a930be 100644
--- a/core/applets/homeapplet/home.cpp
+++ b/core/applets/homeapplet/home.cpp
@@ -1,87 +1,85 @@
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qapplication.h>
-#include <qiconset.h>
-#include <qpopupmenu.h>
 
 #include "home.h"
 
 
 HomeApplet::HomeApplet ( )
 	: QObject ( 0, "HomeApplet" )
 {
 }
 
 HomeApplet::~HomeApplet ( )
 {
 }
 
 int HomeApplet::position ( ) const
 {
     return 4;
 }
 
 QString HomeApplet::name ( ) const
 {
 	return tr( "Home shortcut" );
 }
 
 QString HomeApplet::text ( ) const
 {
 	return tr( "Desktop" );
 }
 
 QString HomeApplet::tr( const char* s ) const
 {
     return qApp->translate( "HomeApplet", s, 0 );
 }
 
 QString HomeApplet::tr( const char* s, const char* p ) const
 {
     return qApp->translate( "HomeApplet", s, p );
 }
 
 QIconSet HomeApplet::icon ( ) const
 {
 	QPixmap pix;
 	QImage img = Resource::loadImage ( "home" );
 	
 	if ( !img. isNull ( ))
 		pix. convertFromImage ( img. smoothScale ( 14, 14 ));
 	return pix;
 }
 
 QPopupMenu *HomeApplet::popup ( QWidget * ) const
 {
 	return 0;
 }
 
 void HomeApplet::activated ( )
 {
 	// to desktop (home)
 	QCopEnvelope ( "QPE/Application/qpe", "raise()" );
 }
 
 
 QRESULT HomeApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
 {
 	*iface = 0;
 	if ( uuid == IID_QUnknown )
 		*iface = this;
 	else if ( uuid == IID_MenuApplet )
 		*iface = this;
 	else
 	    return QS_FALSE;
 
 	if ( *iface )
 		(*iface)-> addRef ( );
 	return QS_OK;
 }
 
 Q_EXPORT_INTERFACE( )
 {
 	Q_CREATE_INSTANCE( HomeApplet )
 }
 
 
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp
index f850424..a47f33d 100644
--- a/core/applets/irdaapplet/irda.cpp
+++ b/core/applets/irdaapplet/irda.cpp
@@ -1,357 +1,352 @@
 /**********************************************************************
 ** Copyright (C) 2002 David Woodhouse <dwmw2@infradead.org>
 **                    Max Reiss <harlekin@handhelds.org> [trivial stuff]
 **                    Robert Griebl <sandman@handhelds.org>
 **                    Holger Freyther <zecke@handhelds.org> QCOP Interface
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
-#include <qcopchannel_qws.h>
 
-#include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
-#include <qpe/ir.h>
 #include <qpe/qcopenvelope_qws.h>
-#include <qpe/sound.h>
 
 #include <qpainter.h>
 #include <qfile.h>
 #include <qtimer.h>
 #include <qtextstream.h>
-#include <qpopupmenu.h>
 
 #include <unistd.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 
 #include "irda.h"
 
 //===========================================================================
 
 IrdaApplet::IrdaApplet ( QWidget *parent, const char *name )
 		: QWidget ( parent, name )
 {
 	setFixedHeight ( 18 );
 	setFixedWidth ( 14 );
 
 	m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP );
 
 	m_irdaOnPixmap          = Resource::loadPixmap( "irdaapplet/irdaon" );
 	m_irdaOffPixmap         = Resource::loadPixmap( "irdaapplet/irdaoff" );
 	m_irdaDiscoveryOnPixmap = Resource::loadPixmap( "irdaapplet/magglass" );
 	m_receiveActivePixmap   = Resource::loadPixmap( "irdaapplet/receive" );
 
 	m_irda_active = false;
 	m_irda_discovery_active = false;
 	m_receive_active = false;
 	m_receive_state_changed = false;
 	m_popup = 0;
                 m_wasOn = false;
                 m_wasDiscover = false;
 
         QCopChannel* chan = new QCopChannel("QPE/IrDaApplet", this );
         connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ),
                 this, SLOT(slotMessage(const QCString&, const QByteArray& ) ) );
 }
 
 void IrdaApplet::show()
 {
 	QWidget::show ( );
 	startTimer ( 2000 );
 }
 
 IrdaApplet::~IrdaApplet()
 {
 	if ( m_sockfd >= 0 )
 		::close ( m_sockfd );
 }
 
 void IrdaApplet::popup ( QString message, QString icon )
 {
 	if ( !m_popup )
 		m_popup = new QPopupMenu ( this );
 
 	m_popup-> clear ( );
 
 	if ( icon. isEmpty ( ))
 		m_popup-> insertItem ( message, 0 );
 	else
 		m_popup-> insertItem ( QIconSet ( Resource::loadPixmap ( icon )), message, 0 );
 
 	QPoint p = mapToGlobal ( QPoint ( 0, 0 ));
 	QSize s = m_popup-> sizeHint ( );
 	m_popup-> popup ( QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ),
 	                           p. y ( ) - s. height ( )));
 
 	QTimer::singleShot ( 2000, this, SLOT( popupTimeout ( )));
 }
 
 void IrdaApplet::popupTimeout ( )
 {
 	m_popup-> hide ( );
 }
 
 bool IrdaApplet::checkIrdaStatus ( )
 {
 	struct ifreq ifr;
 	strcpy ( ifr. ifr_name, "irda0" );
 
 	if ( ::ioctl ( m_sockfd, SIOCGIFFLAGS, &ifr ) < 0 )
 		return false;
 
 	return ( ifr. ifr_flags & IFF_UP );
 }
 
 bool IrdaApplet::setIrdaStatus ( bool b )
 {
 	struct ifreq ifr;
 	strcpy ( ifr. ifr_name, "irda0" );
 
 	if ( ::ioctl ( m_sockfd, SIOCGIFFLAGS, &ifr ) < 0 )
 		return false;
 
 	if ( b ) {
 		ifr. ifr_flags |= IFF_UP;
 	}
 	else {
 		setIrdaDiscoveryStatus ( 0 );
 		setIrdaReceiveStatus ( 0 );
 		ifr. ifr_flags &= ~IFF_UP;
 	}
 
 	if ( ::ioctl ( m_sockfd, SIOCSIFFLAGS, &ifr ) < 0 )
 		return false;
 
 	return true;
 }
 
 bool IrdaApplet::checkIrdaDiscoveryStatus ( )
 {
 	QFile discovery ( "/proc/sys/net/irda/discovery" );
 
 	QString streamIn = "0";
 
 	if ( discovery. open ( IO_ReadOnly )) {
 		QTextStream stream ( &discovery );
 		streamIn = stream. read ( );
 	}
 
 	return streamIn. toInt ( ) > 0;
 }
 
 
 bool IrdaApplet::setIrdaDiscoveryStatus ( bool d )
 {
 	QFile discovery ( "/proc/sys/net/irda/discovery" );
 
 	if ( discovery. open ( IO_WriteOnly | IO_Raw )) {
 		discovery.putch ( d ? '1' : '0' );
 		return true;
 	}
 	return false;
 }
 
 
 bool IrdaApplet::setIrdaReceiveStatus ( bool d )
 {
 	QCopEnvelope e ( "QPE/Obex", "receive(int)" );
 	e << ( d ? 1 : 0 );
 
 	m_receive_active = d;
 	m_receive_state_changed = true;
 
 	return true;
 }
 
 
 void IrdaApplet::showDiscovered ( )
 {
 //	static Sound snd_found ( "irdaapplet/irdaon" );
 //	static Sound snd_lost ( "irdaapplet/irdaoff" );
 
 	QFile discovery ( "/proc/net/irda/discovery" );
 
 	if ( discovery. open ( IO_ReadOnly )) {
 		bool qcopsend = false;
 
 		QString discoveredDevice;
 		QString deviceAddr;
 
 		// since it is /proc we _must_ use QTextStream
 		QStringList list =  QStringList::split ( "\n", QTextStream ( &discovery ). read ( ));
 
 		QMap <QString, QString>::Iterator it;
 
 		for ( it = m_devices. begin ( ); it != m_devices. end ( ); ++it )
 			it. data ( ). prepend ( "+++" );
 
 		for ( QStringList::Iterator lit = list. begin ( ); lit != list. end ( ); ++lit ) {
 			const QString &line = *lit;
 
 			if ( line. startsWith ( "nickname:" )) {
 				discoveredDevice = line. mid ( line. find ( ':' ) + 2, line. find ( ',' ) - line. find ( ':' ) - 2 );
 				deviceAddr       = line. mid ( line. find ( "daddr:" ) + 9, 8 );
 
 				// qDebug(discoveredDevice + "(" + deviceAddr + ")");
 
 				if ( !m_devices. contains ( deviceAddr )) {
 					popup ( tr( "Found:" ) + " " + discoveredDevice );
 					//snd_found. play ( );
 					qcopsend = true;
 				}
 				m_devices. replace ( deviceAddr, discoveredDevice );
 			}
 		}
 
 		for ( it = m_devices. begin ( ); it != m_devices. end ( ); ) {
 			// qDebug("IrdaMon: delete " + it.currentKey() + "=" + *devicesAvailable[it.currentKey()] + "?");
 
 			if ( it. data ( ). left ( 3 ) == "+++" ) {
 				popup ( tr( "Lost:" ) + " " + it. data ( ). mid ( 3 ));
 				//snd_lost. play ( );
 
 				QMap <QString, QString>::Iterator tmp = it;
 				tmp++;
 				m_devices. remove ( it ); // in contrast to QValueListIterator this remove doesn't return the next Iterator
 				it = tmp;
 
 				qcopsend = true;
 			}
 			else
 				it++;
 		}
 		// XXX if( qcopsend ) {
 		    QCopEnvelope e ( "QPE/Network", "irdaSend(bool)" );
 		    e << ( m_devices. count ( ) > 0 );
 		// }
 	}
 }
 
 void IrdaApplet::mousePressEvent ( QMouseEvent * )
 {
 	QPopupMenu *menu = new QPopupMenu ( this );
 	QString cmd;
 
 	/* Refresh active state */
 	timerEvent ( 0 );
 
 	//	menu->insertItem( tr("More..."), 4 );
 
 	if ( m_irda_active && !m_devices. isEmpty ( )) {
 		menu-> insertItem ( tr( "Discovered Device:" ), 9 );
 
 		for ( QMap<QString, QString>::Iterator it = m_devices. begin ( ); it != m_devices. end ( ); ++it )
 			menu-> insertItem ( *it );
 
 		menu-> insertSeparator ( );
 	}
 
 	menu-> insertItem ( m_irda_active ? tr( "Disable IrDA" ) : tr( "Enable IrDA" ), 0 );
 
 	if ( m_irda_active ) {
 		menu-> insertItem ( m_irda_discovery_active ? tr( "Disable Discovery" ) : tr( "Enable Discovery" ), 1 );
 		menu-> insertItem ( m_receive_active ? tr( "Disable Receive" ) : tr( "Enable Receive" ), 2 );
 	}
 
 	QPoint p = mapToGlobal ( QPoint ( 0, 0 ) );
 	QSize s = menu-> sizeHint ( );
 
 	p = QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( ));
 
 	switch (  menu-> exec ( p )) {
 		case 0:
 			setIrdaStatus ( !m_irda_active );
 			timerEvent ( 0 );
 			break;
 		case 1:
 			setIrdaDiscoveryStatus ( !m_irda_discovery_active );
 			timerEvent ( 0 );
 			break;
 		case 2:
 			setIrdaReceiveStatus ( !m_receive_active );
 			timerEvent( 0 );
 			break;
 	}
 
 	delete menu;
 }
 
 void IrdaApplet::timerEvent ( QTimerEvent * )
 {
 	bool oldactive = m_irda_active;
 	bool olddiscovery = m_irda_discovery_active;
 	bool receiveUpdate = false;
 
 	if ( m_receive_state_changed ) {
 		receiveUpdate = true;
 		m_receive_state_changed = false;
 	}
 
 	m_irda_active = checkIrdaStatus ( );
 	m_irda_discovery_active = checkIrdaDiscoveryStatus ( );
 
 	if ( m_irda_discovery_active )
 		showDiscovered ( );
 
 	if (( m_irda_active != oldactive ) || ( m_irda_discovery_active != olddiscovery ) || receiveUpdate )
 		update ( );
 }
 
 void IrdaApplet::paintEvent ( QPaintEvent * )
 {
 	QPainter p ( this );
 
 	p. drawPixmap ( 0, 1, m_irda_active ? m_irdaOnPixmap : m_irdaOffPixmap );
 
 	if ( m_irda_discovery_active )
     	        p. drawPixmap( 0, 1, m_irdaDiscoveryOnPixmap );
 
 	if ( m_receive_active )
 		p. drawPixmap( 0, 1, m_receiveActivePixmap );
 }
 /*
  * We know 3 calls
  * a) enable
  * b) disable
  * a and b will temp enable the IrDa device and disable will disable it again if it wasn't on
  * c) listDevices: We will return a list of known devices
  */
 void IrdaApplet::slotMessage( const QCString& str, const QByteArray& ar ) {
     if ( str == "enableIrda()") {
         m_wasOn = checkIrdaStatus();
         m_wasDiscover = checkIrdaDiscoveryStatus();
         if (!m_wasOn)  {
             setIrdaStatus( true );
         }
         if ( !m_wasDiscover ) {
             setIrdaDiscoveryStatus ( true );
         }
     } else if ( str == "disableIrda()") {
         if (!m_wasOn)  {
             setIrdaStatus( false );
         }
         if ( !m_wasDiscover ) {
             setIrdaDiscoveryStatus ( false );
         }
     } else if ( str == "listDevices()") {
         QCopEnvelope e("QPE/IrDaAppletBack", "devices(QStringList)");
 
         QStringList list;
         QMap<QString, QString>::Iterator it;
         for (it = m_devices.begin(); it != m_devices.end(); ++it )
             list << (*it);
 
         e << list;
     }
 }
diff --git a/core/applets/logoutapplet/logout.cpp b/core/applets/logoutapplet/logout.cpp
index 92222c9..0ac0067 100644
--- a/core/applets/logoutapplet/logout.cpp
+++ b/core/applets/logoutapplet/logout.cpp
@@ -1,126 +1,124 @@
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qapplication.h>
-#include <qiconset.h>
-#include <qpopupmenu.h>
 #include <qmessagebox.h>
 
 #include <unistd.h>
 
 #include "logout.h"
 
 
 LogoutApplet::LogoutApplet ( )
 	: QObject ( 0, "LogoutApplet" )
 {
 }
 
 LogoutApplet::~LogoutApplet ( )
 {
 }
 
 int LogoutApplet::position ( ) const
 {
     return 0;
 }
 
 QString LogoutApplet::name ( ) const
 {
 	return tr( "Logout shortcut" );
 }
 
 QString LogoutApplet::text ( ) const
 {
 	return tr( "Logout" );
 }
 
 QString LogoutApplet::tr( const char* s ) const
 {
     return qApp->translate( "LogoutApplet", s, 0 );
 }
 
 QString LogoutApplet::tr( const char* s, const char* p ) const
 {
     return qApp->translate( "LogoutApplet", s, p );
 }
 
 QIconSet LogoutApplet::icon ( ) const
 {
 	QPixmap pix;
 	QImage img = Resource::loadImage ( "logout" );
 
 	if ( !img. isNull ( ))
 		pix. convertFromImage ( img. smoothScale ( 14, 14 ));
 	return pix;
 }
 
 QPopupMenu *LogoutApplet::popup ( QWidget * ) const
 {
 	return 0;
 }
 
 // This is a workaround for a Qt bug
 // clipboard applet has to stop its poll timer, or Qt/E
 // will hang on quit() right before it emits aboutToQuit()
 
 class HackApplication : public QApplication {
 public:
 	HackApplication ( ) : QApplication ( dummy, 0 )
 	{
 	}
 
 	void emit_about_to_quit ( )
 	{
 		emit aboutToQuit ( );
 	}
 
 	int dummy;
 };
 
 
 void LogoutApplet::activated ( )
 {
 	QMessageBox mb ( tr( "Logout" ),
 	                 tr( "Do you really want to\nend this session ?" ),
 	                 QMessageBox::NoIcon,
 	                 QMessageBox::Yes | QMessageBox::Default,
 	                 QMessageBox::No | QMessageBox::Escape,
 	                 QMessageBox::NoButton );
 
 	mb. setButtonText ( QMessageBox::Yes, "Yes" );
 	mb. setButtonText ( QMessageBox::No, "No" );
 	mb. setIconPixmap ( icon ( ). pixmap ( ));
 
 	if ( mb. exec ( ) == QMessageBox::Yes ) {
 		{ QCopEnvelope envelope( "QPE/System", "forceQuit()" ); }
 
 		qApp-> processEvents ( ); // ensure the message goes out.
 		sleep ( 1 );  // You have 1 second to comply.
 
 		((HackApplication *) qApp )-> emit_about_to_quit ( );
 		qApp-> quit();
 	}
 }
 
 
 QRESULT LogoutApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
 {
 	*iface = 0;
 	if ( uuid == IID_QUnknown )
 		*iface = this;
 	else if ( uuid == IID_MenuApplet )
 		*iface = this;
 	else
 	    return QS_FALSE;
 
 	if ( *iface )
 		(*iface)-> addRef ( );
 	return QS_OK;
 }
 
 Q_EXPORT_INTERFACE( )
 {
 	Q_CREATE_INSTANCE( LogoutApplet )
 }
 
diff --git a/core/applets/multikeyapplet/multikey.cpp b/core/applets/multikeyapplet/multikey.cpp
index b36ee12..b17498d 100644
--- a/core/applets/multikeyapplet/multikey.cpp
+++ b/core/applets/multikeyapplet/multikey.cpp
@@ -1,149 +1,143 @@
 /**********************************************************************
 ** Copyright (C) 2004 Anton Kachalov mouse@altlinux.ru
 **  All rights reserved.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "multikey.h"
 
 /* OPIE */
 #include <opie2/otaskbarapplet.h>
-#include <qpe/global.h>
-#include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
-#include <qpe/qpeapplication.h>
 
 /* QT */
-#include <qlabel.h>
 #include <qdir.h>
-#include <qfileinfo.h>
-#include <qcopchannel_qws.h>
 
 Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("EN")
 {
     QCopChannel* swChannel = new QCopChannel("MultiKey/Switcher", this);
     connect( swChannel, SIGNAL(received(const QCString &, const QByteArray &)),
 	     this, SLOT(message(const QCString &, const QByteArray &)));
 
     setFont( QFont( "Helvetica", 10, QFont::Normal ) );
     QPEApplication::setStylusOperation(this, QPEApplication::RightOnHold);
     lang = 0;
     QCopEnvelope e("MultiKey/Keyboard", "getmultikey()");
     setText("EN");
     popupMenu.insertItem("EN", 0);
     show();
 }
 
 void Multikey::mousePressEvent(QMouseEvent *ev)
 {
     if (!sw_maps.count())
 	return;
 
     if (ev->button() == RightButton) {
 
 	QPoint p = mapToGlobal(QPoint(0, 0));
 	QSize s = popupMenu.sizeHint();
 	int opt = popupMenu.exec(QPoint(p.x() + (width() / 2) - (s.width() / 2),
 					p.y() - s.height()), 0);
 
 	if (opt == -1)
 	    return;
 	lang = opt;
 
 	QCopEnvelope e("MultiKey/Keyboard", "setmultikey(QString)");
 	e << sw_maps[lang];
         setText(labels[lang]);
     }
     QWidget::mousePressEvent(ev);
 }
 
 void Multikey::mouseReleaseEvent(QMouseEvent *ev)
 {
     if (!sw_maps.count())
 	return;
 
     lang = lang < sw_maps.count()-1 ? lang+1 : 0;
     QCopEnvelope e("MultiKey/Keyboard", "setmultikey(QString)");
     //qDebug("Lang=%d, count=%d, lab=%s", lang, sw_maps.count(), labels[lang].ascii());
     e << sw_maps[lang];
     setText(labels[lang]);
 }
 
 void Multikey::message(const QCString &message, const QByteArray &data)
 {
     if ( message == "setsw(QString,QString)" ) {
 
 	QDataStream stream(data, IO_ReadOnly);
 	QString maps, current_map;
 	stream >> maps >> current_map;
 	QStringList sw = QStringList::split(QChar('|'), maps);
 	sw.append(current_map);
 
 	QDir map_dir(QPEApplication::qpeDir() + "/share/multikey/", "*.keymap");
 	lang = 0;
 	labels.clear();
 	sw_maps.clear();
 	popupMenu.clear();
 
 	for (uint i = 0; i < sw.count(); ++i) {
 	    QString keymap_map;
 	    if (sw[i][0] != '/') {
 
 		keymap_map =  map_dir.absPath() + "/" + sw[i];
 	    } else {
 
 		if ((map_dir.exists(QFileInfo(sw[i]).fileName(), false)
 		     && i != sw.count()-1) || !QFile::exists(sw[i])) {
 		    continue;
 		}
 		keymap_map = sw[i];
 	    }
 
 	    QFile map(keymap_map);
 	    if (map.open(IO_ReadOnly)) {
 		QString line;
 
 		map.readLine(line, 1024);
 		while (!map.atEnd()) {
 
 		    if (line.find(QRegExp("^sw\\s*=\\s*")) != -1) {
 
 			if (i != sw.count()-1) {
 			    if (keymap_map == current_map) {
 				lang = i;
 			    }
 			    sw_maps.append(keymap_map);
 			    labels.append(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace());
 			    popupMenu.insertItem(labels[labels.count()-1], labels.count()-1);
 			} else {
 			    current = line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace();
 			}
 			break;
 		    }
 		    map.readLine(line, 1024);
 		}
 		map.close();
 	    }
 	}
 
 	setText(current);
     }
 }
 
 int Multikey::position()
 {
     return 10;
 }
 
 Q_EXPORT_INTERFACE()
 {
     Q_CREATE_INSTANCE( OTaskbarAppletWrapper<Multikey> );
 }
diff --git a/core/launcher/applauncher.cpp b/core/launcher/applauncher.cpp
index c3584ad..7d3c032 100644
--- a/core/launcher/applauncher.cpp
+++ b/core/launcher/applauncher.cpp
@@ -1,724 +1,720 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #ifndef QTOPIA_INTERNAL_PRELOADACCESS
 #define QTOPIA_INTERNAL_PRELOADACCESS
 #endif
 #ifndef QTOPIA_INTERNAL_FILEOPERATIONS
 #define QTOPIA_INTERNAL_FILEOPERATIONS
 #endif
 #ifndef QTOPIA_PROGRAM_MONITOR
 #define QTOPIA_PROGRAM_MONITOR
 #endif
 #include <opie2/oglobal.h>
 
 #ifndef Q_OS_WIN32
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/file.h>
 #include <unistd.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <errno.h>
 #else
 #include <process.h>
 #include <windows.h>
 #include <winbase.h>
 #endif
 
 #include <signal.h>
 #include <sys/types.h>
 #include <stdlib.h>
 
 #include <qtimer.h>
 #include <qwindowsystem_qws.h>
 #include <qmessagebox.h>
-#include <qfile.h>
 #include <qfileinfo.h>
 
 #include <qtopia/qcopenvelope_qws.h>
-#include <qtopia/applnk.h>
 #include <qtopia/qpeapplication.h>
-#include <qtopia/config.h>
-#include <qtopia/global.h>
 
 #include "applauncher.h"
 #include "documentlist.h"
 
 const int AppLauncher::RAISE_TIMEOUT_MS = 5000;
 
 //---------------------------------------------------------------------------
 
 static AppLauncher* appLauncherPtr;
 
 const int appStopEventID = 1290;
 
 class AppStoppedEvent : public QCustomEvent
 {
 public:
     AppStoppedEvent(int pid, int status)
 	: QCustomEvent( appStopEventID ), mPid(pid), mStatus(status) { }
 
     int pid() { return mPid; }
     int status() { return mStatus; }
 
 private:
     int mPid, mStatus;
 };
 
 AppLauncher::AppLauncher(QObject *parent, const char *name)
     : QObject(parent, name), qlPid(0), qlReady(FALSE),
       appKillerBox(0)
 {
     connect(qwsServer, SIGNAL(newChannel(const QString&)), this, SLOT(newQcopChannel(const QString&)));
     connect(qwsServer, SIGNAL(removedChannel(const QString&)), this, SLOT(removedQcopChannel(const QString&)));
     QCopChannel* channel = new QCopChannel( "QPE/System", this );
     connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
 	     this, SLOT(received(const QCString&, const QByteArray&)) );
 
     channel = new QCopChannel( "QPE/Server", this );
     connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
 	     this, SLOT(received(const QCString&, const QByteArray&)) );
 
 #ifndef Q_OS_WIN32
     signal(SIGCHLD, signalHandler);
 #else
     runningAppsProc.setAutoDelete( TRUE );
 #endif
     QString tmp = qApp->argv()[0];
     int pos = tmp.findRev('/');
     if ( pos > -1 )
 	tmp = tmp.mid(++pos);
     runningApps[::getpid()] = tmp;
 
     appLauncherPtr = this;
 
     QTimer::singleShot( 1000, this, SLOT(createQuickLauncher()) );
 }
 
 AppLauncher::~AppLauncher()
 {
     appLauncherPtr = 0;
 #ifndef Q_OS_WIN32
     signal(SIGCHLD, SIG_DFL);
 #endif
     if ( qlPid ) {
 	int status;
 	::kill( qlPid, SIGTERM );
 	waitpid( qlPid, &status, 0 );
     }
 }
 
 /*  We use the QCopChannel of the app as an indicator of when it has been launched
     so that we can disable the busy indicators */
 void AppLauncher::newQcopChannel(const QString& channelName)
 {
 //  qDebug("channel %s added", channelName.data() );
     QString prefix("QPE/Application/");
     if (channelName.startsWith(prefix)) {
 	{
 	    QCopEnvelope e("QPE/System", "newChannel(QString)");
 	    e << channelName;
 	}
 	QString appName = channelName.mid(prefix.length());
 	if ( appName != "quicklauncher" ) {
 	    emit connected( appName );
 	    QCopEnvelope e("QPE/System", "notBusy(QString)");
 	    e << appName;
 	}
     } else if (channelName.startsWith("QPE/QuickLauncher-")) {
 	qDebug("Registered %s", channelName.latin1());
 	int pid = channelName.mid(18).toInt();
 	if (pid == qlPid)
 	    qlReady = TRUE;
     }
 }
 
 void AppLauncher::removedQcopChannel(const QString& channelName)
 {
     if (channelName.startsWith("QPE/Application/")) {
 	QCopEnvelope e("QPE/System", "removedChannel(QString)");
 	e << channelName;
     }
 }
 
 void AppLauncher::received(const QCString& msg, const QByteArray& data)
 {
     QDataStream stream( data, IO_ReadOnly );
     if ( msg == "execute(QString)" ) {
 	QString t;
 	stream >> t;
 	if ( !executeBuiltin( t, QString::null ) )
 	    execute(t, QString::null);
     } else if ( msg == "execute(QString,QString)" ) {
 	QString t,d;
 	stream >> t >> d;
 	if ( !executeBuiltin( t, d ) )
 	    execute( t, d );
     } else if ( msg == "processQCop(QString)" ) { // from QPE/Server
 	QString t;
 	stream >> t;
 	if ( !executeBuiltin( t, QString::null ) )
 	    execute( t, QString::null, TRUE);
     } else if ( msg == "raise(QString)" ) {
 	QString appName;
 	stream >> appName;
 
 	if ( !executeBuiltin( appName, QString::null ) ) {
 	    if ( !waitingHeartbeat.contains( appName ) && appKillerName != appName ) {
 		//qDebug( "Raising: %s", appName.latin1() );
 		QCString channel = "QPE/Application/";
 		channel += appName.latin1();
 
 		// Need to lock it to avoid race conditions with QPEApplication::processQCopFile
 		QFile f("/tmp/qcop-msg-" + appName);
 		if ( f.open(IO_WriteOnly | IO_Append) ) {
 #ifndef Q_OS_WIN32
 		    flock(f.handle(), LOCK_EX);
 #endif
 		    QDataStream ds(&f);
 		    QByteArray b;
 		    QDataStream bstream(b, IO_WriteOnly);
 		    ds << channel << QCString("raise()") << b;
 		    f.flush();
 #ifndef Q_OS_WIN32
 		    flock(f.handle(), LOCK_UN);
 #endif
 		    f.close();
 		}
 		bool alreadyRunning = isRunning( appName );
 		if ( execute(appName, QString::null) ) {
 		    int id = startTimer(RAISE_TIMEOUT_MS + alreadyRunning?2000:0);
 		    waitingHeartbeat.insert( appName, id );
 		}
 	    }
 	}
     } else if ( msg == "sendRunningApps()" ) {
 	QStringList apps;
 	QMap<int,QString>::Iterator it;
         for( it = runningApps.begin(); it != runningApps.end(); ++it )
 	    apps.append( *it );
 	QCopEnvelope e( "QPE/Desktop", "runningApps(QStringList)" );
 	e << apps;
     } else if ( msg == "appRaised(QString)" ) {
 	QString appName;
 	stream >> appName;
 	qDebug("Got a heartbeat from %s", appName.latin1());
 	QMap<QString,int>::Iterator it = waitingHeartbeat.find(appName);
 	if ( it != waitingHeartbeat.end() ) {
 	    killTimer( *it );
 	    waitingHeartbeat.remove(it);
 	}
 	// Check to make sure we're not waiting on user input...
 	if ( appKillerBox && appName == appKillerName ) {
 	    // If we are, we kill the dialog box, and the code waiting on the result
 	    // will clean us up (basically the user said "no").
 	    delete appKillerBox;
 	    appKillerBox = 0;
 	    appKillerName = QString::null;
 	}
     }
 }
 
 void AppLauncher::signalHandler(int)
 {
 #ifndef Q_OS_WIN32
     int status;
     pid_t pid = waitpid(-1, &status, WNOHANG);
 /*    if (pid == 0 || &status == 0 ) {
 	qDebug("hmm, could not get return value from signal");
     }
 */
     QApplication::postEvent(appLauncherPtr, new AppStoppedEvent(pid, status) );
 #else
     qDebug("Unhandled signal see by AppLauncher::signalHandler(int)");
 #endif
 }
 
 bool AppLauncher::event(QEvent *e)
 {
     if ( e->type() == appStopEventID ) {
 	AppStoppedEvent *ae = (AppStoppedEvent *) e;
 	sigStopped(ae->pid(), ae->status() );
 	return TRUE;
     }
 
     return QObject::event(e);
 }
 
 void AppLauncher::timerEvent( QTimerEvent *e )
 {
     int id = e->timerId();
     QMap<QString,int>::Iterator it;
     for ( it = waitingHeartbeat.begin(); it != waitingHeartbeat.end(); ++it ) {
 	if ( *it == id ) {
 	    if ( appKillerBox ) // we're already dealing with one
 		return;
 
 	    appKillerName = it.key();
 	    killTimer( id );
 	    waitingHeartbeat.remove( it );
 
 	    // qDebug("Checking in on %s", appKillerName.latin1());
 
 	    // We store this incase the application responds while we're
 	    // waiting for user input so we know not to delete ourselves.
 	    appKillerBox = new QMessageBox(tr("Application Problem"),
 		    tr("<p>%1 is not responding.</p>").arg(appKillerName) +
 		    tr("<p>Would you like to force the application to exit?</p>"),
 		    QMessageBox::Warning, QMessageBox::Yes,
 		    QMessageBox::No | QMessageBox::Default,
 		    QMessageBox::NoButton);
 	    if (appKillerBox->exec() == QMessageBox::Yes) {
 		// qDebug("Killing the app!!! Bwuhahahaha!");
 		int pid = pidForName(appKillerName);
 		if ( pid > 0 )
 		    kill( pid );
 	    }
 	    appKillerName = QString::null;
 	    delete appKillerBox;
 	    appKillerBox = 0;
 	    return;
 	}
     }
 
     QObject::timerEvent( e );
 }
 
 #ifndef Q_OS_WIN32
 void AppLauncher::sigStopped(int sigPid, int sigStatus)
 {
     int exitStatus = 0;
 
     bool crashed = WIFSIGNALED(sigStatus);
     if ( !crashed ) {
 	if ( WIFEXITED(sigStatus) )
 	    exitStatus = WEXITSTATUS(sigStatus);
     } else {
 	exitStatus  = WTERMSIG(sigStatus);
     }
 
     QMap<int,QString>::Iterator it = runningApps.find( sigPid );
     if ( it == runningApps.end() ) {
 	if ( sigPid == qlPid ) {
 	    qDebug( "quicklauncher stopped" );
 	    qlPid = 0;
 	    qlReady = FALSE;
 	    QFile::remove("/tmp/qcop-msg-quicklauncher" );
 	    QTimer::singleShot( 2000, this, SLOT(createQuickLauncher()) );
 	}
 /*
 	if ( sigPid == -1 )
 	    qDebug("non-qtopia application exited (disregarded)");
 	else
 	    qDebug("==== no pid matching %d in list, definite bug", sigPid);
 */
 	return;
     }
     QString appName = *it;
     runningApps.remove(it);
 
     QMap<QString,int>::Iterator hbit = waitingHeartbeat.find(appName);
     if ( hbit != waitingHeartbeat.end() ) {
 	killTimer( *hbit );
 	waitingHeartbeat.remove( hbit );
     }
     if ( appName == appKillerName ) {
 	appKillerName = QString::null;
 	delete appKillerBox;
 	appKillerBox = 0;
     }
 
     /* we must disable preload for an app that crashes as the system logic relies on preloaded apps
        actually being loaded.  If eg. the crash happened in the constructor, we can't automatically reload
        the app (withouth some timeout value for eg. 3 tries (which I think is a bad solution)
     */
     bool preloadDisabled = FALSE;
     if ( !DocumentList::appLnkSet ) return;
     const AppLnk* app = DocumentList::appLnkSet->findExec( appName );
     if ( !app ) return; // QCop messages processed to slow?
     if ( crashed && app->isPreloaded() ) {
 	Config cfg("Launcher");
 	cfg.setGroup("Preload");
 	QStringList apps = cfg.readListEntry("Apps",',');
 	QString exe = app->exec();
 	apps.remove(exe);
 	cfg.writeEntry("Apps",apps,',');
 	preloadDisabled = TRUE;
     }
 
     // clean up
     if ( exitStatus ) {
 	QCopEnvelope e("QPE/System", "notBusy(QString)");
 	e << app->exec();
     }
 /*
     // debug info
     for (it = runningApps.begin(); it != runningApps.end(); ++it) {
 	qDebug("running according to internal list: %s, with pid %d", (*it).data(), it.key() );
     }
 */
 
 #ifdef QTOPIA_PROGRAM_MONITOR
     if ( crashed ) {
 	QString sig;
 	switch( exitStatus ) {
 	    case SIGABRT: sig = "SIGABRT"; break;
 	    case SIGALRM: sig = "SIGALRM"; break;
 	    case SIGBUS: sig = "SIGBUS"; break;
 	    case SIGFPE: sig = "SIGFPE"; break;
 	    case SIGHUP: sig = "SIGHUP"; break;
 	    case SIGILL: sig = "SIGILL"; break;
 	    case SIGKILL: sig = "SIGKILL"; break;
 	    case SIGPIPE: sig = "SIGPIPE"; break;
 	    case SIGQUIT: sig = "SIGQUIT"; break;
 	    case SIGSEGV: sig = "SIGSEGV"; break;
 	    case SIGTERM: sig = "SIGTERM"; break;
 	    case SIGTRAP: sig = "SIGTRAP"; break;
 	    default: sig = QString("Unkown %1").arg(exitStatus);
 	}
 	if ( preloadDisabled )
 	    sig += tr("<qt><p>Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.</qt>");
 
 	QString str = tr("<qt><b>%1</b> was terminated due to signal code %2</qt>").arg( app->name() ).arg( sig );
 	QMessageBox::information(0, tr("Application terminated"), str );
     } else {
 	if ( exitStatus == 255 ) {  //could not find app (because global returns -1)
 	    QMessageBox::information(0, tr("Application not found"), tr("<qt>Could not locate application <b>%1</b></qt>").arg( app->exec() ) );
 	} else  {
 	    QFileInfo fi(QString::fromLatin1("/tmp/qcop-msg-") + appName);
 	    if ( fi.exists() && fi.size() ) {
 		emit terminated(sigPid, appName);
                 qWarning("Re executing obmitted for %s", appName.latin1() );
 //		execute( appName, QString::null );
 		return;
 	    }
 	}
     }
 
 #endif
 
     emit terminated(sigPid, appName);
 }
 #else
 void AppLauncher::sigStopped(int sigPid, int sigStatus)
 {
     qDebug("Unhandled signal : AppLauncher::sigStopped(int sigPid, int sigStatus)");
 }
 #endif // Q_OS_WIN32
 
 bool AppLauncher::isRunning(const QString &app)
 {
     for (QMap<int,QString>::ConstIterator it = runningApps.begin(); it != runningApps.end(); ++it) {
 	if ( *it == app ) {
 #ifdef Q_OS_UNIX
 	    pid_t t = ::__getpgid( it.key() );
 	    if ( t == -1 ) {
 		qDebug("appLauncher bug, %s believed running, but pid %d is not existing", app.data(), it.key() );
 		runningApps.remove( it.key() );
 		return FALSE;
 	    }
 #endif
 	    return TRUE;
 	}
     }
 
     return FALSE;
 }
 
 bool AppLauncher::executeBuiltin(const QString &c, const QString &document)
 {
     Global::Command* builtin = OGlobal::builtinCommands();
     QGuardedPtr<QWidget> *running = OGlobal::builtinRunning();
 
     // Attempt to execute the app using a builtin class for the app
     if (builtin) {
 	for (int i = 0; builtin[i].file; i++) {
 	    if ( builtin[i].file == c ) {
 		if ( running[i] ) {
 		    if ( !document.isNull() && builtin[i].documentary )
 			Global::setDocument(running[i], document);
 		    running[i]->raise();
 		    running[i]->show();
 		    running[i]->setActiveWindow();
 		} else {
 		    running[i] = builtin[i].func( builtin[i].maximized );
 		}
 #ifndef QT_NO_COP
 		QCopEnvelope e("QPE/System", "notBusy(QString)" );
 		e << c; // that was quick ;-)
 #endif
 		return TRUE;
 	    }
 	}
     }
 
     // Convert the command line in to a list of arguments
     QStringList list = QStringList::split(QRegExp("  *"),c);
     QString ap=list[0];
 
     if ( ap == "suspend" ) { // No tr
 	QWSServer::processKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE );
 	return TRUE;
     }
 
     return FALSE;
 }
 
 bool AppLauncher::execute(const QString &c, const QString &docParam, bool noRaise)
 {
     qWarning("AppLauncher::execute '%s' '%s'", (const char*) c, (const char*) docParam );
     // Convert the command line in to a list of arguments
     QStringList list = QStringList::split(QRegExp("  *"),c);
     if ( !docParam.isEmpty() )
 	list.append( docParam );
 
     QString appName = list[0];
     if ( isRunning(appName) ) {
 	QCString channel = "QPE/Application/";
 	channel += appName.latin1();
 
 	// Need to lock it to avoid race conditions with QPEApplication::processQCopFile
         QFile f(QString::fromLatin1("/tmp/qcop-msg-") + appName);
 	if ( !noRaise && f.open(IO_WriteOnly | IO_Append) ) {
 #ifndef Q_OS_WIN32
 	    flock(f.handle(), LOCK_EX);
 #endif
 
 	    QDataStream ds(&f);
 	    QByteArray b;
 	    QDataStream bstream(b, IO_WriteOnly);
 	    if ( !f.size() ) {
 		ds << channel << QCString("raise()") << b;
 		if ( !waitingHeartbeat.contains( appName ) && appKillerName != appName ) {
 		    int id = startTimer(RAISE_TIMEOUT_MS);
 		    waitingHeartbeat.insert( appName, id );
 		}
 	    }
 	    if ( !docParam.isEmpty() ) {
 		bstream << docParam;
 		ds << channel << QCString("setDocument(QString)") << b;
 	    }
 
 	    f.flush();
 #ifndef Q_OS_WIN32
 	    flock(f.handle(), LOCK_UN);
 #endif
 	    f.close();
 	}
 	if ( QCopChannel::isRegistered(channel) ) // avoid unnecessary warnings
 	    QCopChannel::send(channel,"QPEProcessQCop()");
 
 	return TRUE;
     }
 
 #ifdef QT_NO_QWS_MULTIPROCESS
     QMessageBox::warning( 0, tr("Error"), tr("<qt>Could not find the application %1</qt>").arg(c),
 	tr("OK"), 0, 0, 0, 1 );
 #else
 
     QStrList slist;
     unsigned j;
     for ( j = 0; j < list.count(); j++ )
 	slist.append( list[j].utf8() );
 
     const char **args = new const char *[slist.count() + 1];
     for ( j = 0; j < slist.count(); j++ )
 	args[j] = slist.at(j);
     args[j] = NULL;
 
 #ifndef Q_OS_WIN32
 #ifdef Q_OS_MACX
     if ( qlPid && qlReady && QFile::exists( QPEApplication::qpeDir()+"plugins/application/lib"+args[0] + ".dylib" ) ) {
 #else
     if ( qlPid && qlReady && QFile::exists( QPEApplication::qpeDir()+"plugins/application/lib"+args[0] + ".so" ) ) {
 #endif /* Q_OS_MACX */
 	qDebug( "Quick launching: %s", args[0] );
 	if ( getuid() == 0 )
 	    setpriority( PRIO_PROCESS, qlPid, 0 );
 	QCString qlch("QPE/QuickLauncher-");
 	qlch += QString::number(qlPid);
 	QCopEnvelope env( qlch, "execute(QStrList)" );
 	env << slist;
 	runningApps[qlPid] = QString(args[0]);
 	emit launched(qlPid, QString(args[0]));
 	QCopEnvelope e("QPE/System", "busy()");
 	qlPid = 0;
 	qlReady = FALSE;
 	QTimer::singleShot( getuid() == 0 ? 800 : 1500, this, SLOT(createQuickLauncher()) );
     } else {
 	int pid = ::vfork();
 	if ( !pid ) {
 	    for ( int fd = 3; fd < 100; fd++ )
 		::close( fd );
 	    ::setpgid( ::getpid(), ::getppid() );
 	    // Try bindir first, so that foo/bar works too
 	    ::execv( QPEApplication::qpeDir()+"bin/"+args[0], (char * const *)args );
 	    ::execvp( args[0], (char * const *)args );
 	    _exit( -1 );
 	}
 
 	runningApps[pid] = QString(args[0]);
 	emit launched(pid, QString(args[0]));
 	QCopEnvelope e("QPE/System", "busy()");
     }
 #else
     QProcess *proc = new QProcess(this);
     if (proc){
 	for (int i=0; i < slist.count(); i++)
 	    proc->addArgument(args[i]);
 	connect(proc, SIGNAL(processExited()), this, SLOT(processExited()));
 	if (!proc->start()){
 	    qDebug("Unable to start application %s", args[0]);
 	}else{
 	    PROCESS_INFORMATION *procInfo = (PROCESS_INFORMATION *)proc->processIdentifier();
 	    if (procInfo){
 		DWORD pid = procInfo->dwProcessId;
 		runningApps[pid] = QString(args[0]);
 		runningAppsProc.append(proc);
 		emit launched(pid, QString(args[0]));
 		QCopEnvelope e("QPE/System", "busy()");
 	    }else{
 		qDebug("Unable to read process inforation #1 for %s", args[0]);
 	    }
 	}
     }else{
 	qDebug("Unable to create process for application %s", args[0]);
 	return FALSE;
     }
 #endif
 #endif //QT_NO_QWS_MULTIPROCESS
 
     delete [] args;
     return TRUE;
 }
 
 void AppLauncher::kill( int pid )
 {
 #ifndef Q_OS_WIN32
     ::kill( pid, SIGTERM );
 #else
     for ( QProcess *proc = runningAppsProc.first(); proc; proc = runningAppsProc.next() ) {
 	if ( proc->processIdentifier() == pid ) {
 	    proc->kill();
 	    break;
 	}
     }
 #endif
 }
 
 int AppLauncher::pidForName( const QString &appName )
 {
     int pid = -1;
 
     QMap<int, QString>::Iterator it;
     for (it = runningApps.begin(); it!= runningApps.end(); ++it) {
 	if (*it == appName) {
 	    pid = it.key();
 	    break;
 	}
     }
 
     return pid;
 }
 
 void AppLauncher::createQuickLauncher()
 {
     static bool disabled = FALSE;
     if (disabled)
         return;
 
     qlReady = FALSE;
     qlPid = ::vfork();
     if ( !qlPid ) {
 	char **args = new char *[2];
 	args[0] = "quicklauncher";
 	args[1] = 0;
 	for ( int fd = 3; fd < 100; fd++ )
 	    ::close( fd );
 	::setpgid( ::getpid(), ::getppid() );
 	// Try bindir first, so that foo/bar works too
         /*
          * LD_BIND_NOW will change the behaviour of ld.so and dlopen
          * RTLD_LAZY will be made RTLD_NOW which leads to problem
          * with miscompiled libraries... if LD_BIND_NOW is set.. there
          * is no way back.. We will wait for numbers from TT to see
          * if using LD_BIND_NOW is worth it - zecke
          */
 //	setenv( "LD_BIND_NOW", "1", 1 );
 	::execv( QPEApplication::qpeDir()+"bin/quicklauncher", args );
 	::execvp( "quicklauncher", args );
         delete []args;
         disabled = TRUE;
 	_exit( -1 );
     } else if ( qlPid == -1 ) {
 	qlPid = 0;
     } else {
 	if ( getuid() == 0 )
 	    setpriority( PRIO_PROCESS, qlPid, 19 );
     }
 }
 
 // Used only by Win32
 void AppLauncher::processExited()
 {
 #ifdef Q_OS_WIN32
     qDebug("AppLauncher::processExited()");
     bool found = FALSE;
     QProcess *proc = (QProcess *) sender();
     if (!proc){
 	qDebug("Interanl error NULL proc");
 	return;
     }
 
     QString appName = proc->arguments()[0];
     qDebug("Removing application %s", appName.latin1());
     runningAppsProc.remove(proc);
 
     QMap<QString,int>::Iterator hbit = waitingHeartbeat.find(appName);
     if ( hbit != waitingHeartbeat.end() ) {
 	killTimer( *hbit );
 	waitingHeartbeat.remove( hbit );
     }
     if ( appName == appKillerName ) {
 	appKillerName = QString::null;
 	delete appKillerBox;
 	appKillerBox = 0;
     }
 
     // Search for the app to find its PID
     QMap<int, QString>::Iterator it;
     for (it = runningApps.begin(); it!= runningApps.end(); ++it){
 	if (it.data() == appName){
 	    found = TRUE;
 	    break;
 	}
     }
 
     if (found){
 	emit terminated(it.key(), it.data());
 	runningApps.remove(it.key());
     }else{
 	qDebug("Internal error application %s not listed as running", appName.latin1());
     }
 
 #endif
 }
 
diff --git a/core/launcher/firstuse.cpp b/core/launcher/firstuse.cpp
index e07920f..50ae6c2 100644
--- a/core/launcher/firstuse.cpp
+++ b/core/launcher/firstuse.cpp
@@ -1,521 +1,513 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 // I need access to some things you don't normally get access to.
 
 #ifndef _MSC_VER
   //### revise to allow removal of translators under MSVC
 #define private public
 #define protected public
 #endif
 #include "firstuse.h"
 #include "inputmethods.h"
 #include "applauncher.h"
 #include "serverapp.h"
 //#include <qtopia/custom.h>
 
 #include "calibrate.h"
 #include "documentlist.h"
 
 #include <qtopia/resource.h>
 #include <qtopia/qcopenvelope_qws.h>
-#include <qtopia/qpeapplication.h>
 #include <qtopia/config.h>
-#include <qtopia/applnk.h>
-#include <qtopia/mimetype.h>
 #include <qtopia/fontmanager.h>
 
-#include <qapplication.h>
 #include <qfile.h>
 #include <qpainter.h>
-#include <qcstring.h>
 #include <qsimplerichtext.h>
-#include <qcolor.h>
 #include <qpushbutton.h>
-#include <qhbox.h>
 #include <qlabel.h>
 #include <qtimer.h>
 
 #if defined( Q_WS_QWS )
 #include <qwsdisplay_qws.h>
 #include <qgfx_qws.h>
 #endif
 
-#include <qwindowsystem_qws.h>
 
 #include <stdlib.h>
 #include <sys/types.h>
 #if defined(Q_OS_LINUX) || defined(_OS_LINUX_)
 #include <unistd.h>
 #endif
 
 
 struct {
     bool enabled;
     const char *app;
     const char *start;
     const char *stop;
     const char *desc;
 }
 settingsTable [] =
 {
     { FALSE, "language", "raise()", "accept()", // No tr
 	QT_TR_NOOP("Language") },
     { FALSE, "doctab", "raise()", "accept()", // No tr
 	QT_TR_NOOP("DocTab") },
 #ifndef Q_OS_WIN32
     { FALSE, "systemtime", "raise()", "accept()", // No tr
 	QT_TR_NOOP("Time and Date") },
 #endif
     { FALSE, "addressbook", "editPersonalAndClose()", "accept()", // No tr
 	QT_TR_NOOP("Personal Information") },
     { FALSE, 0, 0, 0, 0 }
 };
 
 
 FirstUse::FirstUse(QWidget* parent, const char * name, WFlags wf) :
     QDialog( parent, name, TRUE, wf),
     transApp(0), transLib(0), needCalibrate(FALSE), currApp(-1),
     waitForExit(-1), waitingForLaunch(FALSE), needRestart(FALSE)
 {
     ServerApplication::allowRestart = FALSE;
     // we force our height beyound the maximum (which we set anyway)
     QRect desk = qApp->desktop()->geometry();
     setGeometry( 0, 0, desk.width(), desk.height() );
 
     connect(qwsServer, SIGNAL(newChannel(const QString&)),
 	this, SLOT(newQcopChannel(const QString&)));
 
     // Create a DocumentList so appLauncher has appLnkSet to search
     docList = new DocumentList( 0, FALSE );
     appLauncher = new AppLauncher( this );
     connect( appLauncher, SIGNAL(terminated(int, const QString&)),
 	    this, SLOT(terminated(int, const QString&)) );
 
     // more hackery
     // I will be run as either the main server or as part of the main server
     QWSServer::setScreenSaverIntervals(0);
     loadPixmaps();
 
     //check if there is a language program
 #ifndef Q_OS_WIN32
     QString exeSuffix;
 #else
     QString exeSuffix(".exe");
 #endif
 
     for ( int i = 0; settingsTable[i].app; i++ ) {
 	QString file = QPEApplication::qpeDir() + "bin/";
 	file += settingsTable[i].app;
 	file += exeSuffix;
 	if ( QFile::exists(file) )
 	    settingsTable[i].enabled = TRUE;
     }
 
     setFocusPolicy(NoFocus);
 
     taskBar = new QWidget(0, 0, WStyle_Tool | WStyle_Customize | WStyle_StaysOnTop | WGroupLeader);
 
     inputMethods = new InputMethods(taskBar);
     connect(inputMethods, SIGNAL(inputToggled(bool)),
 	    this, SLOT(calcMaxWindowRect()));
 
     back = new QPushButton(tr("<< Back"), taskBar);
     back->setFocusPolicy(NoFocus);
     connect(back, SIGNAL(clicked()), this, SLOT(previousDialog()) );
 
     next = new QPushButton(tr("Next >>"), taskBar);
     next->setFocusPolicy(NoFocus);
     connect(next, SIGNAL(clicked()), this, SLOT(nextDialog()) );
 
     // need to set the geom to lower corner
     QSize sz = inputMethods->sizeHint();
     int buttonWidth = (width() - sz.width()) / 2;
     int x = 0;
 
     controlHeight = back->sizeHint().height();
 
     inputMethods->setGeometry(0,0, sz.width(), controlHeight );
     x += sz.width();
 
     back->setGeometry(x, 0, buttonWidth, controlHeight);
     x += buttonWidth;
     next->setGeometry(x, 0, buttonWidth, controlHeight);
 
     taskBar->setGeometry( 0, height() - controlHeight, desk.width(), controlHeight);
     taskBar->hide();
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     qDebug("Setting up QCop to QPE/System");
     QCopChannel* sysChannel = new QCopChannel( "QPE/System", this );
     connect(sysChannel, SIGNAL(received(const QCString &, const QByteArray &)),
 	    this, SLOT(message(const QCString &, const QByteArray &)) );
 #endif
     calcMaxWindowRect();
 
     m_calHandler = ( QWSServer::mouseHandler() && QWSServer::mouseHandler()->inherits("QCalibratedMouseHandler") ) ? true : false;
 
     if ( m_calHandler) {
         if ( !QFile::exists("/etc/pointercal") ) {
             needCalibrate = TRUE;
             grabMouse();
         }
     }
 
     Config config("locale");
     config.setGroup( "Language");
     lang = config.readEntry( "Language", "en");
 
     defaultFont = font();
 
     //###language/font hack; should look it up somewhere
 #ifdef Q_WS_QWS
     if ( lang == "ja" || lang == "zh_CN" || lang == "zh_TW" || lang == "ko" ) {
 	QFont fn = FontManager::unicodeFont( FontManager::Proportional );
 	qApp->setFont( fn, TRUE );
     }
 #endif
 }
 
 FirstUse::~FirstUse()
 {
     delete appLauncher;
     delete docList;
     delete taskBar;
     ServerApplication::allowRestart = TRUE;
 }
 
 void FirstUse::calcMaxWindowRect()
 {
 #ifdef Q_WS_QWS
     QRect wr;
     int displayWidth  = qApp->desktop()->width();
     QRect ir = inputMethods->inputRect();
     if ( ir.isValid() ) {
 	wr.setCoords( 0, 0, displayWidth-1, ir.top()-1 );
     } else {
 	wr.setCoords( 0, 0, displayWidth-1,
 		qApp->desktop()->height() - controlHeight-1);
     }
 
 #if QT_VERSION < 0x030000
     QWSServer::setMaxWindowRect( qt_screen->mapToDevice(wr,
 		QSize(qt_screen->width(),qt_screen->height()))
 			       );
 #else
     QWSServer::setMaxWindowRect( wr );
 #endif
 #endif
 }
 
 /* cancel current dialog, and bring up next */
 void FirstUse::nextDialog()
 {
     int prevApp = currApp;
     do {
 	currApp++;
 	qDebug( "currApp = %d", currApp );
 	if ( settingsTable[currApp].app == 0 ) {
 	    if ( prevApp >= 0 && appLauncher->isRunning(settingsTable[prevApp].app) ) {
 		// The last application is still running.
 		// Tell it to stop, and when its done we'll come back
 		// to nextDialog and exit.
 		qDebug( "Waiting for %s to exit", settingsTable[prevApp].app );
 		QCopEnvelope e(QCString("QPE/Application/") + settingsTable[prevApp].app,
 			settingsTable[prevApp].stop );
 		currApp = prevApp;
 	    } else {
 		qDebug( "Done!" );
 		Config config( "qpe" );
 		config.setGroup( "Startup" );
 		config.writeEntry( "FirstUse", FALSE );
 		QPixmap pix = Resource::loadPixmap("bigwait");
 		QLabel *lblWait = new QLabel(0, "wait hack!", // No tr
 			QWidget::WStyle_Customize | QWidget::WDestructiveClose |
 			QWidget::WStyle_NoBorder | QWidget::WStyle_Tool |
 			QWidget::WStyle_StaysOnTop);
 		lblWait->setPixmap( pix );
 		lblWait->setAlignment( QWidget::AlignCenter );
 		lblWait->setGeometry( qApp->desktop()->geometry() );
 		lblWait->show();
 		qApp->processEvents();
 		QTimer::singleShot( 1000, lblWait, SLOT(close()) );
 		repaint();
 		close();
 		ServerApplication::allowRestart = TRUE;
 	    }
 	    return;
 	}
     } while ( !settingsTable[currApp].enabled );
 
     if ( prevApp >= 0 && appLauncher->isRunning(settingsTable[prevApp].app) ) {
 	qDebug( "Shutdown: %s", settingsTable[prevApp].app );
 	QCopEnvelope e(QCString("QPE/Application/") + settingsTable[prevApp].app,
 			settingsTable[prevApp].stop );
 	waitForExit = prevApp;
     } else {
 	qDebug( "Startup: %s", settingsTable[currApp].app );
 	QCopEnvelope e(QCString("QPE/Application/") + settingsTable[currApp].app,
 		settingsTable[currApp].start );
 	waitingForLaunch = TRUE;
     }
 
     updateButtons();
 }
 
 /* accept current dialog and bring up previous */
 void FirstUse::previousDialog()
 {
     int prevApp = currApp;
     do {
 	currApp--;
 	if ( currApp < 0 ) {
 	    currApp = prevApp;
 	    return;
 	}
     } while ( !settingsTable[currApp].enabled );
 
     if ( prevApp >= 0 ) {
 	qDebug( "Shutdown: %s", settingsTable[prevApp].app );
 	QCopEnvelope e(QCString("QPE/Application/") + settingsTable[prevApp].app,
 			settingsTable[prevApp].stop );
 /*
 	if (settingsTable[prevApp].app == QString("systemtime"))
 	    QCopEnvelope e("QPE/Application/citytime", "close()");
 */
 	waitForExit = prevApp;
     } else {
 	qDebug( "Startup: %s", settingsTable[currApp].app );
 	QCopEnvelope e(QCString("QPE/Application/") + settingsTable[currApp].app,
 		settingsTable[currApp].start );
 	waitingForLaunch = TRUE;
     }
 
     updateButtons();
 }
 
 void FirstUse::message(const QCString &msg, const QByteArray &data)
 {
     QDataStream stream( data, IO_ReadOnly );
     if ( msg == "timeChange(QString)" ) {
 	QString t;
 	stream >> t;
 	if ( t.isNull() )
 	    unsetenv("TZ");
 	else
 	    setenv( "TZ", t.latin1(), 1 );
     }
 }
 
 void FirstUse::terminated( int, const QString &app )
 {
     qDebug( "--- terminated: %s", app.latin1() );
     if ( waitForExit != -1 && settingsTable[waitForExit].app == app ) {
 	qDebug( "Startup: %s", settingsTable[currApp].app );
 	if ( settingsTable[waitForExit].app == "language" ) { // No tr
 	    Config config("locale");
 	    config.setGroup( "Language");
 	    QString l = config.readEntry( "Language", "en");
 	    if ( l != lang ) {
 		reloadLanguages();
 		needRestart = TRUE;
 		lang = l;
 	    }
 	}
 	QCopEnvelope e(QCString("QPE/Application/") + settingsTable[currApp].app,
 		settingsTable[currApp].start );
 	waitingForLaunch = TRUE;
 	updateButtons();
 	repaint();
 	waitForExit = -1;
     } else if ( settingsTable[currApp].app == app ) {
 	nextDialog();
     } else {
 	back->setEnabled(TRUE);
 	next->setEnabled(TRUE);
     }
 }
 
 void FirstUse::newQcopChannel(const QString& channelName)
 {
     qDebug("channel %s added", channelName.data() );
     QString prefix("QPE/Application/");
     if (channelName.startsWith(prefix)) {
 	QString appName = channelName.mid(prefix.length());
 	if ( currApp >= 0 && appName == settingsTable[currApp].app ) {
 	    qDebug( "Application: %s started", settingsTable[currApp].app );
 	    waitingForLaunch = FALSE;
 	    updateButtons();
 	    repaint();
 	} else if (appName != "quicklauncher") {
 	    back->setEnabled(FALSE);
 	    next->setEnabled(FALSE);
 	}
     }
 }
 
 void FirstUse::reloadLanguages()
 {
     // read language from config file.  Waiting on QCop takes too long.
     Config config("locale");
     config.setGroup( "Language");
     QString l = config.readEntry( "Language", "en");
     QString cl = getenv("LANG");
     qWarning("language message - " + l);
     // setting anyway...
     if (l.isNull() )
 	unsetenv( "LANG" );
     else {
 	qWarning("and its not null");
 	setenv( "LANG", l.latin1(), 1 );
     }
 #ifndef QT_NO_TRANSLATION
     // clear old translators
 #ifndef _MSC_VER
   //### revise to allow removal of translators under MSVC
   if(qApp->translators) {
         qApp->translators->setAutoDelete(TRUE);
         delete (qApp->translators);
         qApp->translators = 0;
     }
 #endif
 
     // load translation tables
     transApp = new QTranslator(qApp);
     QString tfn = QPEApplication::qpeDir() + "i18n/"+l+"/qpe.qm";
     qWarning("loading " + tfn);
     if ( transApp->load(tfn) ) {
 	qWarning("installing translator");
 	qApp->installTranslator( transApp );
     } else  {
 	delete transApp;
 	transApp = 0;
     }
 
     transLib = new QTranslator(qApp);
     tfn = QPEApplication::qpeDir() + "i18n/"+l+"/libqpe.qm";
     qWarning("loading " + tfn);
     if ( transLib->load(tfn) ) {
 	qWarning("installing translator library");
 	qApp->installTranslator( transLib );
     } else  {
 	delete transLib;
 	transLib = 0;
     }
     loadPixmaps();
     //###language/font hack; should look it up somewhere
 #ifdef Q_WS_QWS
     if ( l == "ja" || l == "zh_CN" || l == "zh_TW" || l == "ko" ) {
 	QFont fn = FontManager::unicodeFont( FontManager::Proportional );
 	qApp->setFont( fn, TRUE );
     } else {
 	qApp->setFont( defaultFont, TRUE );
     }
 #endif
 #endif
 }
 
 void FirstUse::paintEvent( QPaintEvent * )
 {
     QPainter p( this );
 
     p.drawPixmap(0,0, splash);
 
     QFont f = p.font();
     f.setPointSize(15);
     f.setItalic(FALSE);
     f.setBold(FALSE);
     p.setFont(f);
 
     if ( currApp < 0 ) {
 	drawText(p, tr( "Tap anywhere on the screen to continue." ));
     } else if ( settingsTable[currApp].app ) {
 	if ( waitingForLaunch )
 	    drawText(p, tr("Please wait, loading %1 settings.").arg(tr(settingsTable[currApp].desc)) );
     } else {
 	drawText(p, tr("Please wait..."));
     }
 }
 
 void FirstUse::loadPixmaps()
 {
     /* create background, tr so can change image with language.
        images will likely contain text. */
     splash.convertFromImage( Resource::loadImage(tr("FirstUseBackground"))
 	    .smoothScale( width(), height() ) );
 
     setBackgroundPixmap(splash);
 }
 
 void FirstUse::drawText(QPainter &p, const QString &text)
 {
     QString altered = "<CENTER>" + text + "</CENTER>";
 
     QSimpleRichText rt(altered, p.font());
     rt.setWidth(width() - 20);
 
     int h = (height() * 3) / 10; // start at 30%
     if (rt.height() < height() / 2)
 	h += ((height() / 2) - rt.height()) / 2;
     rt.draw(&p, 10, h, QRegion(0,0, width()-20, height()), palette());
 }
 
 void FirstUse::updateButtons()
 {
     if ( currApp >= 0 ) {
 	taskBar->show();
     }
 
     int i = currApp-1;
     while ( i >= 0 && !settingsTable[i].enabled )
 	i--;
     back->setText(tr("<< Back"));
     back->setEnabled( i >= 0 && !waitingForLaunch );
 
     i = currApp+1;
     while ( settingsTable[i].app && !settingsTable[i].enabled )
 	i++;
     if ( !settingsTable[i].app )
 	next->setText(tr("Finish"));
     else
 	next->setText(tr("Next >>"));
 
     next->setEnabled( !waitingForLaunch );
 }
 
 void FirstUse::keyPressEvent( QKeyEvent *e )
 {
     // Allow cancelling at first dialog, in case display is broken.
     if ( e->key() == Key_Escape && currApp < 0 )
 	QDialog::keyPressEvent(e);
 }
 
 void FirstUse::mouseReleaseEvent( QMouseEvent * )
 {
     if ( currApp < 0 ) {
 	if ( m_calHandler && needCalibrate ) {
 	    releaseMouse();
 	    Calibrate *cal = new Calibrate;
 	    cal->exec();
 	    delete cal;
 	}
 	nextDialog();
     }
 }
diff --git a/core/launcher/inputmethods.cpp b/core/launcher/inputmethods.cpp
index 5d8faf7..683f1e2 100644
--- a/core/launcher/inputmethods.cpp
+++ b/core/launcher/inputmethods.cpp
@@ -1,630 +1,624 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #define QTOPIA_INTERNAL_LANGLIST
 #include "inputmethods.h"
 
 #include <qtopia/config.h>
 #include <qtopia/qpeapplication.h>
-#include <qtopia/inputmethodinterface.h>
-#include <qtopia/global.h>
 
 #include <qpopupmenu.h>
-#include <qpushbutton.h>
 #include <qtoolbutton.h>
 #include <qwidgetstack.h>
-#include <qwidget.h>
 #include <qlayout.h>
-#include <qtimer.h>
 #include <qdir.h>
 #include <stdlib.h>
-#include <qtranslator.h>
 #include <qtl.h>
 
 #ifdef Q_WS_QWS
 #include <qwindowsystem_qws.h>
 #include <qwsevent_qws.h>
 #include <qcopchannel_qws.h>
 #endif
 
 /* ### SingleFloppy if someone is interested? */
 #if 0
 #ifdef QT_NO_COMPONENT
 #include "../plugins/inputmethods/handwriting/handwritingimpl.h"
 #include "../plugins/inputmethods/keyboard/keyboardimpl.h"
 #include "../3rdparty/plugins/inputmethods/pickboard/pickboardimpl.h"
 #endif
 #endif
 
 /* XPM */
 static const char * tri_xpm[]={
 "9 9 2 1",
 "a c #000000",
 ". c None",
 ".........",
 ".........",
 ".........",
 "....a....",
 "...aaa...",
 "..aaaaa..",
 ".aaaaaaa.",
 ".........",
 "........."};
 
 int InputMethod::operator <(const InputMethod& o) const
 {
     return name() < o.name();
 }
 int InputMethod::operator >(const InputMethod& o) const
 {
     return name() > o.name();
 }
 int InputMethod::operator <=(const InputMethod& o) const
 {
     return name() <= o.name();
 }
 
 
 /*
   Slightly hacky: We use WStyle_Tool as a flag to say "this widget
   belongs to the IM system, so clicking it should not cause a reset".
  */
 class IMToolButton : public QToolButton
 {
 public:
     IMToolButton::IMToolButton( QWidget *parent ) : QToolButton( parent )
     { setWFlags( WStyle_Tool ); }
 };
 
 
 InputMethods::InputMethods( QWidget *parent ) :
     QWidget( parent, "InputMethods", WStyle_Tool | WStyle_Customize ),
     mkeyboard(0), imethod(0)
 {
     Config cfg( "Launcher" );
     cfg.setGroup( "InputMethods" );
     inputWidgetStyle = QWidget::WStyle_Customize | QWidget::WStyle_StaysOnTop | QWidget::WGroupLeader | QWidget::WStyle_Tool;
     inputWidgetStyle |= cfg.readBoolEntry( "Float", false ) ? QWidget::WStyle_DialogBorder : 0;
     inputWidgetWidth = cfg.readNumEntry( "Width", 100 );
 
     setBackgroundMode( PaletteBackground );
     QHBoxLayout *hbox = new QHBoxLayout( this );
 
     kbdButton = new IMToolButton( this);
     kbdButton->setFocusPolicy(NoFocus);
     kbdButton->setToggleButton( TRUE );
     if (parent->sizeHint().height() > 0)
 	kbdButton->setFixedHeight( parent->sizeHint().height() );
     kbdButton->setFixedWidth( 32 );
     kbdButton->setAutoRaise( TRUE );
     kbdButton->setUsesBigPixmap( TRUE );
     hbox->addWidget( kbdButton );
     connect( kbdButton, SIGNAL(toggled(bool)), this, SLOT(showKbd(bool)) );
 
     kbdChoice = new IMToolButton( this );
     kbdChoice->setFocusPolicy(NoFocus);
     kbdChoice->setPixmap( QPixmap( (const char **)tri_xpm ) );
     if (parent->sizeHint().height() > 0)
 	kbdChoice->setFixedHeight( parent->sizeHint().height() );
     kbdChoice->setFixedWidth( 13 );
     kbdChoice->setAutoRaise( TRUE );
     hbox->addWidget( kbdChoice );
     connect( kbdChoice, SIGNAL(clicked()), this, SLOT(chooseKbd()) );
 
     connect( (QPEApplication*)qApp, SIGNAL(clientMoused()),
 	    this, SLOT(resetStates()) );
 
 
     imButton = new QWidgetStack( this ); // later a widget stack
     imButton->setFocusPolicy(NoFocus);
     if (parent->sizeHint().height() > 0)
 	imButton->setFixedHeight( parent->sizeHint().height() );
     hbox->addWidget(imButton);
 
     imChoice = new QToolButton( this );
     imChoice->setFocusPolicy(NoFocus);
     imChoice->setPixmap( QPixmap( (const char **)tri_xpm ) );
     if (parent->sizeHint().height() > 0)
 	imChoice->setFixedHeight( parent->sizeHint().height() );
     imChoice->setFixedWidth( 13 );
     imChoice->setAutoRaise( TRUE );
     hbox->addWidget( imChoice );
     connect( imChoice, SIGNAL(clicked()), this, SLOT(chooseIm()) );
 
     loadInputMethods();
 
     QCopChannel *channel = new QCopChannel( "QPE/IME", this );
     connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
 	     this, SLOT(qcopReceive(const QCString&, const QByteArray&)) );
 }
 
 InputMethods::~InputMethods()
 {
     Config cfg("qpe");
     cfg.setGroup("InputMethod");
     if (imethod)
         cfg.writeEntry("im", imethod->name() );
     if (mkeyboard)
         cfg.writeEntry("current", mkeyboard->name() );
 
     unloadInputMethods();
 }
 
 void InputMethods::hideInputMethod()
 {
     kbdButton->setOn( FALSE );
 }
 
 void InputMethods::showInputMethod()
 {
     kbdButton->setOn( TRUE );
 }
 
 void InputMethods::showInputMethod(const QString& name)
 {
     int i = 0;
     QValueList<InputMethod>::Iterator it;
     InputMethod *im = 0;
     for ( it = inputMethodList.begin(); it != inputMethodList.end(); ++it, i++ ) {
 	QString lname = (*it).libName.mid((*it).libName.findRev('/') + 1);
 	if ( (*it).name() == name || lname == name ) {
 	    im = &(*it);
 	    break;
 	}
     }
     if ( im )
 	chooseKeyboard(im);
 }
 
 void InputMethods::resetStates()
 {
     if ( mkeyboard && !mkeyboard->newIM )
 	mkeyboard->interface->resetState();
 }
 
 QRect InputMethods::inputRect() const
 {
     if ( !mkeyboard || !mkeyboard->widget || !mkeyboard->widget->isVisible() )
 	return QRect();
     else
 	return mkeyboard->widget->geometry();
 }
 
 void InputMethods::unloadInputMethods()
 {
     unloadMethod( inputMethodList );
     unloadMethod( inputModifierList );
     inputMethodList.clear();
     inputModifierList.clear();
 
 }
 
 void InputMethods::unloadMethod( QValueList<InputMethod>& list ) {
     QValueList<InputMethod>::Iterator it;
 
     for (it = list.begin(); it != list.end(); ++it )
         (*it).releaseInterface();
 
 }
 
 
 QStringList InputMethods::plugins()const {
    QString path = QPEApplication::qpeDir() + "/plugins/inputmethods";
 #ifdef Q_OS_MACX
    QDir dir( path, "lib*.dylib" );
 #else
    QDir dir( path, "lib*.so" );
 #endif /* Q_OS_MACX */
    return dir.entryList();
 }
 
 void InputMethods::installTranslator( const QString& type ) {
     QStringList langs = Global::languageList();
     QStringList::ConstIterator lit;
     for ( lit= langs.begin(); lit!=langs.end(); ++lit) {
         QString lang = *lit;
         QTranslator * trans = new QTranslator(qApp);
 
         QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm";
 
         if ( trans->load( tfn ))
             qApp->installTranslator( trans );
         else
             delete trans;
     }
 }
 
 void InputMethods::setPreferedHandlers() {
     Config cfg("qpe");
     cfg.setGroup("InputMethod");
     QString current = cfg.readEntry("current");
     QString im = cfg.readEntry("im");
 
     QValueList<InputMethod>::Iterator it;
     if (!inputModifierList.isEmpty() && !im.isEmpty() ) {
         for (it = inputModifierList.begin(); it != inputModifierList.end(); ++it )
             if ( (*it).name() == im ) {
                 imethod = &(*it); break;
             }
 
     }
     if (!inputMethodList.isEmpty() && !current.isEmpty() ) {
         for (it = inputMethodList.begin(); it != inputMethodList.end(); ++it )
             if ( (*it).name() == current ) {
                 qWarning("preferred keyboard is %s", current.latin1() );
                 mkeyboard = &(*it);
                 kbdButton->setPixmap( *mkeyboard->icon() );
                 break;
             }
     }
 
 }
 
 void InputMethods::loadInputMethods()
 {
 #ifndef QT_NO_COMPONENT
     hideInputMethod();
     mkeyboard = 0;
 
     unloadInputMethods();
 
     QString path = QPEApplication::qpeDir() + "/plugins/inputmethods";
     QStringList list = plugins();
     QStringList::Iterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
 	InputMethodInterface *iface = 0;
 	ExtInputMethodInterface *eface = 0;
         QLibrary *lib = new QLibrary( path + "/" + *it );
 
 	if ( lib->queryInterface( IID_InputMethod, (QUnknownInterface**)&iface ) == QS_OK ) {
 	    InputMethod input;
 	    input.newIM = FALSE;
             input.library = lib;
 	    input.libName = *it;
 	    input.interface = iface;
 	    input.widget = input.interface->inputMethod( 0, inputWidgetStyle );
 	    input.interface->onKeyPress( this, SLOT(sendKey(ushort,ushort,ushort,bool,bool)) );
 	    inputMethodList.append( input );
 	} else if ( lib->queryInterface( IID_ExtInputMethod, (QUnknownInterface**)&eface ) == QS_OK ) {
 	    InputMethod input;
 	    input.newIM = TRUE;
             input.library = lib;
 	    input.libName = *it;
 	    input.extInterface = eface;
 	    input.widget = input.extInterface->keyboardWidget( 0, inputWidgetStyle );
 	    // may be either a simple, or advanced.
 	    if (input.widget) {
 		//qDebug("its a keyboard");
 		inputMethodList.append( input );
 	    } else {
 		//qDebug("its a real im");
 		input.widget = input.extInterface->statusWidget( 0, 0 );
 		if (input.widget) {
 		    //qDebug("blah");
 		    inputModifierList.append( input );
 		    imButton->addWidget(input.widget, inputModifierList.count());
 		}
 	    }
 	}else{
             delete lib;
             lib = 0l;
         }
         installTranslator(  (*it).left( (*it).find(".") ) );
     }
     qHeapSort( inputMethodList );
 #endif /* killed BUILT in cause they would not compile */
 
     QWSServer::setCurrentInputMethod( 0 );
 
     /* set the prefered IM + handler */
     setPreferedHandlers();
     if ( !inputModifierList.isEmpty() ) {
         if (!imethod)
             imethod = &inputModifierList[0];
 	imButton->raiseWidget(imethod->widget);
 	QWSServer::setCurrentInputMethod( imethod->extInterface->inputMethod() );
     } else {
 	imethod = 0;
     }
 
     // we need to update keyboards afterwards, as some of them may not be compatible with
     // the current input method
     updateKeyboards(imethod);
 
     if ( !inputModifierList.isEmpty() )
 	imButton->show();
     else
 	imButton->hide();
 
     if ( inputModifierList.count() > 1 )
 	imChoice->show();
     else
 	imChoice->hide();
 }
 
 void InputMethods::chooseKbd()
 {
     QPopupMenu pop( this );
     pop.setFocusPolicy( NoFocus ); //don't reset IM
 
     QString imname;
     if (imethod)
 	imname = imethod->libName.mid(imethod->libName.findRev('/') + 1);
 
     int i = 0;
     int firstDepKbd = 0;
 
     QValueList<InputMethod>::Iterator it;
     for ( it = inputMethodList.begin(); it != inputMethodList.end(); ++it, i++ ) {
 	// add empty new items, all old items.
 	if (!(*it).newIM || (*it).extInterface->compatible().count() == 0 ) {
 	    pop.insertItem( (*it).name(), i, firstDepKbd);
 	    if ( mkeyboard == &(*it) )
 		pop.setItemChecked( i, TRUE );
 
 	    firstDepKbd++;
 	} else if ( (*it).extInterface->compatible().contains(imname)) {
 	    // check if we need to insert a sep.
 	    if (firstDepKbd == i)
 		pop.insertSeparator();
 	    pop.insertItem( (*it).name(), i, -1);
 	    if ( mkeyboard == &(*it) )
 		pop.setItemChecked( i, TRUE );
 	}
     }
 
     QPoint pt = mapToGlobal(kbdChoice->geometry().topRight());
     QSize s = pop.sizeHint();
     pt.ry() -= s.height();
     pt.rx() -= s.width();
     i = pop.exec( pt );
     if ( i == -1 )
 	return;
     InputMethod *im = &inputMethodList[i];
     chooseKeyboard(im);
 }
 
 void InputMethods::chooseIm()
 {
     QPopupMenu pop( this );
 
     int i = 0;
     QValueList<InputMethod>::Iterator it;
     for ( it = inputModifierList.begin(); it != inputModifierList.end(); ++it, i++ ) {
 	pop.insertItem( (*it).name(), i );
 	if ( imethod == &(*it) )
 	    pop.setItemChecked( i, TRUE );
     }
 
     QPoint pt = mapToGlobal(imChoice->geometry().topRight());
     QSize s = pop.sizeHint();
     pt.ry() -= s.height();
     pt.rx() -= s.width();
     i = pop.exec( pt );
     if ( i == -1 )
 	return;
     InputMethod *im = &inputModifierList[i];
 
     chooseMethod(im);
 }
 
 void InputMethods::chooseKeyboard(InputMethod* im)
 {
     if ( im != mkeyboard ) {
 	if ( mkeyboard && mkeyboard->widget->isVisible() )
 	    mkeyboard->widget->hide();
 	mkeyboard = im;
 	kbdButton->setPixmap( *mkeyboard->icon() );
     }
     if ( !kbdButton->isOn() )
 	kbdButton->setOn( TRUE );
     else
 	showKbd( TRUE );
 }
 
 static bool keyboardCompatible(InputMethod *keyb, const QString &imname )
 {
     if ( !keyb || !keyb->newIM || !keyb->extInterface->compatible().count() )
 	return TRUE;
 
     if ( keyb->extInterface->compatible().contains(imname) )
 	return TRUE;
 
     return FALSE;
 }
 
 // Updates the display of the soft keyboards available to the current input method
 void InputMethods::updateKeyboards(InputMethod *im )
 {
     uint count;
 
     if ( im ) {
 	QString imname = im->libName.mid(im->libName.findRev('/') + 1);
 
 	if ( mkeyboard && !keyboardCompatible(mkeyboard, imname) ) {
 	    kbdButton->setOn( FALSE );
 	    showKbd( FALSE );
 	    mkeyboard = 0;
 	}
 
 	count = 0;
 
 	QValueList<InputMethod>::Iterator it;
 	for ( it = inputMethodList.begin(); it != inputMethodList.end(); ++it ) {
 	    if ( keyboardCompatible( &(*it), imname ) ) {
 		if ( !mkeyboard ) {
 		    mkeyboard = &(*it);
 		    kbdButton->setPixmap( *mkeyboard->icon() );
 		}
 
 		count++;
 	    }
 	}
     } else {
 	count = inputMethodList.count();
 	if ( count && !mkeyboard ) {
 	    mkeyboard = &inputMethodList[0];
 	    kbdButton->setPixmap( *mkeyboard->icon() );
 	} else if (!count){
 	    mkeyboard = 0;  //might be redundant
 	}
     }
 
     if ( count > 1 )
 	kbdChoice->show();
     else
 	kbdChoice->hide();
 
     if ( count )
 	kbdButton->show();
     else
 	kbdButton->hide();
 }
 
 void InputMethods::chooseMethod(InputMethod* im)
 {
     if ( im != imethod ) {
 	updateKeyboards( im );
 
         Config cfg("qpe");
         cfg.setGroup("InputMethod");
         if (im )
             cfg.writeEntry("im", im->name() );
         if (mkeyboard)
             cfg.writeEntry("current", mkeyboard->name() );
 
 	QWSServer::setCurrentInputMethod( 0 );
 	imethod = im;
 	if ( imethod && imethod->newIM )
 	    QWSServer::setCurrentInputMethod( imethod->extInterface->inputMethod() );
 	else
 	    QWSServer::setCurrentInputMethod( 0 );
 
 	if ( im )
 	    imButton->raiseWidget(im->widget);
 	else
 	    imButton->hide(); //### good UI? make sure it is shown again!
     }
 }
 
 void InputMethods::qcopReceive( const QCString &msg, const QByteArray &data )
 {
     if ( imethod && imethod->newIM )
 	imethod->extInterface->qcopReceive( msg, data );
 }
 
 
 void InputMethods::showKbd( bool on )
 {
     if ( !mkeyboard )
         return;
 
     if ( on )
     {
         mkeyboard->resetState();
 
         int height = QMIN( mkeyboard->widget->sizeHint().height(), 134 );
         int width = qApp->desktop()->width() * (inputWidgetWidth*0.01);
         int left = 0;
         int top = mapToGlobal( QPoint() ).y() - height;
 
         if ( inputWidgetStyle & QWidget::WStyle_DialogBorder )
         {
             qDebug( "InputMethods: reading geometry." );
             Config cfg( "Launcher" );
             cfg.setGroup( "InputMethods" );
             int l = cfg.readNumEntry( "absX", -1 );
             int t = cfg.readNumEntry( "absY", -1 );
             int w = cfg.readNumEntry( "absWidth", -1 );
             int h = cfg.readNumEntry( "absHeight", -1 );
 
             if ( l > -1 && t > -1 && w > -1 && h > -1 )
             {
                 qDebug( "InputMethods: config values ( %d, %d, %d, %d ) are ok.", l, t, w, h );
                 left = l;
                 top = t;
                 width = w;
                 height = h;
             }
             else
             {
                 qDebug( "InputMethods: config values are new or not ok." );
             }
         }
         else
         {
             qDebug( "InputMethods: no floating selected." );
         }
         mkeyboard->widget->resize( width, height );
         mkeyboard->widget->move( left, top );
         mkeyboard->widget->show();
         mkeyboard->widget->installEventFilter( this );
     }
     else
     {
         if ( inputWidgetStyle & QWidget::WStyle_DialogBorder )
         {
             QPoint pos = mkeyboard->widget->pos();
             QSize siz = mkeyboard->widget->size();
             qDebug( "InputMethods: saving geometry." );
             Config cfg( "Launcher" );
             cfg.setGroup( "InputMethods" );
             cfg.writeEntry( "absX", pos.x() );
             cfg.writeEntry( "absY", pos.y() );
             cfg.writeEntry( "absWidth", siz.width() );
             cfg.writeEntry( "absHeight", siz.height() );
             cfg.write();
             mkeyboard->widget->removeEventFilter( this );
         }
         mkeyboard->widget->hide();
     }
 
     emit inputToggled( on );
 }
 
 bool InputMethods::shown() const
 {
     return mkeyboard && mkeyboard->widget->isVisible();
 }
 
 QString InputMethods::currentShown() const
 {
     return mkeyboard && mkeyboard->widget->isVisible()
 	? mkeyboard->name() : QString::null;
 }
 
 void InputMethods::sendKey( ushort unicode, ushort scancode, ushort mod, bool press, bool repeat )
 {
 #if defined(Q_WS_QWS)
     QWSServer::sendKeyEvent( unicode, scancode, mod, press, repeat );
 #endif
 }
 
 bool InputMethods::eventFilter( QObject* o, QEvent* e )
 {
     if ( e->type() == QEvent::Close )
     {
         ( (QCloseEvent*) e )->ignore();
         showKbd( false );
         kbdButton->setOn( false );
         return true;
     }
     return false;
 }
diff --git a/core/launcher/irserver.cpp b/core/launcher/irserver.cpp
index 63f8d05..a0e9c16 100644
--- a/core/launcher/irserver.cpp
+++ b/core/launcher/irserver.cpp
@@ -1,77 +1,76 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 
 #include "irserver.h"
 
 #include <qtopia/qlibrary.h>
 #include <qtopia/qpeapplication.h>
 
-#include <qtranslator.h>
 
 #include "obexinterface.h"
 
 #include <qdir.h>
 
 IrServer::IrServer( QObject *parent, const char *name )
   : QObject( parent, name ), obexIface(0)
 {
     lib = 0;
     obexIface = 0;
     QString path = QPEApplication::qpeDir() + "/plugins/obex/";
 #ifdef Q_OS_MACX
     QDir dir( path, "lib*.dylib" );
 #else
     QDir dir( path, "lib*.so" );
 #endif /* Q_OS_MACX */
     QStringList list = dir.entryList();
     QStringList::Iterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
 	QLibrary *trylib = new QLibrary( path + *it );
 	//qDebug("trying lib %s", (path + (*it)).latin1() );
 	if ( trylib->queryInterface( IID_ObexInterface, (QUnknownInterface**)&obexIface ) == QS_OK ) {
 	    lib = trylib;
 	    //qDebug("found obex lib" );
 	    QString lang = getenv( "LANG" );
 	    QTranslator * trans = new QTranslator(qApp);
 	    QString type = (*it).left( (*it).find(".") );
 	    QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm";
 	    //qDebug("tr fpr obex: %s", tfn.latin1() );
 	    if ( trans->load( tfn ))
 		qApp->installTranslator( trans );
 	    else
 		delete trans;
 
 	    break;
 	} else {
 	    delete lib;
 	}
     }
     if ( !lib )
 	qDebug("could not load IR plugin" );
 }
 
 IrServer::~IrServer()
 {
     if ( obexIface )
 	obexIface->release();
     delete lib;
 }
 
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 984a57d..54efb0b 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -1,781 +1,779 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include <qtopia/global.h>
 #ifdef Q_WS_QWS
 #include <qtopia/qcopenvelope_qws.h>
 #endif
 #include <qtopia/resource.h>
 #include <qtopia/applnk.h>
 #include <qtopia/config.h>
-#include <qtopia/global.h>
 #include <qtopia/qpeapplication.h>
 #include <qtopia/mimetype.h>
 #include <qtopia/private/categories.h>
 //#include <qtopia/custom.h>
 
 #include <qdir.h>
 #ifdef Q_WS_QWS
 #include <qwindowsystem_qws.h>
 #endif
 #include <qtimer.h>
 #include <qcombobox.h>
 #include <qvbox.h>
 #include <qlayout.h>
 #include <qstyle.h>
 #include <qpushbutton.h>
 #include <qtabbar.h>
 #include <qwidgetstack.h>
-#include <qlayout.h>
 #include <qregexp.h>
 #include <qmessagebox.h>
 #include <qframe.h>
 #include <qpainter.h>
 #include <qlabel.h>
 #include <qtextstream.h>
 #include <qpopupmenu.h>
 
 #include "startmenu.h"
 #include "taskbar.h"
 
 #include "serverinterface.h"
 #include "launcherview.h"
 #include "launcher.h"
 #include "server.h"
 
 #define QTOPIA_INTERNAL_FSLP
 #include <qtopia/lnkproperties.h>
 #include <stdlib.h>
 #include <assert.h>
 
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/vfs.h>
 #include <mntent.h>
 #endif
 
 #ifdef Q_WS_QWS
 #include <qkeyboard_qws.h>
 #include <qpe/lnkproperties.h>
 #endif
 
 
 static bool isVisibleWindow( int );
 //===========================================================================
 
 LauncherTabWidget::LauncherTabWidget( Launcher* parent ) :
     QVBox( parent ), docview( 0 )
 {
     docLoadingWidgetEnabled = false;
     docLoadingWidget = 0;
     docLoadingWidgetProgress = 0;
     launcher = parent;
     categoryBar = new LauncherTabBar( this );
     QPalette pal = categoryBar->palette();
     pal.setColor( QColorGroup::Light, pal.color(QPalette::Active,QColorGroup::Shadow) );
     pal.setColor( QColorGroup::Background, pal.active().background().light(110) );
     categoryBar->setPalette( pal );
     stack = new QWidgetStack(this);
     connect( categoryBar, SIGNAL(selected(int)), this, SLOT(raiseTabWidget()) );
     categoryBar->show();
     stack->show();
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     QCopChannel *channel = new QCopChannel( "QPE/Launcher", this );
     connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
              this, SLOT(launcherMessage(const QCString&, const QByteArray&)) );
     connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)),
 	     this, SLOT(appMessage(const QCString&, const QByteArray&)));
 #endif
 
     createDocLoadingWidget();
 }
 
 void LauncherTabWidget::createDocLoadingWidget()
 {
     // Construct the 'doc loading widget' shown when finding documents
 
     // ### LauncherView class needs changing to be more generic so
     // this widget can change its background similar to the iconviews
     // so the background for this matches
     docLoadingWidget = new LauncherView( stack );
     docLoadingWidget->hideIcons();
     QVBox *docLoadingVBox = new QVBox( docLoadingWidget );
 
     docLoadingVBox->setSpacing( 20 );
     docLoadingVBox->setMargin( 10 );
 
     QWidget *space1 = new QWidget( docLoadingVBox );
     docLoadingVBox->setStretchFactor( space1, 1 );
 
     QLabel *waitPixmap = new QLabel( docLoadingVBox );
     waitPixmap->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, waitPixmap->sizePolicy().hasHeightForWidth() ) );
     waitPixmap->setPixmap( Resource::loadPixmap( "bigwait" ) );
     waitPixmap->setAlignment( int( QLabel::AlignCenter ) );
 
     Config cfg( "Launcher" );
     cfg.setGroup( "DocTab" );
     bool docTabEnabled = cfg.readBoolEntry( "Enable", true );
 
     QLabel *textLabel = new QLabel( docLoadingVBox );
     textLabel->setAlignment( int( QLabel::AlignCenter ) );
     docLoadingWidgetProgress = new QProgressBar( docLoadingVBox );
     docLoadingWidgetProgress->setProgress( 0 );
     docLoadingWidgetProgress->setCenterIndicator( TRUE );
     docLoadingWidgetProgress->setBackgroundMode( NoBackground ); // No flicker
     setProgressStyle();
 
     if ( docTabEnabled )
     {
         textLabel->setText( tr( "<b>Finding Documents...</b>" ) );
     }
     else
     {
         textLabel->setText( tr( "<b>The Documents Tab<p>has been disabled.<p>"
                                 "Use Settings->Launcher->DocTab<p>to reenable it.</b></center>" ) );
         docLoadingWidgetProgress->hide();
         docLoadingWidgetEnabled = true;
     }
 
     QWidget *space2 = new QWidget( docLoadingVBox );
     docLoadingVBox->setStretchFactor( space2, 1 );
 
     cfg.setGroup( "Tab Documents" ); // No tr
     setTabViewAppearance( docLoadingWidget, cfg );
 
     stack->addWidget( docLoadingWidget, 0 );
 }
 
 void LauncherTabWidget::initLayout()
 {
     layout()->activate();
     docView()->setFocus();
     categoryBar->showTab("Documents");
 }
 
 void LauncherTabWidget::appMessage(const QCString& message, const QByteArray&)
 {
     if ( message == "nextView()" )
 	categoryBar->nextTab();
 }
 
 void LauncherTabWidget::raiseTabWidget()
 {
     if ( categoryBar->currentView() == docView()
 	 && docLoadingWidgetEnabled ) {
 	stack->raiseWidget( docLoadingWidget );
 	docLoadingWidget->updateGeometry();
     } else {
 	stack->raiseWidget( categoryBar->currentView() );
     }
 }
 
 void LauncherTabWidget::tabProperties()
 {
     LauncherView *view = categoryBar->currentView();
     QPopupMenu *m = new QPopupMenu( this );
     m->insertItem( tr("Icon View"), LauncherView::Icon );
     m->insertItem( tr("List View"), LauncherView::List );
     m->setItemChecked( (int)view->viewMode(), TRUE );
     int rv = m->exec( QCursor::pos() );
     if ( rv >= 0 && rv != view->viewMode() ) {
 	view->setViewMode( (LauncherView::ViewMode)rv );
     }
 
     delete m;
 }
 
 void LauncherTabWidget::deleteView( const QString& id )
 {
     LauncherTab *t = categoryBar->launcherTab(id);
     if ( t ) {
 	stack->removeWidget( t->view );
 	delete t->view;
 	categoryBar->removeTab( t );
     }
 }
 
 LauncherView* LauncherTabWidget::newView( const QString& id, const QPixmap& pm, const QString& label )
 {
     LauncherView* view = new LauncherView( stack );
     connect( view, SIGNAL(clicked(const AppLnk*)),
 	    this, SIGNAL(clicked(const AppLnk*)));
     connect( view, SIGNAL(rightPressed(AppLnk*)),
 	    this, SIGNAL(rightPressed(AppLnk*)));
 
     int n = categoryBar->count();
     stack->addWidget( view, n );
 
     LauncherTab *tab = new LauncherTab( id, view, pm, label );
     categoryBar->insertTab( tab, n-1 );
 
     if ( id == "Documents" )
 	docview = view;
 
     qDebug("inserting %s at %d", id.latin1(), n-1 );
 
     Config cfg("Launcher");
     setTabAppearance( tab, cfg );
 
     cfg.setGroup( "GUI" );
     view->setBusyIndicatorType( cfg.readEntry( "BusyType", QString::null ) );
 
     return view;
 }
 
 LauncherView *LauncherTabWidget::view( const QString &id )
 {
     LauncherTab *t = categoryBar->launcherTab(id);
     if ( !t )
 	return 0;
     return t->view;
 }
 
 LauncherView *LauncherTabWidget::docView()
 {
     return docview;
 }
 
 void LauncherTabWidget::setLoadingWidgetEnabled( bool v )
 {
     if ( v != docLoadingWidgetEnabled && docLoadingWidget ) {
 	docLoadingWidgetEnabled = v;
 	raiseTabWidget();
     }
 }
 
 void LauncherTabWidget::setLoadingProgress( int percent )
 {
     docLoadingWidgetProgress->setProgress( (percent / 4) * 4 );
 }
 
 // ### this function could more to LauncherView
 void LauncherTabWidget::setTabViewAppearance( LauncherView *v, Config &cfg )
 {
     // View
     QString view = cfg.readEntry( "View", "Icon" );
     if ( view == "List" ) // No tr
 	v->setViewMode( LauncherView::List );
     QString bgType = cfg.readEntry( "BackgroundType", "Image" );
     if ( bgType == "Image" ) { // No tr
 	QString pm = cfg.readEntry( "BackgroundImage", "launcher/opie-background" );
 	v->setBackgroundType( LauncherView::Image, pm );
     } else if ( bgType == "SolidColor" ) {
 	QString c = cfg.readEntry( "BackgroundColor" );
 	v->setBackgroundType( LauncherView::SolidColor, c );
     } else {
 	v->setBackgroundType( LauncherView::Ruled, QString::null );
     }
     QString textCol = cfg.readEntry( "TextColor" );
     if ( textCol.isEmpty() )
 	v->setTextColor( QColor() );
     else
 	v->setTextColor( QColor(textCol) );
 //    bool customFont = cfg.readBoolEntry( "CustomFont", FALSE );
 
 
     QStringList font = cfg.readListEntry( "Font", ',' );
     if ( font.count() == 4 )
         v->setViewFont( QFont(font[0], font[1].toInt(), font[2].toInt(), font[3].toInt()!=0) );
 
     // ### FIXME TabColor TabTextColor
 
 }
 
 // ### Could move to LauncherTab
 void LauncherTabWidget::setTabAppearance( LauncherTab *tab, Config &cfg )
 {
     cfg.setGroup( QString( "Tab %1" ).arg(tab->type) ); // No tr
 
     setTabViewAppearance( tab->view, cfg );
 
     // Tabs
     QString tabCol = cfg.readEntry( "TabColor" );
     if ( tabCol.isEmpty() )
 	tab->bgColor = QColor();
     else
 	tab->bgColor = QColor(tabCol);
     QString tabTextCol = cfg.readEntry( "TabTextColor" );
     if ( tabTextCol.isEmpty() )
 	tab->fgColor = QColor();
     else
 	tab->fgColor = QColor(tabTextCol);
 }
 
 void LauncherTabWidget::paletteChange( const QPalette &p )
 {
     QVBox::paletteChange( p );
     QPalette pal = palette();
     pal.setColor( QColorGroup::Light, pal.color(QPalette::Active,QColorGroup::Shadow) );
     pal.setColor( QColorGroup::Background, pal.active().background().light(110) );
     categoryBar->setPalette( pal );
     categoryBar->update();
 }
 
 void LauncherTabWidget::styleChange( QStyle & )
 {
     QTimer::singleShot( 0, this, SLOT(setProgressStyle()) );
 }
 
 void LauncherTabWidget::setProgressStyle()
 {
     if (docLoadingWidgetProgress) {
 	docLoadingWidgetProgress->setFrameShape( QProgressBar::Box );
 	docLoadingWidgetProgress->setFrameShadow( QProgressBar::Plain );
 	docLoadingWidgetProgress->setMargin( 1 );
 	docLoadingWidgetProgress->setLineWidth( 1 );
     }
 }
 
 void LauncherTabWidget::setBusy(bool on)
 {
     if ( on )
 	currentView()->setBusy(TRUE);
     else {
 	for ( int i = 0; i < categoryBar->count(); i++ ) {
 	    LauncherView *view = ((LauncherTab *)categoryBar->tab(i))->view;
 	    view->setBusy( FALSE );
 	}
     }
 }
 
 void LauncherTabWidget::setBusyIndicatorType( const QString& str ) {
     for (int i = 0; i < categoryBar->count(); i++ ) {
         LauncherView* view = static_cast<LauncherTab*>( categoryBar->tab(i) )->view;
         view->setBusyIndicatorType( str );
     }
 }
 
 LauncherView *LauncherTabWidget::currentView(void)
 {
     return (LauncherView*)stack->visibleWidget();
 }
 
 
 
 void LauncherTabWidget::launcherMessage( const QCString &msg, const QByteArray &data)
 {
     QDataStream stream( data, IO_ReadOnly );
     if ( msg == "setTabView(QString,int)" ) {
 	QString id;
 	stream >> id;
 	int mode;
 	stream >> mode;
 	if ( view(id) )
 	    view(id)->setViewMode( (LauncherView::ViewMode)mode );
     } else if ( msg == "setTabBackground(QString,int,QString)" ) {
 	QString id;
 	stream >> id;
 	int mode;
 	stream >> mode;
 	QString pixmapOrColor;
 	stream >> pixmapOrColor;
 	if ( view(id) )
 	    view(id)->setBackgroundType( (LauncherView::BackgroundType)mode, pixmapOrColor );
 	if ( id == "Documents" )
 	    docLoadingWidget->setBackgroundType( (LauncherView::BackgroundType)mode, pixmapOrColor );
     } else if ( msg == "setTextColor(QString,QString)" ) {
 	QString id;
 	stream >> id;
 	QString color;
 	stream >> color;
 	if ( view(id) )
 	    view(id)->setTextColor( QColor(color) );
 	if ( id == "Documents" )
 	    docLoadingWidget->setTextColor( QColor(color) );
     } else if ( msg == "setFont(QString,QString,int,int,int)" ) {
 	QString id;
 	stream >> id;
 	QString fam;
 	stream >> fam;
 	int size;
 	stream >> size;
 	int weight;
 	stream >> weight;
 	int italic;
 	stream >> italic;
 	if ( view(id) ) {
 	    if ( !fam.isEmpty() ) {
 		view(id)->setViewFont( QFont(fam, size, weight, italic!=0) );
 		qDebug( "setFont: %s, %d, %d, %d", fam.latin1(), size, weight, italic );
 	    } else {
 		view(id)->clearViewFont();
 	    }
 	}
     }else if ( msg == "setBusyIndicatorType(QString)" ) {
         QString type;
         stream >> type;
         setBusyIndicatorType( type );
     }else if ( msg == "home()" ) {
         if ( isVisibleWindow( static_cast<QWidget*>(parent())->winId() ) ) {
             if (categoryBar)
                 categoryBar->nextTab();
         }else
             static_cast<QWidget*>(parent())->raise();
     }
 }
 
 
 
 //---------------------------------------------------------------------------
 
 Launcher::Launcher()
     : QMainWindow( 0, "PDA User Interface", QWidget::WStyle_Customize | QWidget::WGroupLeader )
 {
     tabs = 0;
     tb = 0;
     Config cfg( "Launcher" );
     cfg.setGroup( "DocTab" );
     docTabEnabled = cfg.readBoolEntry( "Enable", true );
 }
 
 void Launcher::createGUI()
 {
     setCaption( tr("Launcher") );
 
     // we have a pretty good idea how big we'll be
     setGeometry( 0, 0, qApp->desktop()->width(), qApp->desktop()->height() );
 
     tb = new TaskBar;
     tabs = new LauncherTabWidget( this );
     setCentralWidget( tabs );
 
     ServerInterface::dockWidget( tb, ServerInterface::Bottom );
     tb->show();
 
     qApp->installEventFilter( this );
 
 
     connect( qApp, SIGNAL(symbol()), this, SLOT(toggleSymbolInput()) );
     connect( qApp, SIGNAL(numLockStateToggle()), this, SLOT(toggleNumLockState()) );
     connect( qApp, SIGNAL(capsLockStateToggle()), this, SLOT(toggleCapsLockState()) );
 
     connect( tb, SIGNAL(tabSelected(const QString&)),
 	this, SLOT(showTab(const QString&)) );
     connect( tabs, SIGNAL(selected(const QString&)),
 	this, SLOT(viewSelected(const QString&)) );
     connect( tabs, SIGNAL(clicked(const AppLnk*)),
 	this, SLOT(select(const AppLnk*)));
     connect( tabs, SIGNAL(rightPressed(AppLnk*)),
 	this, SLOT(properties(AppLnk*)));
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     QCopChannel* sysChannel = new QCopChannel( "QPE/System", this );
     connect( sysChannel, SIGNAL(received(const QCString &, const QByteArray &)),
              this, SLOT(systemMessage( const QCString &, const QByteArray &)) );
 #endif
 
     // all documents
     QImage img( Resource::loadImage( "DocsIcon" ) );
     QPixmap pm;
     pm = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
     // It could add this itself if it handles docs
 
     tabs->newView("Documents", pm, tr("Documents") )->setToolsEnabled( TRUE );
 
     QTimer::singleShot( 0, tabs, SLOT( initLayout() ) );
     qApp->setMainWidget( this );
     QTimer::singleShot( 500, this, SLOT( makeVisible() ) );
 }
 
 Launcher::~Launcher()
 {
     if ( tb )
 	destroyGUI();
 }
 
  bool Launcher::requiresDocuments() const
  {
     Config cfg( "Launcher" );
     cfg.setGroup( "DocTab" );
     return cfg.readBoolEntry( "Enable", true );
 }
 
 void Launcher::makeVisible()
 {
     showMaximized();
 }
 
 void Launcher::destroyGUI()
 {
     delete tb;
     tb = 0;
     delete tabs;
     tabs =0;
 }
 
 bool Launcher::eventFilter( QObject*, QEvent *ev )
 {
 #ifdef QT_QWS_CUSTOM
     if ( ev->type() == QEvent::KeyPress ) {
 	QKeyEvent *ke = (QKeyEvent *)ev;
 	if ( ke->key() == Qt::Key_F11 ) { // menu key
 	    QWidget *active = qApp->activeWindow();
 	    if ( active && active->isPopup() )
 		active->close();
 	    else {
 		Global::terminateBuiltin("calibrate"); // No tr
 		tb->launchStartMenu();
 	    }
 	    return TRUE;
 	}
     }
 #else
     Q_UNUSED(ev);
 #endif
     return FALSE;
 }
 
 void Launcher::toggleSymbolInput()
 {
     tb->toggleSymbolInput();
 }
 
 void Launcher::toggleNumLockState()
 {
     tb->toggleNumLockState();
 }
 
 void Launcher::toggleCapsLockState()
 {
     tb->toggleCapsLockState();
 }
 
 static bool isVisibleWindow(int wid)
 {
 #ifdef Q_WS_QWS
     const QList<QWSWindow> &list = qwsServer->clientWindows();
     QWSWindow* w;
     for (QListIterator<QWSWindow> it(list); (w=it.current()); ++it) {
 	if ( w->winId() == wid )
 	    return !w->isFullyObscured();
     }
 #endif
     return FALSE;
 }
 
 void Launcher::viewSelected(const QString& s)
 {
     setCaption( s + tr(" - Launcher") );
 }
 
 void Launcher::showTab(const QString& id)
 {
     tabs->categoryBar->showTab(id);
     raise();
 }
 
 void Launcher::select( const AppLnk *appLnk )
 {
     if ( appLnk->type() == "Folder" ) { // No tr
 	// Not supported: flat is simpler for the user
     } else {
 	if ( appLnk->exec().isNull() ) {
 	    int i = QMessageBox::information(this,tr("No application"),
 		tr("<p>No application is defined for this document."
 		"<p>Type is %1.").arg(appLnk->type()), tr("OK"), tr("View as text"), 0, 0, 1);
 
             /* ### Fixme */
 	    if ( i == 1 )
 		Global::execute("textedit",appLnk->file());
 
 	    return;
 	}
 	tabs->setBusy(TRUE);
 	emit executing( appLnk );
 	appLnk->execute();
     }
 }
 
 void Launcher::properties( AppLnk *appLnk )
 {
     if ( appLnk->type() == "Folder" ) { // No tr
 	// Not supported: flat is simpler for the user
     } else {
 /* ### libqtopia FIXME also moving docLnks... */
 	LnkProperties prop(appLnk,0 );
 
 	QPEApplication::execDialog( &prop );
     }
 }
 
 void Launcher::storageChanged( const QList<FileSystem> &fs )
 {
     // ### update combo boxes if we had a combo box for the storage type
 }
 
 void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
 {
     QDataStream stream( data, IO_ReadOnly );
     if ( msg == "busy()" ) {
 	tb->startWait();
     } else if ( msg == "notBusy(QString)" ) {
 	QString app;
 	stream >> app;
 	tabs->setBusy(FALSE);
 	tb->stopWait(app);
     } else if (msg == "applyStyle()") {
 	tabs->currentView()->relayout();
     }
 }
 
 // These are the update functions from the server
 void Launcher::typeAdded( const QString& type, const QString& name,
 				    const QPixmap& pixmap, const QPixmap& )
 {
     tabs->newView( type, pixmap, name );
     ids.append( type );
     /* this will be called in applicationScanningProgress with value 100! */
 //    tb->refreshStartMenu();
 
     static bool first = TRUE;
     if ( first ) {
 	first = FALSE;
         tabs->categoryBar->showTab(type);
     }
 
     tabs->view( type )->setUpdatesEnabled( FALSE );
     tabs->view( type )->setSortEnabled( FALSE );
 }
 
 void Launcher::typeRemoved( const QString& type )
 {
     tabs->view( type )->removeAllItems();
     tabs->deleteView( type );
     ids.remove( type );
     /* this will be called in applicationScanningProgress with value 100! */
 //    tb->refreshStartMenu();
 }
 
 void Launcher::applicationAdded( const QString& type, const AppLnk& app )
 {
     if ( app.type() == "Separator" )  // No tr
 	return;
 
     LauncherView *view = tabs->view( type );
     if ( view )
 	view->addItem( new AppLnk( app ), FALSE );
     else
 	qWarning("addAppLnk: No view for type %s. Can't add app %s!",
 				  type.latin1(),app.name().latin1()  );
 
     MimeType::registerApp( app );
 }
 
 void Launcher::applicationRemoved( const QString& type, const AppLnk& app )
 {
     LauncherView *view = tabs->view( type );
     if ( view )
 	view->removeLink( app.linkFile() );
     else
 	qWarning("removeAppLnk: No view for %s!", type.latin1() );
 }
 
 void Launcher::allApplicationsRemoved()
 {
     MimeType::clear();
     for ( QStringList::ConstIterator it=ids.begin(); it!= ids.end(); ++it)
 	tabs->view( (*it) )->removeAllItems();
 }
 
 void Launcher::documentAdded( const DocLnk& doc )
 {
     tabs->docView()->addItem( new DocLnk( doc ), FALSE );
 }
 
 void Launcher::showLoadingDocs()
 {
     tabs->docView()->hide();
 }
 
 void Launcher::showDocTab()
 {
     if ( tabs->categoryBar->currentView() == tabs->docView() )
 	tabs->docView()->show();
 }
 
 void Launcher::documentRemoved( const DocLnk& doc )
 {
     tabs->docView()->removeLink( doc.linkFile() );
 }
 
 void Launcher::documentChanged( const DocLnk& oldDoc, const DocLnk& newDoc )
 {
     documentRemoved( oldDoc );
     documentAdded( newDoc );
 }
 
 void Launcher::allDocumentsRemoved()
 {
     tabs->docView()->removeAllItems();
 }
 
 void Launcher::applicationStateChanged( const QString& name, ApplicationState state )
 {
     tb->setApplicationState( name, state );
 }
 
 void Launcher::applicationScanningProgress( int percent )
 {
     switch ( percent ) {
         case 0: {
 	    for ( QStringList::ConstIterator it=ids.begin(); it!= ids.end(); ++it) {
 		tabs->view( (*it) )->setUpdatesEnabled( FALSE );
 		tabs->view( (*it) )->setSortEnabled( FALSE );
 	    }
 	    break;
         }
         case 100: {
 	    for ( QStringList::ConstIterator it=ids.begin(); it!= ids.end(); ++it) {
 		tabs->view( (*it) )->setUpdatesEnabled( TRUE );
 		tabs->view( (*it) )->setSortEnabled( TRUE );
 	    }
             tb->refreshStartMenu();
 	    break;
         }
         default:
             break;
     }
 }
 
 void Launcher::documentScanningProgress( int percent )
 {
     switch ( percent ) {
         case 0: {
 	    tabs->setLoadingProgress( 0 );
 	    tabs->setLoadingWidgetEnabled( TRUE );
 	    tabs->docView()->setUpdatesEnabled( FALSE );
 	    tabs->docView()->setSortEnabled( FALSE );
 	    break;
         }
         case 100: {
 	    tabs->docView()->updateTools();
 	    tabs->docView()->setSortEnabled( TRUE );
 	    tabs->docView()->setUpdatesEnabled( TRUE );
 	    tabs->setLoadingWidgetEnabled( FALSE );
 	    break;
         }
         default:
 	    tabs->setLoadingProgress( percent );
             break;
     }
 }
 
diff --git a/core/launcher/launcherglobal.cpp b/core/launcher/launcherglobal.cpp
index 84caa93..9abcae9 100644
--- a/core/launcher/launcherglobal.cpp
+++ b/core/launcher/launcherglobal.cpp
@@ -1,83 +1,79 @@
 /*
  * GPLv2 only
  *
  * TT 2002-2002,2003
  */
-#include <qstring.h>
-#include <qcstring.h>
-#include <qwidget.h>
-#include <qguardedptr.h>
 #include <qfile.h>
 #include <qtextstream.h>
 
 #include <qtopia/mimetype.h>
 
 #include "launcherglobal.h"
 
 bool Opie::Global::isAppLnkFileName( const QString& file ) {
     if ( file.right(1) == "/" )
 	return FALSE;
 
     return file.find(MimeType::appsFolderName()+"/")==0;
 }
 
 QString Opie::Global::tempDir() {
     return QString::fromLatin1("/tmp/");
 }
 
 Global::Command* Opie::Global::builtinCommands() {
     return builtin;
 }
 
 QGuardedPtr<QWidget>* Opie::Global::builtinRunning() {
     return running;
 }
 
 QString Opie::Global::uuid() {
     QFile file( "/proc/sys/kernel/random/uuid" );
     if (!file.open(IO_ReadOnly ) )
         return QString::null;
 
     QTextStream stream(&file);
 
     return "{" + stream.read().stripWhiteSpace() + "}";
 }
 
 QByteArray Opie::Global::encodeBase64(const QByteArray& origData ) {
 // follows simple algorithm from rsync code
     uchar *in = (uchar*)origData.data();
 
     int inbytes = origData.size();
     int outbytes = ((inbytes * 8) + 5) / 6;
     int padding = 4-outbytes%4; if ( padding == 4 ) padding = 0;
 
     QByteArray outbuf(outbytes+padding);
     uchar* out = (uchar*)outbuf.data();
 
     const char *b64 =
         "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
     for (int i = 0; i < outbytes; i++) {
         int byte = (i * 6) / 8;
         int bit = (i * 6) % 8;
         if (bit < 3) {
             if (byte < inbytes)
 	        *out = (b64[(in[byte] >> (2 - bit)) & 0x3F]);
         } else {
             if (byte + 1 == inbytes) {
 	        *out = (b64[(in[byte] << (bit - 2)) & 0x3F]);
             } else {
 	        *out = (b64[(in[byte] << (bit - 2) |
 		     in[byte + 1] >> (10 - bit)) & 0x3F]);
             }
         }
         ++out;
     }
     ASSERT(out == (uchar*)outbuf.data() + outbuf.size() - padding);
     while ( padding-- )
         *out++='=';
 
     return outbuf;
 }
 
 
diff --git a/core/launcher/launchertab.cpp b/core/launcher/launchertab.cpp
index 10cfd5f..710f259 100644
--- a/core/launcher/launchertab.cpp
+++ b/core/launcher/launchertab.cpp
@@ -1,284 +1,281 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "launchertab.h"
 #include <qapplication.h>
-#include <qstyle.h>
-#include <qpainter.h>
-#include <qbitmap.h>
 
 
 LauncherTabBar::LauncherTabBar( QWidget *parent, const char *name )
     : QTabBar( parent, name )
 {
     setFocusPolicy( NoFocus );
     connect( this, SIGNAL( selected(int) ), this, SLOT( layoutTabs() ) );
 }
 
 LauncherTabBar::~LauncherTabBar()
 {
 }
 
 void LauncherTabBar::insertTab( LauncherTab *t, int index )
 {
     if ( index < 0 )
 	items.append( t );
     else
 	items.insert( (uint)index, t );
     tabs.insert( t->type, t );
     QTabBar::insertTab( t, index );
 }
 
 void LauncherTabBar::removeTab( QTab *tab )
 {
     LauncherTab *t = (LauncherTab *)tab;
     tabs.remove( t->type );
     items.remove( t );
     QTabBar::removeTab( t );
 }
 
 void LauncherTabBar::prevTab()
 {
     int n = count();
     int tab = currentTab();
     if ( tab >= 0 )
 	setCurrentTab( (tab - 1 + n)%n );
 }
 
 void LauncherTabBar::nextTab()
 {
     int n = count();
     int tab = currentTab();
     setCurrentTab( (tab + 1)%n );
 }
 
 void LauncherTabBar::showTab( const QString& id )
 {
     setCurrentTab( tabs[id] );
 }
 
 void LauncherTabBar::layoutTabs()
 {
     if ( !count() )
 	return;
 
     int available = width()-1;
 
     QFontMetrics fm = fontMetrics();
     int hiddenTabWidth = -12;
     LauncherTab *current = currentLauncherTab();
     int hframe, vframe, overlap;
     style().tabbarMetrics( this, hframe, vframe, overlap );
     int x = 0;
     QRect r;
     LauncherTab *t;
     QListIterator< LauncherTab > it( items );
     int required = 0;
     int eventabwidth = (width()-1)/count();
     enum Mode { HideBackText, Pack, Even } mode=Even;
     for (it.toFirst(); it.current(); ++it ) {
 	t = it.current();
 	if ( !t )
 	    continue;
 	int iw = fm.width( t->text() ) + hframe - overlap;
 	if ( t != current ) {
 	    available -= hiddenTabWidth + hframe - overlap;
 	    if ( t->iconSet() != 0 )
 		available -= t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
 	}
 	if ( t->iconSet() != 0 )
 	    iw += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
 	required += iw;
 	// As space gets tight, packed looks better than even. "10" must be at least 0.
 	if ( iw >= eventabwidth-10 )
 	    mode = Pack;
     }
     if ( mode == Pack && required > width()-1 )
 	mode = HideBackText;
     for ( it.toFirst(); it.current(); ++it ) {
 	t = it.current();
 	if ( !t )
 	    continue;
 	if ( mode != HideBackText ) {
 	    int w = fm.width( t->text() );
 	    int ih = 0;
 	    if ( t->iconSet() != 0 ) {
 		w += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
 		ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
 	    }
 	    int h = QMAX( fm.height(), ih );
 	    h = QMAX( h, QApplication::globalStrut().height() );
 
 	    h += vframe;
 	    w += hframe;
 
 	    QRect totr(x, 0,
 		mode == Even ? eventabwidth : w * (width()-1)/required, h);
 	    t->setRect(totr);
 	    x += totr.width() - overlap;
 	    r = r.unite(totr);
 	} else if ( t != current ) {
 	    int w = hiddenTabWidth;
 	    int ih = 0;
 	    if ( t->iconSet() != 0 ) {
 		w += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
 		ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
 	    }
 	    int h = QMAX( fm.height(), ih );
 	    h = QMAX( h, QApplication::globalStrut().height() );
 
 	    h += vframe;
 	    w += hframe;
 
 	    t->setRect( QRect(x, 0, w, h) );
 	    x += t->rect().width() - overlap;
 	    r = r.unite( t->rect() );
 	} else {
 	    int ih = 0;
 	    if ( t->iconSet() != 0 ) {
 		ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
 	    }
 	    int h = QMAX( fm.height(), ih );
 	    h = QMAX( h, QApplication::globalStrut().height() );
 
 	    h += vframe;
 
 	    t->setRect( QRect(x, 0, available, h) );
 	    x += t->rect().width() - overlap;
 	    r = r.unite( t->rect() );
 	}
     }
 
     t = it.toLast();
     if (t) {
 	QRect rr = t->rect();
 	rr.setRight(width()-1);
 	t->setRect( rr );
     }
 
     for (it.toFirst(); it.current(); ++it ) {
 	t = it.current();
 	QRect tr = t->rect();
 	tr.setHeight( r.height() );
 	t->setRect( tr );
     }
 
     update();
 }
 
 void LauncherTabBar::paint( QPainter * p, QTab * t, bool selected ) const
 {
     LauncherTabBar *that = (LauncherTabBar *) this;
     LauncherTab *ct = (LauncherTab *)t;
     QPalette pal = palette();
     bool setPal = FALSE;
     if ( ct->bgColor.isValid() ) {
 	pal.setColor( QPalette::Active, QColorGroup::Background, ct->bgColor );
 	pal.setColor( QPalette::Active, QColorGroup::Button, ct->bgColor );
 	pal.setColor( QPalette::Inactive, QColorGroup::Background, ct->bgColor );
 	pal.setColor( QPalette::Inactive, QColorGroup::Button, ct->bgColor );
 	that->setUpdatesEnabled( FALSE );
 	that->setPalette( pal );
 	setPal = TRUE;
     }
 #if QT_VERSION >= 0x030000
     QStyle::SFlags flags = QStyle::Style_Default;
     if ( selected )
         flags |= QStyle::Style_Selected;
     style().drawControl( QStyle::CE_TabBarTab, p, this, t->rect(),
                          colorGroup(), flags, QStyleOption(t) );
 #else
     style().drawTab( p, this, t, selected );
 #endif
 
     QRect r( t->rect() );
     QFont f( font() );
     if ( selected )
 	f.setBold( TRUE );
     p->setFont( f );
 
     if ( ct->fgColor.isValid() ) {
 	pal.setColor( QPalette::Active, QColorGroup::Foreground, ct->fgColor );
 	pal.setColor( QPalette::Inactive, QColorGroup::Foreground, ct->fgColor );
 	that->setUpdatesEnabled( FALSE );
 	that->setPalette( pal );
 	setPal = TRUE;
     }
     int iw = 0;
     int ih = 0;
     if ( t->iconSet() != 0 ) {
 	iw = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width() + 2;
 	ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
     }
     int w = iw + p->fontMetrics().width( t->text() ) + 4;
     int h = QMAX(p->fontMetrics().height() + 4, ih );
     paintLabel( p, QRect( r.left() + (r.width()-w)/2 - 3,
 			    r.top() + (r.height()-h)/2, w, h ), t,
 #if QT_VERSION >= 0x030000
 			    t->identifier() == keyboardFocusTab()
 #else
 			    t->identitifer() == keyboardFocusTab()
 #endif
 		);
     if ( setPal ) {
 	that->unsetPalette();
 	that->setUpdatesEnabled( TRUE );
     }
 }
 
 void LauncherTabBar::paintLabel( QPainter* p, const QRect&,
 			  QTab* t, bool has_focus ) const
 {
     QRect r = t->rect();
     //    if ( t->id != currentTab() )
     //r.moveBy( 1, 1 );
     //
     if ( t->iconSet() ) {
 	// the tab has an iconset, draw it in the right mode
 	QIconSet::Mode mode = (t->isEnabled() && isEnabled()) ? QIconSet::Normal : QIconSet::Disabled;
 	if ( mode == QIconSet::Normal && has_focus )
 	    mode = QIconSet::Active;
 	QPixmap pixmap = t->iconSet()->pixmap( QIconSet::Small, mode );
 	int pixw = pixmap.width();
 	int pixh = pixmap.height();
 	p->drawPixmap( r.left() + 6, r.center().y() - pixh / 2 + 1, pixmap );
 	r.setLeft( r.left() + pixw + 5 );
     }
 
     QRect tr = r;
 
     if ( r.width() < 20 )
 	return;
 
     if ( t->isEnabled() && isEnabled()  ) {
 #if defined(_WS_WIN32_)
 	if ( colorGroup().brush( QColorGroup::Button ) == colorGroup().brush( QColorGroup::Background ) )
 	    p->setPen( colorGroup().buttonText() );
 	else
 	    p->setPen( colorGroup().foreground() );
 #else
 	p->setPen( colorGroup().foreground() );
 #endif
 	p->drawText( tr, AlignCenter | AlignVCenter | ShowPrefix, t->text() );
     } else {
 	p->setPen( palette().disabled().foreground() );
 	p->drawText( tr, AlignCenter | AlignVCenter | ShowPrefix, t->text() );
     }
 }
 
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index 62c678d..513b1bd 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -1,1070 +1,1056 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "launcherview.h"
 
 #include <qtopia/qpeapplication.h>
-#include <qtopia/applnk.h>
-#include <qtopia/qpedebug.h>
 #include <qtopia/private/categories.h>
 #include <qtopia/categoryselect.h>
-#include <qtopia/menubutton.h>
 #include <qtopia/mimetype.h>
 #include <qtopia/resource.h>
-#include <qtopia/qpetoolbar.h>
 //#include <qtopia/private/palmtoprecord.h>
 
 #include <qtimer.h>
-#include <qtextstream.h>
-#include <qdict.h>
-#include <qfile.h>
 #include <qfileinfo.h>
-#include <qhbox.h>
 #include <qiconview.h>
-#include <qwidgetstack.h>
-#include <qpainter.h>
-#include <qregexp.h>
-#include <qtoolbutton.h>
-#include <qimage.h>
-#include <qlabel.h>
 #include <qobjectlist.h>
 
 
 // These define how the busy icon is animated and highlighted
 #define BRIGHTEN_BUSY_ICON
 //#define ALPHA_FADE_BUSY_ICON
 //#define USE_ANIMATED_BUSY_ICON_OVERLAY
 #define BOUNCE_BUSY_ICON
 
 
 class BgPixmap
 {
 public:
     BgPixmap( const QPixmap &p ) : pm(p), ref(1) {}
     QPixmap pm;
     int ref;
 };
 
 
 static QMap<QString,BgPixmap*> *bgCache = 0;
 
 static void cleanup_cache()
 {
     QMap<QString,BgPixmap*>::Iterator it = bgCache->begin();
     while ( it != bgCache->end() ) {
 	QMap<QString,BgPixmap*>::Iterator curr = it;
 	++it;
 	delete (*curr);
 	bgCache->remove( curr );
     }
     delete bgCache;
     bgCache = 0;
 }
 
 
 class LauncherItem : public QIconViewItem
 {
 public:
     LauncherItem( QIconView *parent, AppLnk* applnk, bool bigIcon=TRUE );
     ~LauncherItem();
 
     AppLnk *appLnk() const { return app; }
     AppLnk *takeAppLnk() { AppLnk* r=app; app=0; return r; }
 
     void animateIcon();
     void resetIcon();
 
     virtual int compare ( QIconViewItem * i ) const;
     void paintItem( QPainter *p, const QColorGroup &cg );
 
     void setBusyIndicatorType ( BusyIndicatorType t ) { busyType = t; }
 protected:
     bool isBigIcon;
     int iteration;
     AppLnk* app;
 private:
     void paintAnimatedIcon( QPainter *p );
     BusyIndicatorType busyType;
 };
 
 
 class LauncherIconView : public QIconView {
 public:
     LauncherIconView( QWidget* parent, const char* name=0 ) :
 	QIconView(parent,name),
 	tf(""),
 	cf(0),
 	bsy(0),
 	busyTimer(0),
 	bigIcns(TRUE),
 	bgColor(white)
     {
 	sortmeth = Name;
 	hidden.setAutoDelete(TRUE);
 	ike = FALSE;
 	calculateGrid( Bottom );
     }
 
     ~LauncherIconView()
     {
 #if 0 // debuggery
 	QListIterator<AppLnk> it(hidden);
 	AppLnk* l;
 	while ((l=it.current())) {
 	    ++it;
 	    //qDebug("%p: hidden (should remove)",l);
 	}
 #endif
     }
 
     QIconViewItem* busyItem() const { return bsy; }
 #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY
     QPixmap busyPixmap() const { return busyPix; }
 #endif
     void setBigIcons( bool bi ) {
 	bigIcns = bi;
 #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY
 	busyPix.resize(0,0);
 #endif
     }
 
     void updateCategoriesAndMimeTypes();
     void setBusyIndicatorType ( BusyIndicatorType t ) { busyType = t; }
      void doAutoScroll()
     {
 	// We don't want rubberbanding (yet)
     }
 
     void setBusy(bool on)
     {
 #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY
 	if ( busyPix.isNull() ) {
 	    int size = ( bigIcns ) ? AppLnk::bigIconSize() : AppLnk::smallIconSize();
 	    busyPix.convertFromImage( Resource::loadImage( "busy" ).smoothScale( size * 16, size ) );
 	}
 #endif
 
 	if ( on ) {
 	    busyTimer = startTimer( 100 );
 	} else {
 	    if ( busyTimer ) {
 	        killTimer( busyTimer );
 		busyTimer = 0;
 	    }
 	}
 
 	LauncherItem *c = on ? (LauncherItem*)currentItem() : 0;
 
 	if ( bsy != c ) {
 	    LauncherItem *oldBusy = bsy;
 	    bsy = c;
 	    if ( oldBusy )  {
 		oldBusy->resetIcon();
                     }
 	    if ( bsy )   {
                                 bsy->setBusyIndicatorType( busyType ) ;
 		bsy->animateIcon();
                     }
 	}
     }
 
     bool inKeyEvent() const { return ike; }
     void keyPressEvent(QKeyEvent* e)
     {
 	ike = TRUE;
 	if ( e->key() == Key_F33 /* OK button */ || e->key() == Key_Space ) {
 	    if ( (e->state() & ShiftButton) )
 		emit mouseButtonPressed(ShiftButton, currentItem(), QPoint() );
 	    else
 		returnPressed(currentItem());
 	}
 
 	QIconView::keyPressEvent(e);
 	ike = FALSE;
     }
 
     void addItem(AppLnk* app, bool resort=TRUE);
     bool removeLink(const QString& linkfile);
 
     QStringList mimeTypes() const;
     QStringList categories() const;
 
     void clear()
     {
 	mimes.clear();
 	cats.clear();
 	QIconView::clear();
 	hidden.clear();
     }
 
     void addCatsAndMimes(AppLnk* app)
     {
 	// 	QStringList c = app->categories();
 	// 	for (QStringList::ConstIterator cit=c.begin(); cit!=c.end(); ++cit) {
 	// 	    cats.replace(*cit,(void*)1);
 	// 	}
 	QString maj=app->type();
 	int sl=maj.find('/');
 	if (sl>=0) {
 	    QString k;
 	    k = maj.left(12) == "application/" ? maj : maj.left(sl);
 	    mimes.replace(k,(void*)1);
 	}
     }
 
     void setBackgroundOrigin( QWidget::BackgroundOrigin ) {
     }
 
     void setBackgroundPixmap( const QPixmap &pm ) {
 	bgPixmap = pm;
     }
 
     void setBackgroundColor( const QColor &c ) {
 	bgColor = c;
     }
 
     void drawBackground( QPainter *p, const QRect &r )
     {
 	if ( !bgPixmap.isNull() ) {
            p->drawTiledPixmap( r, bgPixmap,
                    QPoint( (r.x() + contentsX()) % bgPixmap.width(),
                            (r.y() + contentsY()) % bgPixmap.height() ) );
 	} else {
 	    p->fillRect( r, bgColor );
 	}
     }
 
     void setItemTextPos( ItemTextPos pos )
     {
 	calculateGrid( pos );
 	QIconView::setItemTextPos( pos );
     }
 
     void hideOrShowItems(bool resort);
 
     void setTypeFilter(const QString& typefilter, bool resort)
     {
 	tf = QRegExp(typefilter,FALSE,TRUE);
 	hideOrShowItems(resort);
     }
 
     void setCategoryFilter( int catfilter, bool resort )
     {
 	Categories cat;
 	cat.load( categoryFileName() );
 	QString str;
 	if ( catfilter == -2 )
 	    cf = 0;
 	else
 	    cf = catfilter;
 	hideOrShowItems(resort);
     }
 
     enum SortMethod { Name, Date, Type };
 
     void setSortMethod( SortMethod m )
     {
 	if ( sortmeth != m ) {
 	    sortmeth = m;
 	    sort();
 	}
     }
 
     int compare(const AppLnk* a, const AppLnk* b)
     {
 	switch (sortmeth) {
 	case Name:
 	    return a->name().lower().compare(b->name().lower());
 	case Date: {
 	    QFileInfo fa(a->linkFileKnown() ? a->linkFile() : a->file());
 	    QFileInfo fb(b->linkFileKnown() ? b->linkFile() : b->file());
 	    return fa.lastModified().secsTo(fb.lastModified());
 	}
 	case Type:
 	    return a->type().compare(b->type());
 	}
 	return 0;
     }
 
 protected:
 
     void timerEvent( QTimerEvent *te )
     {
 	if ( te->timerId() == busyTimer ) {
 	    if ( bsy )
 		bsy->animateIcon();
 	} else {
 	    QIconView::timerEvent( te );
 	}
     }
 
     void styleChange( QStyle &old )
     {
 	QIconView::styleChange( old );
 	calculateGrid( itemTextPos() );
     }
 
     void calculateGrid( ItemTextPos pos )
     {
 	int dw = QApplication::desktop()->width();
 	int viewerWidth = dw-style().scrollBarExtent().width();
 	if ( pos == Bottom ) {
 	    int cols = 3;
 	    if ( viewerWidth <= 200 )
 		cols = 2;
 	    else if ( viewerWidth >= 400 )
 		 cols = viewerWidth/96;
 	    setSpacing( 4 );
 	    setGridX( (viewerWidth-(cols+1)*spacing())/cols );
 	    setGridY( fontMetrics().height()*2+24 );
 	} else {
 	    int cols = 2;
 	    if ( viewerWidth < 150 )
 		cols = 1;
 	    else if ( viewerWidth >= 400 )
 		 cols = viewerWidth/150;
 	    setSpacing( 2 );
 	    setGridX( (viewerWidth-(cols+1)*spacing())/cols );
 	    setGridY( fontMetrics().height()+2 );
 	}
     }
 
     void focusInEvent( QFocusEvent * ) {}
     void focusOutEvent( QFocusEvent * ) {}
 
 private:
     QList<AppLnk> hidden;
     QDict<void> mimes;
     QDict<void> cats;
     SortMethod sortmeth;
     QRegExp tf;
     int cf;
     LauncherItem* bsy;
     int busyTimer;
     bool ike;
     bool bigIcns;
     QPixmap bgPixmap;
     QColor bgColor;
 #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY
     QPixmap busyPix;
 #endif
   BusyIndicatorType busyType;
 };
 
 
 bool LauncherView::bsy=FALSE;
 
 void LauncherView::setBusy(bool on)
 {
     icons->setBusy(on);
 }
 
 void LauncherView::setBusyIndicatorType( const QString& type ) {
     if ( type. lower ( ) == "animated" )
 	icons->setBusyIndicatorType(  BIT_Animated  ) ;
     else
 	icons->setBusyIndicatorType(  BIT_Normal  ) ;
 }
 
 LauncherItem::LauncherItem( QIconView *parent, AppLnk *applnk, bool bigIcon )
     : QIconViewItem( parent, applnk->name(),
            bigIcon ? applnk->bigPixmap() :applnk->pixmap() ),
 	isBigIcon( bigIcon ),
 	iteration(0),
 	app(applnk) // Takes ownership
 {
 }
 
 LauncherItem::~LauncherItem()
 {
     LauncherIconView* liv = (LauncherIconView*)iconView();
     if ( liv->busyItem() == this )
 	liv->setBusy(FALSE);
     delete app;
 }
 
 int LauncherItem::compare ( QIconViewItem * i ) const
 {
     LauncherIconView* view = (LauncherIconView*)iconView();
     return view->compare(app,((LauncherItem *)i)->appLnk());
 }
 
 void LauncherItem::paintItem( QPainter *p, const QColorGroup &cg )
 {
     LauncherIconView* liv = (LauncherIconView*)iconView();
     QBrush oldBrush( liv->itemTextBackground() );
     QColorGroup mycg( cg );
     if ( liv->currentItem() == this ) {
 	liv->setItemTextBackground( cg.brush( QColorGroup::Highlight ) );
 	mycg.setColor( QColorGroup::Text, cg.color( QColorGroup::HighlightedText ) );
     }
 
     QIconViewItem::paintItem(p,mycg);
 
     // Paint animation overlay
     if ( liv->busyItem() == this )
 	paintAnimatedIcon(p);
 
     if ( liv->currentItem() == this )
 	liv->setItemTextBackground( oldBrush );
 }
 
 
 
 void LauncherItem::paintAnimatedIcon( QPainter *p )
 {
     LauncherIconView* liv = (LauncherIconView*)iconView();
     int pic = iteration % 16;
     int w = pixmap()->width(), h = pixmap()->height();
     QPixmap dblBuf( w, h + 4 );
     QPainter p2( &dblBuf );
     int x1, y1;
     if ( liv->itemTextPos() == QIconView::Bottom ) {
 	x1 = x() + (width() - w) / 2 - liv->contentsX();
 	y1 = y() - liv->contentsY();
     } else {
 	x1 = x() - liv->contentsX();
 	y1 = y() + (height() - h) / 2 - liv->contentsY();
     }
     y1 -= 2;
     p2.translate(-x1,-y1);
     liv->drawBackground( &p2, QRect(x1,y1,w,h+4) );
     int bounceY = 2;
 #ifdef BOUNCE_BUSY_ICON
     if ( busyType == BIT_Animated ) {
        bounceY = 4 - ((iteration+2)%8);
        bounceY = bounceY < 0 ? -bounceY : bounceY;
     }
 #endif
     p2.drawPixmap( x1, y1 + bounceY, *pixmap() );
 #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY
     p2.drawPixmap( x1, y1 + bounceY, liv->busyPixmap(), w * pic, 0, w, h );
 #endif
     p->drawPixmap( x1, y1, dblBuf );
 }
 
 void LauncherItem::animateIcon()
 {
     LauncherIconView* liv = (LauncherIconView*)iconView();
 
     if ( liv->busyItem() != this || !app )
 	return;
 
     // Highlight the icon
     if ( iteration == 0 ) {
 	QPixmap src = isBigIcon ? app->bigPixmap() : app->pixmap();
 	QImage img = src.convertToImage();
 	QRgb *rgb;
 	int count;
 	if ( img.depth() == 32 ) {
 	    rgb = (QRgb*)img.bits();
 	    count = img.bytesPerLine()/sizeof(QRgb)*img.height();
 	} else {
 	    rgb = img.colorTable();
 	    count = img.numColors();
 	}
 	for ( int r = 0; r < count; r++, rgb++ ) {
 #if defined(BRIGHTEN_BUSY_ICON)
 	    QColor c(*rgb);
 	    int h, s, v;
 	    c.hsv(&h,&s,&v);
 	    c.setHsv(h,QMAX(s-24,0),QMIN(v+48,255));
 	    *rgb = qRgba(c.red(),c.green(),c.blue(),qAlpha(*rgb));
 #elif defined(ALPHA_FADE_BUSY_ICON)
 	    *rgb = qRgba(qRed(*rgb),qGreen(*rgb),qBlue(*rgb),qAlpha(*rgb)/2);
 #endif
 	}
 	src.convertFromImage( img );
 	setPixmap( src );
     }
 
     iteration++;
 
     // Paint animation overlay
     QPainter p( liv->viewport() );
     paintAnimatedIcon( &p );
 }
 
 void LauncherItem::resetIcon()
 {
     iteration = 0;
     setPixmap( isBigIcon ? app->bigPixmap() : app->pixmap() );
 }
 
 //===========================================================================
 
 QStringList LauncherIconView::mimeTypes() const
 {
     QStringList r;
     QDictIterator<void> it(mimes);
     while (it.current()) {
 	r.append(it.currentKey());
 	++it;
     }
     r.sort();
     return r;
 }
 
 void LauncherIconView::addItem(AppLnk* app, bool resort)
 {
     addCatsAndMimes(app);
 
     if ( (tf.isEmpty() || tf.match(app->type()) >= 0)
 	 && (cf == 0 || app->categories().contains(cf)
 	     || cf == -1 && app->categories().count() == 0 ) )
 	(void) new LauncherItem( this, app, bigIcns );
     else
 	hidden.append(app);
     if ( resort )
 	sort();
 }
 
 void LauncherIconView::updateCategoriesAndMimeTypes()
 {
     mimes.clear();
     cats.clear();
     LauncherItem* item = (LauncherItem*)firstItem();
     while (item) {
 	addCatsAndMimes(item->appLnk());
 	item = (LauncherItem*)item->nextItem();
     }
     QListIterator<AppLnk> it(hidden);
     AppLnk* l;
     while ((l=it.current())) {
 	addCatsAndMimes(l);
 	++it;
     }
 }
 
 void LauncherIconView::hideOrShowItems(bool resort)
 {
     viewport()->setUpdatesEnabled( FALSE );
     hidden.setAutoDelete(FALSE);
     QList<AppLnk> links=hidden;
     hidden.clear();
     hidden.setAutoDelete(TRUE);
     LauncherItem* item = (LauncherItem*)firstItem();
     while (item) {
 	links.append(item->takeAppLnk());
 	item = (LauncherItem*)item->nextItem();
     }
     clear();
     QListIterator<AppLnk> it(links);
     AppLnk* l;
     while ((l=it.current())) {
 	addItem(l,FALSE);
 	++it;
     }
     if ( resort && !autoArrange() )
 	sort();
     viewport()->setUpdatesEnabled( TRUE );
 }
 
 bool LauncherIconView::removeLink(const QString& linkfile)
 {
     LauncherItem* item = (LauncherItem*)firstItem();
     AppLnk* l;
     bool did = FALSE;
     DocLnk dl(linkfile);
     while (item) {
 	l = item->appLnk();
 	LauncherItem *nextItem = (LauncherItem *)item->nextItem();
 	if (  l->linkFileKnown() && l->linkFile() == linkfile
 		|| l->fileKnown() && (
 		    l->file() == linkfile
 		    || dl.isValid() && dl.file() == l->file() ) ) {
 	    delete item;
 	    did = TRUE;
 	}
 	item = nextItem;
     }
     QListIterator<AppLnk> it(hidden);
     while ((l=it.current())) {
 	++it;
 	if ( l->linkFileKnown() && l->linkFile() == linkfile
 		|| l->file() == linkfile
 		|| dl.isValid() && dl.file() == l->file() ) {
 	    hidden.removeRef(l);
 	   did = TRUE;
 	}
     }
     return did;
 }
 
 //===========================================================================
 
 LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl )
     : QVBox( parent, name, fl )
 {
     catmb = 0;
     icons = new LauncherIconView( this );
     setFocusProxy(icons);
     QPEApplication::setStylusOperation( icons->viewport(), QPEApplication::RightOnHold );
 
     icons->setItemsMovable( FALSE );
     icons->setAutoArrange( TRUE );
     icons->setSorting( TRUE );
     icons->setFrameStyle( QFrame::NoFrame );
     icons->setMargin( 0 );
     icons->setSelectionMode( QIconView::NoSelection );
     icons->setBackgroundMode( PaletteBase );
     icons->setResizeMode( QIconView::Fixed );
     vmode = (ViewMode)-1;
     setViewMode( Icon );
 
     connect( icons, SIGNAL(mouseButtonClicked(int, QIconViewItem *, const QPoint&)),
 		   SLOT(itemClicked(int, QIconViewItem *)) );
     connect( icons, SIGNAL(selectionChanged()),
 		   SLOT(selectionChanged()) );
     connect( icons, SIGNAL(returnPressed(QIconViewItem *)),
 		   SLOT(returnPressed(QIconViewItem *)) );
     connect( icons, SIGNAL(mouseButtonPressed(int, QIconViewItem *, const QPoint&)),
 		   SLOT(itemPressed(int, QIconViewItem *)) );
 
     tools = 0;
     setBackgroundType( Ruled, QString::null );
 }
 
 LauncherView::~LauncherView()
 {
     if ( bgCache && bgCache->contains( bgName ) )
 	(*bgCache)[bgName]->ref--;
 }
 
 void LauncherView::hideIcons()
 {
     icons->hide();
 }
 
 void LauncherView::setToolsEnabled(bool y)
 {
     if ( !y != !tools ) {
 	if ( y ) {
 	    tools = new QHBox(this);
 
 	    // Type filter
 	    typemb = new QComboBox(tools);
 	    QSizePolicy p = typemb->sizePolicy();
 	    p.setHorData(QSizePolicy::Expanding);
 	    typemb->setSizePolicy(p);
 
 	    // Category filter
 	    updateTools();
 	    tools->show();
 
 	    // Always show vscrollbar
 	    icons->setVScrollBarMode( QScrollView::AlwaysOn );
 	} else {
 	    delete tools;
 	    tools = 0;
 	}
     }
 }
 
 void LauncherView::updateTools()
 {
     disconnect( typemb, SIGNAL(activated(int)),
 	        this, SLOT(showType(int)) );
     if ( catmb ) disconnect( catmb, SIGNAL(signalSelected(int)),
 	        this, SLOT(showCategory(int)) );
 
     // ### I want to remove this
     icons->updateCategoriesAndMimeTypes();
 
     QString prev;
 
     // Type filter
     QStringList types;
     typelist = icons->mimeTypes();
     for (QStringList::ConstIterator it = typelist.begin(); it!=typelist.end(); ++it) {
 	QString t = *it;
 	if ( t.left(12) == "application/" ) {
 	    MimeType mt(t);
 	    const AppLnk* app = mt.application();
 	    if ( app )
 		t = app->name();
 	    else
 		t = t.mid(12);
 	} else {
 	    t[0] = t[0].upper();
 	}
 	types += t;
     }
     types << tr("All types");
     prev = typemb->currentText();
     typemb->clear();
     typemb->insertStringList(types);
     for (int i=0; i<typemb->count(); i++) {
 	if ( typemb->text(i) == prev ) {
 	    typemb->setCurrentItem(i);
 	    break;
 	}
     }
     if ( prev.isNull() )
 	typemb->setCurrentItem(typemb->count()-1);
 
     int pcat = catmb ? catmb->currentCategory() : -2;
     if ( !catmb )
 	catmb = new CategorySelect(tools);
     Categories cats( 0 );
     cats.load( categoryFileName() );
     QArray<int> vl( 0 );
     catmb->setCategories( vl, "Document View", // No tr
 	tr("Document View") );
     catmb->setRemoveCategoryEdit( TRUE );
     catmb->setAllCategories( TRUE );
     catmb->setCurrentCategory(pcat);
 
     // if type has changed we need to redisplay
     if ( typemb->currentText() != prev )
 	showType( typemb->currentItem() );
 
     connect(typemb, SIGNAL(activated(int)), this, SLOT(showType(int)));
     connect(catmb, SIGNAL(signalSelected(int)), this, SLOT(showCategory(int)));
 }
 
 void LauncherView::sortBy(int s)
 {
     icons->setSortMethod((LauncherIconView::SortMethod)s);
 }
 
 void LauncherView::showType(int t)
 {
     if ( t >= (int)typelist.count() ) {
 	icons->setTypeFilter("",TRUE);
     } else {
 	QString ty = typelist[t];
 	if ( !ty.contains('/') )
 	    ty += "/*";
 	icons->setTypeFilter(ty,TRUE);
     }
 }
 
 void LauncherView::showCategory( int c )
 {
     icons->setCategoryFilter( c, TRUE );
 }
 
 void LauncherView::setViewMode( ViewMode m )
 {
     if ( vmode != m ) {
 	bool bigIcons = m == Icon;
 	icons->viewport()->setUpdatesEnabled( FALSE );
 	icons->setBigIcons( bigIcons );
 	switch ( m ) {
 	    case List:
 		icons->setItemTextPos( QIconView::Right );
 		break;
 	    case Icon:
 		icons->setItemTextPos( QIconView::Bottom );
 		break;
 	}
 	icons->hideOrShowItems( FALSE );
 	icons->viewport()->setUpdatesEnabled( TRUE );
 	vmode = m;
     }
 }
 
 //
 // User images may require scaling.
 //
 QImage LauncherView::loadBackgroundImage(QString &bgName)
 {
     QImageIO imgio;
     QSize   ds = qApp->desktop()->size();   // should be launcher, not desktop
     bool    further_scaling = TRUE;
 
     imgio.setFileName( bgName );
     imgio.setParameters("GetHeaderInformation");
 
     if (imgio.read() == FALSE) {
 	return imgio.image();
     }
 
     if (imgio.image().width() < ds.width() &&
 	    imgio.image().height() < ds.height()) {
 	further_scaling = FALSE;
     }
 
     if (!imgio.image().bits()) {
 	//
 	// Scale and load.  Note we don't scale up.
 	//
 	QString param( "Scale( %1, %2, ScaleMin )" ); // No tr
 	imgio.setParameters(further_scaling ?
 	    param.arg(ds.width()).arg(ds.height()).latin1() :
 	    "");
 	imgio.read();
     } else {
 	if (further_scaling) {
 	    int	t1 = imgio.image().width() * ds.height();
 	    int t2 = imgio.image().height() * ds.width();
 	    int dsth = ds.height();
 	    int dstw = ds.width();
 
 	    if (t1 > t2) {
 		dsth = t2 / imgio.image().width();
 	    } else {
 		dstw = t1 / imgio.image().height();
 	    }
 
 	    //
 	    // Loader didn't scale for us.  Do it manually.
 	    //
 	    return imgio.image().smoothScale(dstw, dsth);
 	}
     }
 
     return imgio.image();
 }
 
 void LauncherView::setBackgroundType( BackgroundType t, const QString &val )
 {
     if ( !bgCache ) {
 	bgCache = new QMap<QString,BgPixmap*>;
 	qAddPostRoutine( cleanup_cache );
     }
 
     if ( bgCache->contains( bgName ) )
 	(*bgCache)[bgName]->ref--;
     bgName = "";
 
     QPixmap bg;
 
     switch ( t ) {
 	case Ruled: {
 	    bgName = QString("Ruled_%1").arg(colorGroup().background().name()); // No tr
 	    if ( bgCache->contains( bgName ) ) {
 		(*bgCache)[bgName]->ref++;
 		bg = (*bgCache)[bgName]->pm;
 	    } else {
 		bg.resize( width(), 9 );
 		QPainter painter( &bg );
 		for ( int i = 0; i < 3; i++ ) {
 		    painter.setPen( white );
 		    painter.drawLine( 0, i*3, width()-1, i*3 );
 		    painter.drawLine( 0, i*3+1, width()-1, i*3+1 );
 		    painter.setPen( colorGroup().background().light(105) );
 		    painter.drawLine( 0, i*3+2, width()-1, i*3+2 );
 		}
 		painter.end();
 		bgCache->insert( bgName, new BgPixmap(bg) );
 	    }
 	    break;
 	}
 
 	case Image:
 	    if (!val.isEmpty()) {
 		bgName = val;
 		if ( bgCache->contains( bgName ) ) {
 		    (*bgCache)[bgName]->ref++;
 		    bg = (*bgCache)[bgName]->pm;
 		} else {
 		    QString imgFile = bgName;
 		    bool tile = FALSE;
 		    if ( imgFile[0]!='/' || !QFile::exists(imgFile) ) {
 			imgFile = Resource::findPixmap( imgFile );
 			tile = TRUE;
 		    }
 		    QImage img = loadBackgroundImage(imgFile);
 
 
 		    if ( img.depth() == 1 )
 			img = img.convertDepth(8);
 		    img.setAlphaBuffer(FALSE);
 		    bg.convertFromImage(img);
 		    bgCache->insert( bgName, new BgPixmap(bg) );
 		}
 	    }
 	    break;
 
 	case SolidColor:
 	default:
 	    break;
     }
 
     const QObjectList *list = queryList( "QWidget", 0, FALSE );
     QObject *obj;
     for ( QObjectListIt it( *list ); (obj=it.current()); ++it ) {
 	if ( obj->isWidgetType() ) {
 	    QWidget *w = (QWidget*)obj;
 	    w->setBackgroundPixmap( bg );
 	    if ( bgName.isEmpty() ) {
 		// Solid Color
 		if ( val.isEmpty() )
 		    w->setBackgroundColor( colorGroup().base() );
 		else
 		    w->setBackgroundColor( val );
 	    } else {
 		// Ruled or Image pixmap
 		w->setBackgroundOrigin( ParentOrigin );
 	    }
 	}
     }
     delete list;
 
     bgType = t;
     icons->viewport()->update();
 
     QTimer::singleShot( 1000, this, SLOT(flushBgCache()) );
 }
 
 void LauncherView::setTextColor( const QColor &tc )
 {
     textCol = tc;
     QColorGroup cg = icons->colorGroup();
     cg.setColor( QColorGroup::Text, tc );
     icons->setPalette( QPalette(cg,cg,cg) );
     icons->viewport()->update();
 }
 
 void LauncherView::setViewFont( const QFont &f )
 {
     icons->setFont( f );
     icons->hideOrShowItems( FALSE );
 }
 
 void LauncherView::clearViewFont()
 {
     icons->unsetFont();
     icons->hideOrShowItems( FALSE );
 }
 
 void LauncherView::resizeEvent(QResizeEvent *e)
 {
     QVBox::resizeEvent( e );
     if ( e->size().width() != e->oldSize().width() )
 	sort();
 }
 
 void LauncherView::selectionChanged()
 {
     QIconViewItem* item = icons->currentItem();
     if ( item && item->isSelected() ) {
 	AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
 	if ( icons->inKeyEvent() ) // not for mouse press
 	    emit clicked( appLnk );
 	item->setSelected(FALSE);
     }
 }
 
 void LauncherView::returnPressed( QIconViewItem *item )
 {
     if ( item ) {
 	AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
 	emit clicked( appLnk );
     }
 }
 
 void LauncherView::itemClicked( int btn, QIconViewItem *item )
 {
     if ( item ) {
 	AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
 	if ( btn == LeftButton ) {
 	    // Make sure it's the item we execute that gets highlighted
 	    icons->setCurrentItem( item );
 	    emit clicked( appLnk );
 	}
 	item->setSelected(FALSE);
     }
 }
 
 void LauncherView::itemPressed( int btn, QIconViewItem *item )
 {
     if ( item ) {
 	AppLnk *appLnk = ((LauncherItem *)item)->appLnk();
 	if ( btn == RightButton )
 	    emit rightPressed( appLnk );
 	else if ( btn == ShiftButton )
 	    emit rightPressed( appLnk );
 	item->setSelected(FALSE);
     }
 }
 
 void LauncherView::removeAllItems()
 {
     icons->clear();
 }
 
 bool LauncherView::removeLink(const QString& linkfile)
 {
     return icons->removeLink(linkfile);
 }
 
 void LauncherView::setSortEnabled( bool v )
 {
     icons->setSorting( v );
     if ( v )
 	sort();
 }
 
 void LauncherView::setUpdatesEnabled( bool u )
 {
     icons->setUpdatesEnabled( u );
 }
 
 void LauncherView::sort()
 {
     icons->sort();
 }
 
 void LauncherView::addItem(AppLnk* app, bool resort)
 {
     icons->addItem(app,resort);
 }
 
 void LauncherView::paletteChange( const QPalette &p )
 {
     icons->unsetPalette();
     QVBox::paletteChange( p );
     if ( bgType == Ruled )
 	setBackgroundType( Ruled, QString::null );
     QColorGroup cg = icons->colorGroup();
     cg.setColor( QColorGroup::Text, textCol );
     icons->setPalette( QPalette(cg,cg,cg) );
 }
 
 void LauncherView::fontChanged(const QFont&)
 {
     qDebug("LauncherView::fontChanged()");
     icons->hideOrShowItems( FALSE );
 }
 
 void LauncherView::relayout(void)
 {
     icons->hideOrShowItems(FALSE);
 }
 
 void LauncherView::flushBgCache()
 {
     if ( !bgCache )
 	return;
     // remove unreferenced backgrounds.
     QMap<QString,BgPixmap*>::Iterator it = bgCache->begin();
     while ( it != bgCache->end() ) {
 	QMap<QString,BgPixmap*>::Iterator curr = it;
 	++it;
 	if ( (*curr)->ref == 0 ) {
 	    delete (*curr);
 	    bgCache->remove( curr );
 	}
     }
 }
 
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 9e53bb0..c136bd9 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -1,357 +1,352 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #ifndef QTOPIA_INTERNAL_FILEOPERATIONS
 #define QTOPIA_INTERNAL_FILEOPERATIONS
 #endif
 #include "server.h"
 #include "serverapp.h"
-#include "taskbar.h"
 #include "stabmon.h"
-#include "launcher.h"
 #include "firstuse.h"
 
 #include <opie2/oglobal.h>
 
-#include <qtopia/qpeapplication.h>
 #include <qtopia/network.h>
-#include <qtopia/config.h>
 //#include <qtopia/custom.h>
 
 
-#include <qfile.h>
 #include <qdir.h>
 #ifdef QWS
 #include <qwindowsystem_qws.h>
 #include <qtopia/qcopenvelope_qws.h>
 #endif
 #include <qtopia/alarmserver.h>
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <signal.h>
 #ifndef Q_OS_WIN32
 #include <unistd.h>
 #else
 #include <process.h>
 #endif
 
 #include "calibrate.h"
 
 
 #ifdef QT_QWS_LOGIN
 #include "../login/qdmdialogimpl.h"
 #endif
 
 #ifdef Q_WS_QWS
 #include <qkeyboard_qws.h>
 #endif
 
 #include <qmessagebox.h>
 #include <opie2/odevice.h>
 
 using namespace Opie;
 
 
 static void cleanup()
 {
     QDir dir( "/tmp", "qcop-msg-*" );
 
     QStringList stale = dir.entryList();
     QStringList::Iterator it;
     for ( it = stale.begin(); it != stale.end(); ++it ) {
 	dir.remove( *it );
     }
 }
 
 static void refreshTimeZoneConfig()
 {
     /* ### FIXME timezone handling */
 #if 0
    // We need to help WorldTime in setting up its configuration for
    //   the current translation
     // BEGIN no tr
     const char *defaultTz[] = {
 	"America/New_York",
 	"America/Los_Angeles",
 	"Europe/Oslo",
 	"Asia/Tokyo",
 	"Asia/Hong_Kong",
 	"Australia/Brisbane",
 	0
     };
     // END no tr
 
     TimeZone curZone;
     QString zoneID;
     int zoneIndex;
     Config cfg = Config( "WorldTime" );
     cfg.setGroup( "TimeZones" );
     if (!cfg.hasKey( "Zone0" )){
 	// We have no existing timezones use the defaults which are untranslated strings
 	QString currTz = TimeZone::current().id();
 	QStringList zoneDefaults;
 	zoneDefaults.append( currTz );
 	for ( int i = 0; defaultTz[i] && zoneDefaults.count() < 6; i++ ) {
 	    if ( defaultTz[i] != currTz )
 		zoneDefaults.append( defaultTz[i] );
 	}
 	zoneIndex = 0;
 	for (QStringList::Iterator it = zoneDefaults.begin(); it != zoneDefaults.end() ; ++it){
 	    cfg.writeEntry( "Zone" + QString::number( zoneIndex ) , *it);
 	    zoneIndex++;
 	}
     }
     // We have an existing list of timezones refresh the
     //  translations of TimeZone name
     zoneIndex = 0;
     while (cfg.hasKey( "Zone"+ QString::number( zoneIndex ))){
 	zoneID = cfg.readEntry( "Zone" + QString::number( zoneIndex ));
 	curZone = TimeZone( zoneID );
 	if ( !curZone.isValid() ){
 	    qDebug( "initEnvironment() Invalid TimeZone %s", zoneID.latin1() );
 	    break;
 	}
 	cfg.writeEntry( "ZoneName" + QString::number( zoneIndex ), curZone.city() );
 	zoneIndex++;
     }
 #endif
 }
 
 void initEnvironment()
 {
 #ifdef Q_OS_WIN32
     // Config file requires HOME dir which uses QDir which needs the winver
     qt_init_winver();
 #endif
     Config config("locale");
     config.setGroup( "Location" );
     QString tz = config.readEntry( "Timezone", getenv("TZ") ).stripWhiteSpace();
 
     // if not timezone set, pick New York
     if (tz.isNull() || tz.isEmpty())
 	tz = "America/New_York";
 
     setenv( "TZ", tz, 1 );
     config.writeEntry( "Timezone", tz);
 
     config.setGroup( "Language" );
     QString lang = config.readEntry( "Language", getenv("LANG") ).stripWhiteSpace();
     if( lang.isNull() || lang.isEmpty())
 	lang = "en_US";
 
     setenv( "LANG", lang, 1 );
     config.writeEntry("Language", lang);
     config.write();
 
 #if 0
      setenv( "QWS_SIZE", "240x320", 0 );
 #endif
 
 
 
      QString env(getenv("QWS_DISPLAY"));
      if (env.contains("Transformed")) {
          int rot;
          // transformed driver default rotation is controlled by the hardware.
          Config config("qpe");
          config.setGroup( "Rotation" );
          if ( ( rot = config.readNumEntry( "Rot", -1 ) ) == -1 )
              rot = ODevice::inst ( )-> rotation ( ) * 90;
 
          setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(rot), 1);
          QPEApplication::defaultRotation ( ); /* to ensure deforient matches reality */
      }
 }
 
 static void initKeyboard()
 {
     Config config("qpe");
 
     config.setGroup( "Keyboard" );
 
     int ard = config.readNumEntry( "RepeatDelay" );
     int arp = config.readNumEntry( "RepeatPeriod" );
     if ( ard > 0 && arp > 0 )
 	qwsSetKeyboardAutoRepeat( ard, arp );
 
     QString layout = config.readEntry( "Layout", "us101" );
     Server::setKeyboardLayout( layout );
 }
 
 static bool firstUse()
 {
     bool needFirstUse = FALSE;
     if ( QWSServer::mouseHandler() &&
          QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
         if ( !QFile::exists( "/etc/pointercal" ) )
             needFirstUse = TRUE;
     }
 
     {
 	Config config( "qpe" );
 	config.setGroup( "Startup" );
 	needFirstUse |= config.readBoolEntry( "FirstUse", TRUE );
     }
 
     if ( !needFirstUse )
 	return FALSE;
 
     FirstUse *fu = new FirstUse();
     fu->exec();
     bool rs = fu->restartNeeded();
     delete fu;
     return rs;
 }
 
 int initApplication( int argc, char ** argv )
 {
     cleanup();
 
 
     initEnvironment();
 
     //Don't flicker at startup:
 #ifdef QWS
     QWSServer::setDesktopBackground( QImage() );
 #endif
     ServerApplication a( argc, argv, QApplication::GuiServer );
 
     refreshTimeZoneConfig();
 
     initKeyboard();
 
     // Don't use first use under Windows
     if ( firstUse() ) {
 	a.restart();
 	return 0;
     }
 
     ODevice::inst ( )-> setSoftSuspend ( true );
 
     {
         QCopEnvelope e("QPE/System", "setBacklight(int)" );
   	e << -3; // Forced on
     }
 
     AlarmServer::initialize();
 
 
 
     Server *s = new Server();
 
     (void)new SysFileMonitor(s);
 #ifdef QWS
     Network::createServer(s);
 #endif
 
     s->show();
 
     /* THE ARM rtc has problem holdings the time on reset */
     if ( QDate::currentDate ( ). year ( ) < 2000 ) {
         if ( QMessageBox::information ( 0, ServerApplication::tr( "Information" ), ServerApplication::tr( "<p>The system date doesn't seem to be valid.\n(%1)</p><p>Do you want to correct the clock ?</p>" ). arg( TimeString::dateString ( QDate::currentDate ( ))), QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) {
             QCopEnvelope e ( "QPE/Application/systemtime", "setDocument(QString)" );
             e << QString ( );
         }
     }
 
     int rv =  a.exec();
 
     qDebug("exiting...");
     delete s;
 
 #ifndef Q_OS_MACX
     ODevice::inst()->setSoftSuspend( false );
 #endif
 
     return rv;
 }
 
 static const char *pidfile_path = "/var/run/opie.pid";
 
 void create_pidfile ( )
 {
 	FILE *f;
 
 	if (( f = ::fopen ( pidfile_path, "w" ))) {
 		::fprintf ( f, "%d", getpid ( ));
 		::fclose ( f );
 	}
 }
 
 void remove_pidfile ( )
 {
 	::unlink ( pidfile_path );
 }
 
 void handle_sigterm ( int /* sig */ )
 {
 	if ( qApp )
 		qApp-> quit ( );
 }
 
 #ifndef Q_OS_WIN32
 int main( int argc, char ** argv )
 {
 
     ::signal ( SIGCHLD, SIG_IGN );
 
     ::signal ( SIGTERM, handle_sigterm );
     ::signal ( SIGINT, handle_sigterm );
 
     ::setsid ( );
     ::setpgid ( 0, 0 );
 
     ::atexit ( remove_pidfile );
     create_pidfile ( );
 
     int retVal = initApplication( argc, argv );
 
     // Have we been asked to restart?
     if ( ServerApplication::doRestart ) {
 	for ( int fd = 3; fd < 100; fd++ )
 	    close( fd );
 
 	execl( (QPEApplication::qpeDir()+"bin/qpe").latin1(), "qpe", 0 );
     }
 
     // Kill them. Kill them all.
     ::kill ( 0, SIGTERM );
     ::sleep ( 1 );
     ::kill ( 0, SIGKILL );
 
     return retVal;
 }
 #else
 
 int main( int argc, char ** argv )
 {
     int retVal = initApplication( argc, argv );
 
     if ( DesktopApplication::doRestart ) {
 	qDebug("Trying to restart");
 	execl( (QPEApplication::qpeDir()+"bin\\qpe").latin1(), "qpe", 0 );
     }
 
     return retVal;
 }
 
 #endif
 
diff --git a/core/launcher/packageslave.cpp b/core/launcher/packageslave.cpp
index bf34368..321b5dd 100644
--- a/core/launcher/packageslave.cpp
+++ b/core/launcher/packageslave.cpp
@@ -1,341 +1,339 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "packageslave.h"
 #include <qtopia/qprocess.h>
 
 #ifdef Q_WS_QWS
 #include <qtopia/qcopenvelope_qws.h>
 #endif
 
-#include <qdatastream.h>
 #ifdef Q_WS_QWS
 #include <qcopchannel_qws.h>
 #endif
 
 #include <qtextstream.h>
-#include <qdir.h>
 
 #include <stdlib.h>
 #include <sys/stat.h> // mkdir()
 
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
 #include <unistd.h>
 #include <sys/vfs.h>
 #include <mntent.h>
 #elif defined(Q_OS_WIN32)
 #include <windows.h>
 #include <winbase.h>
 #elif defined(Q_OS_MACX)
 #include <unistd.h>
 #endif
 
 
 PackageHandler::PackageHandler( QObject *parent, char* name )
     : QObject( parent, name ), packageChannel( 0 ), currentProcess( 0 ), mNoSpaceLeft( FALSE )
 {
     // setup qcop channel
 #ifndef QT_NO_COP
     packageChannel = new QCopChannel( "QPE/Package", this );
     connect( packageChannel, SIGNAL( received(const QCString &, const QByteArray &) ),
 	     this, SLOT( qcopMessage( const QCString &, const QByteArray &) ) );
 #endif
 }
 
 void PackageHandler::qcopMessage( const QCString &msg, const QByteArray &data )
 {
     QDataStream stream( data, IO_ReadOnly );
 
     if ( msg == "installPackage(QString)" ) {
         QString file;
         stream >> file;
         installPackage( file );
     } else if ( msg == "removePackage(QString)" ) {
 	QString file;
         stream >> file;
         removePackage( file );
     } else if ( msg == "addPackageFiles(QString,QString)" ) {
 	QString location, listfile;
         stream >> location >> listfile;
         addPackageFiles( location, listfile);
     } else if ( msg == "addPackages(QString)" ) {
 	QString location;
         stream >> location;
         addPackages( location );
     } else if ( msg == "cleanupPackageFiles(QString)" ) {
 	QString listfile;
         stream >> listfile;
 	cleanupPackageFiles( listfile );
     } else if ( msg == "cleanupPackages(QString)" ) {
 	QString location;
         stream >> location;
         cleanupPackages( location );
     } else if ( msg == "prepareInstall(QString,QString)" ) {
 	QString size, path;
 	stream >> size;
 	stream >> path;
 	prepareInstall( size, path );
     }
 }
 
 void PackageHandler::installPackage( const QString &package )
 {
     if ( mNoSpaceLeft ) {
 	mNoSpaceLeft = FALSE;
 	// Don't emit that for now, I still couldn't test it (Wener)
 	//sendReply( "installFailed(QString)", package );
 	//return;
     }
     
     currentProcess = new QProcess( QStringList() << "ipkg" << "install" << package ); // No tr
     connect( currentProcess, SIGNAL( processExited() ), SLOT( iProcessExited() ) );
     connect( currentProcess, SIGNAL( readyReadStdout() ), SLOT( readyReadStdout() ) );
     connect( currentProcess, SIGNAL( readyReadStderr() ), SLOT( readyReadStderr() ) );
     currentPackage = package;
 
     currentProcessError="";
     sendReply( "installStarted(QString)", package );
     currentProcess->start();
 }
 
 void PackageHandler::removePackage( const QString &package )
 {
     currentProcess = new QProcess( QStringList() << "ipkg" << "remove" << package ); // No tr
     connect( currentProcess, SIGNAL( processExited() ), SLOT( rmProcessExited() ) );
     connect( currentProcess, SIGNAL( readyReadStdout() ), SLOT( readyReadStdout() ) );
     connect( currentProcess, SIGNAL( readyReadStderr() ), SLOT( readyReadStderr() ) );
     currentPackage = package;
 
     currentProcessError="";
     sendReply( "removeStarted(QString)", package );
     currentProcess->start();
 }
 
 void PackageHandler::sendReply( const QCString& msg, const QString& arg )
 {
 #ifndef QT_NO_COP
     QCopEnvelope e( "QPE/Desktop", msg );
     e << arg;
 #endif
 }
 
 void PackageHandler::addPackageFiles( const QString &location, 
 				      const QString &listfile )
 {
     QFile f(listfile);
 #ifndef Q_OS_WIN32
     //make a copy so we can remove the symlinks later
     mkdir( ("/usr/lib/ipkg/info/"+location).ascii(), 0777 );
     system(("cp " + f.name() + " /usr/lib/ipkg/info/"+location).ascii());
 #else
     QDir d;
     //#### revise 
     qDebug("Copy file at %s: %s",  __FILE__, __LINE__ );
     d.mkdir(("/usr/lib/ipkg/info/" + location).ascii());   
     system(("copy " + f.name() + " /usr/lib/ipkg/info/"+location).ascii());
 #endif
 
 	    
     if ( f.open(IO_ReadOnly) ) {   
 	QTextStream ts(&f);
 
 	QString s;
 	while ( !ts.eof() ) {        // until end of file...
 	    s = ts.readLine();       // line of text excluding '\n'
 	    // for s, do link/mkdir.
 	    if ( s.right(1) == "/" ) {
 		qDebug("do mkdir for %s", s.ascii());
 #ifndef Q_OS_WIN32
 		mkdir( s.ascii(), 0777 );
 		//possible optimization: symlink directories
 		//that don't exist already. -- Risky.
 #else
 		d.mkdir( s.ascii());
 #endif
 
 	    } else {
 #ifndef Q_OS_WIN32
 		qDebug("do symlink for %s", s.ascii());
 		symlink( (location + s).ascii(), s.ascii() );
 #else
 		qDebug("Copy file instead of a symlink for WIN32");
 		if (!CopyFile((TCHAR*)qt_winTchar((location + s), TRUE), (TCHAR*)qt_winTchar(s, TRUE), FALSE))
 		  qWarning("Unable to create symlinkfor %s", 
 			   (location + s).ascii());
 #endif
 	    }
 	}
 	f.close();
     } 
 }
 
 void PackageHandler::addPackages( const QString &location )
 {
     // get list of *.list in location/usr/lib/ipkg/info/*.list
     QDir dir(location + "/usr/lib/ipkg/info", "*.list",  // No tr
 	     QDir::Name, QDir::Files);
     if ( !dir.exists() )
 	return;
     
     QStringList packages = dir.entryList();
     for ( QStringList::Iterator it = packages.begin();
 	  it != packages.end(); ++it ) {
 	addPackageFiles( location, *it );
     }
 }
 
 
 void PackageHandler::cleanupPackageFiles( const QString &listfile  )
 {
     QFile f(listfile);
 	    
     if ( f.open(IO_ReadOnly) ) {   
 	QTextStream ts(&f);
 
 	QString s;
 	while ( !ts.eof() ) {        // until end of file...
 	    s = ts.readLine();       // line of text excluding '\n'
 	    // for s, do link/mkdir.
 	    if ( s.right(1) == "/" ) {
 		//should rmdir if empty, after all files have been removed
 	    } else {
 #ifndef Q_OS_WIN32
 		qDebug("remove symlink for %s", s.ascii());
 		//check if it is a symlink first (don't remove /etc/passwd...)
 		char buf[10]; //we don't care about the contents
 		if ( ::readlink( s.ascii(),buf, 10 >= 0 ) )
 		     ::unlink( s.ascii() );
 #else		
 		// ### revise
 		qWarning("Unable to remove symlink %s:%s", __FILE__, __LINE__);
 #endif
 	    }
 	}
 	f.close();
 
         //remove the list file
 	::unlink( listfile.ascii() );
     
     }   
 }
 
 void PackageHandler::cleanupPackages( const QString &location )
 {
     // get list of *.list in location/usr/lib/ipkg/info/*.list
     QDir dir( "/usr/lib/ipkg/info/"+location, "*.list",  // No tr
 	      QDir::Name, QDir::Files);
     if ( !dir.exists() )
 	return;
     
     QStringList packages = dir.entryList();
     for ( QStringList::Iterator it = packages.begin();
 	  it != packages.end(); ++it ) {
 	cleanupPackageFiles( *it );
     }
     
     //remove the backup directory 
     //###
 }
 
 void PackageHandler::prepareInstall( const QString& size, const QString& path )
 {
     // Check whether there will be enough space to install the next package.
     bool ok;
     unsigned int s = size.toUInt( &ok );
     
     if ( !ok )
 	return;
 
     // Shamelessly stolen from the sysinfo application (Werner)
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
     struct statfs fs;
     if ( statfs( path.latin1(), &fs ) == 0 )
 	if ( s > fs.f_bsize * fs.f_bavail ) {
 	    //qDebug("############### Not enough space left ###############");
 	    mNoSpaceLeft = TRUE;
 	}
 #endif
 }
 
 void PackageHandler::iProcessExited()
 {
     if ( currentProcess->normalExit() && currentProcess->exitStatus() == 0 )
 	sendReply( "installDone(QString)", currentPackage );
     else {
 #ifndef QT_NO_COP
 	QCopEnvelope e( "QPE/Desktop", "installFailed(QString,int,QString)" );
 	e << currentPackage << currentProcess->exitStatus()
 	    << currentProcessError;
 #endif
     }
     
     delete currentProcess;
     currentProcess = 0;
 
 #ifndef QT_NO_COP
     QCopEnvelope e("QPE/System", "linkChanged(QString)");
     QString lf = QString::null;
     e << lf;
 #endif
     unlink( currentPackage );
 }
 
 void PackageHandler::rmProcessExited()
 {
     if ( currentProcess->normalExit() && currentProcess->exitStatus() == 0 )
 	sendReply( "removeDone(QString)", currentPackage );
     else
 	sendReply( "removeFailed(QString)", currentPackage );
 
 #ifndef QT_NO_COP
     QCopEnvelope e("QPE/System", "linkChanged(QString)");
     QString lf = QString::null;
     e << lf;
 #endif
 }
 
 void PackageHandler::readyReadStdout()
 {
     while ( currentProcess->canReadLineStdout() ) {
 	QString line = currentProcess->readLineStdout();
 	currentProcessError.append("OUT:"+line);
 	if ( line.contains( "Unpacking" ) ) // No tr
 	    sendReply( "installStep(QString)", "one" ); // No tr
 	else if ( line.contains( "Configuring" ) ) // No tr
 	    sendReply( "installStep(QString)", "two" ); // No tr
     }
 }
 
 void PackageHandler::readyReadStderr()
 {
     while ( currentProcess->canReadLineStderr() ) {
 	QString line = currentProcess->readLineStderr();
 	currentProcessError.append("ERR:"+line);
     }
 }
 
 void PackageHandler::redoPackages()
 {
     //get list of filesystems
 
     //call cleanupPackages for the ones that have disappeared
 
     //call addPackageFiles for the new ones
 }
diff --git a/core/launcher/qcopbridge.cpp b/core/launcher/qcopbridge.cpp
index 9bca360..24f471d 100644
--- a/core/launcher/qcopbridge.cpp
+++ b/core/launcher/qcopbridge.cpp
@@ -1,498 +1,490 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "qcopbridge.h"
 #include "transferserver.h"
 
 #include <opie2/oglobal.h>
 
 #ifdef Q_WS_QWS
 #include <qtopia/qcopenvelope_qws.h>
 #endif
 #include <qtopia/qpeapplication.h>
 
 #include <qtopia/version.h>
-#include <qtopia/config.h>
 
-#include <qdir.h>
-#include <qfile.h>
 #include <qtextstream.h>
-#include <qdatastream.h>
-#include <qcstring.h>
-#include <qstringlist.h>
-#include <qfileinfo.h>
-#include <qregexp.h>
 #include <qtimer.h>
 #ifdef Q_WS_QWS
 #include <qcopchannel_qws.h>
 #endif
 
 #ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE
 #endif
 #ifndef Q_OS_WIN32
 #include <pwd.h>
 #include <unistd.h>
 #include <sys/types.h>
 #endif
 
 #if defined(_OS_LINUX_)
 #include <shadow.h>
 #endif
 
 
 //#define INSECURE
 
 const int block_size = 51200;
 
 QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent,
         const char* name )
     : QServerSocket( port, 1, parent, name ),
       desktopChannel( 0 ),
       cardChannel( 0 )
 {
     if ( !ok() )
 	qWarning( "Failed to bind to port %d", port );
     else {
 #ifndef QT_NO_COP
 	desktopChannel = new QCopChannel( "QPE/Desktop", this );
 	connect( desktopChannel, SIGNAL(received(const QCString &, const QByteArray &)),
 		 this, SLOT(desktopMessage( const QCString &, const QByteArray &)) );
 	cardChannel = new QCopChannel( "QPE/Card", this );
 	connect( cardChannel, SIGNAL(received(const QCString &, const QByteArray &)),
 		 this, SLOT(desktopMessage( const QCString &, const QByteArray &)) );
 #endif
     }
     sendSync = FALSE;
     openConnections.setAutoDelete( TRUE );
     authorizeConnections();
 }
 
 QCopBridge::~QCopBridge()
 {
 #ifndef QT_NO_COP
     delete desktopChannel;
 #endif
 }
 
 void QCopBridge::authorizeConnections()
 {
     Config cfg("Security");
     cfg.setGroup("SyncMode");
     m_mode = Mode(cfg.readNumEntry("Mode", Sharp ));
     QListIterator<QCopBridgePI> it(openConnections);
     while ( it.current() ) {
 	if ( !it.current()->verifyAuthorised() ) {
 	    disconnect ( it.current(), SIGNAL( connectionClosed( QCopBridgePI *) ), this, SLOT( closed( QCopBridgePI *) ) );
 	    openConnections.removeRef( it.current() );
 	} else
 	    ++it;
     }
 }
 
 void QCopBridge::newConnection( int socket )
 {
     QCopBridgePI *pi = new QCopBridgePI( socket, this );
     openConnections.append( pi );
     connect ( pi, SIGNAL( connectionClosed( QCopBridgePI *) ), this, SLOT( closed( QCopBridgePI *) ) );
 
     /* ### libqtopia merge FIXME */
 #if 0
     QPEApplication::setTempScreenSaverMode( QPEApplication::DisableSuspend );
 #endif
 #ifndef QT_NO_COP
     QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::DisableSuspend;
 #endif
 
     if ( sendSync ) {
 	pi ->startSync();
 	sendSync = FALSE;
     }
 }
 
 void QCopBridge::closed( QCopBridgePI *pi )
 {
     emit connectionClosed( pi->peerAddress() );
     openConnections.removeRef( pi );
     if ( openConnections.count() == 0 ) {
         /* ### FIXME libqtopia merge */
 #if 0
 	QPEApplication::setTempScreenSaverMode( QPEApplication::Enable );
 #endif
 #ifndef QT_NO_COP
         QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
 #endif
     }
 }
 
 void QCopBridge::closeOpenConnections()
 {
     QCopBridgePI *pi;
     for ( pi = openConnections.first(); pi != 0; pi = openConnections.next() )
 	pi->close();
 }
 
 
 void QCopBridge::desktopMessage( const QCString &command, const QByteArray &data )
 {
     if ( command == "startSync()" ) {
 	// we need to buffer it a bit
 	sendSync = TRUE;
 	startTimer( 20000 );
     }
 
     if ( m_mode & Qtopia1_7 ) {
         // send the command to all open connections
         QCopBridgePI *pi;
         for ( pi = openConnections.first(); pi != 0; pi = openConnections.next() ) {
             pi->sendDesktopMessage( command, data );
         }
     }
     if ( ( m_mode & Sharp ) || (m_mode & IntelliSync) )
         sendDesktopMessageOld( command, data );
 }
 
 #ifndef OPIE_NO_OLD_SYNC_CODE
 /*
  * Old compat mode
  */
 void QCopBridge::sendDesktopMessageOld( const QCString& command, const QByteArray& args) {
     command.stripWhiteSpace();
 
     int paren = command.find( "(" );
     if ( paren <= 0 ) {
 	qDebug("DesktopMessage: bad qcop syntax");
 	return;
     }
 
     QString params = command.mid( paren + 1 );
     if ( params[params.length()-1] != ')' ) {
 	qDebug("DesktopMessage: bad qcop syntax");
 	return;
     }
 
     params.truncate( params.length()-1 );
 
     QStringList paramList = QStringList::split( ",", params );
     QString data;
     if ( paramList.count() ) {
 	QDataStream stream( args, IO_ReadOnly );
 	for ( QStringList::Iterator it = paramList.begin(); it != paramList.end(); ++it ) {
 	    QString str;
 	    if ( *it == "QString" ) {
 		stream >> str;
 	    } else if ( *it == "QCString" ) {
 		QCString cstr;
 		stream >> cstr;
 		str = QString::fromLocal8Bit( cstr );
 	    } else if ( *it == "int" ) {
 		int i;
 		stream >> i;
 		str = QString::number( i );
 	    } else if ( *it == "bool" ) {
 		int i;
 		stream >> i;
 		str = QString::number( i );
 	    } else {
 		qDebug(" cannot route the argument type %s throught the qcop bridge", (*it).latin1() );
 		return;
 	    }
 	    QString estr;
 	    for (int i=0; i<(int)str.length(); i++) {
 		QChar ch = str[i];
 		if ( ch.row() )
 		    goto quick;
 		switch (ch.cell()) {
 		    case '&':
 			estr.append( "&amp;" );
 			break;
 		    case ' ':
 			estr.append( "&0x20;" );
 			break;
 		    case '\n':
 			estr.append( "&0x0d;" );
 			break;
 		    case '\r':
 			estr.append( "&0x0a;" );
 			break;
 		    default: quick:
 			estr.append(ch);
 		}
 	    }
 	    data += " " + estr;
 	}
     }
     QString sendCommand = QString(command.data()) + data;
 
 
     // send the command to all open connections
     QCopBridgePI *pi;
     for ( pi = openConnections.first(); pi != 0; pi = openConnections.next() )
         pi->sendDesktopMessage( sendCommand );
 
 }
 #endif
 
 
 void QCopBridge::timerEvent( QTimerEvent * )
 {
     sendSync = FALSE;
     killTimers();
 }
 
 
 QCopBridgePI::QCopBridgePI( int socket, QObject *parent, const char* name )
     : QSocket( parent, name )
 {
     setSocket( socket );
 
     peerport = peerPort();
     peeraddress = peerAddress();
 
 #ifndef INSECURE
     if ( !SyncAuthentication::isAuthorized(peeraddress) ) {
 	state = Forbidden;
 	close();
     } else
 #endif
     {
 	state = Connected;
 	connect( this, SIGNAL( readyRead() ), SLOT( read() ) );
 	QString intro="220 Qtopia ";
 	intro += QPE_VERSION; intro += ";";
 	intro += "challenge="; intro += SyncAuthentication::serverId(); intro += ";"; // No tr
 	intro += "loginname="; intro += SyncAuthentication::loginName(); intro += ";";
 	intro += "displayname="; intro += SyncAuthentication::ownerName(); intro += ";";
 	send( intro );
 	state = Wait_USER;
     }
     sendSync = FALSE;
     connect( this, SIGNAL( connectionClosed() ), SLOT( myConnectionClosed() ) );
 
     // idle timer to close connections when not used anymore
     timer = new QTimer(this);
     connect( timer, SIGNAL(timeout()), this, SLOT(myConnectionClosed()) );
     timer->start( 300000, TRUE );
 }
 
 
 QCopBridgePI::~QCopBridgePI()
 {
 }
 
 bool QCopBridgePI::verifyAuthorised()
 {
     if ( !SyncAuthentication::isAuthorized(peerAddress()) ) {
 	state = Forbidden;
 	return FALSE;
     }
     return TRUE;
 }
 
 void QCopBridgePI::myConnectionClosed()
 {
     emit connectionClosed( this );
 }
 
 void QCopBridgePI::sendDesktopMessage( const QString &msg )
 {
     QString str = "CALL QPE/Desktop " + msg; // No tr
     send ( str );
 }
 
 void QCopBridgePI::sendDesktopMessage( const QCString &msg, const QByteArray& data )
 {
     if ( !isOpen() ) // eg. Forbidden
 	return;
 
     const char hdr[]="CALLB QPE/Desktop ";
     writeBlock(hdr,sizeof(hdr)-1);
     writeBlock(msg,msg.length());
     writeBlock(" ",1);
     QByteArray b64 = OGlobal::encodeBase64(data);
     writeBlock(b64.data(),b64.size());
     writeBlock("\r\n",2);
 
 }
 
 
 void QCopBridgePI::send( const QString& msg )
 {
     if ( !isOpen() ) // eg. Forbidden
 	return;
     QTextStream os( this );
     os << msg << endl;
     //qDebug( "sending qcop message: %s", msg.latin1() );
 }
 
 void QCopBridgePI::read()
 {
     while ( canReadLine() ) {
 	timer->start( 300000, TRUE );
 	process( readLine().stripWhiteSpace() );
     }
 }
 
 void QCopBridgePI::process( const QString& message )
 {
     //qDebug( "Command: %s", message.latin1() );
 
     // split message using "," as separator
     QStringList msg = QStringList::split( " ", message );
     if ( msg.isEmpty() ) return;
 
     // command token
     QString cmd = msg[0].upper();
 
     // argument token
     QString arg;
     if ( msg.count() >= 2 )
 	arg = msg[1];
 
     // we always respond to QUIT, regardless of state
     if ( cmd == "QUIT" ) {
 	send( "211 Have a nice day!" ); // No tr
 	close();
 	return;
     }
 
     // connected to client
     if ( Connected == state )
 	return;
 
     // waiting for user name
     if ( Wait_USER == state ) {
 
 	if ( cmd != "USER" || msg.count() < 2 || !SyncAuthentication::checkUser( arg ) ) {
 	    send( "530 Please login with USER and PASS" ); // No tr
 	    return;
 	}
 	send( "331 User name ok, need password" ); // No tr
 	state = Wait_PASS;
 	return;
     }
 
     // waiting for password
     if ( Wait_PASS == state ) {
 
 	if ( cmd != "PASS" || !SyncAuthentication::checkPassword( arg ) ) {
 	    send( "530 Please login with USER and PASS" ); // No tr
 	    return;
 	}
 	send( "230 User logged in, proceed" ); // No tr
 	state = Ready;
 	if ( sendSync ) {
 	    sendDesktopMessage( "startSync()" );
 	    sendSync = FALSE;
 	}
 	return;
     }
 
     // noop (NOOP)
     else if ( cmd == "NOOP" ) {
 	send( "200 Command okay" ); // No tr
     }
 
     // call (CALL)
     else if ( cmd == "CALL" ) {
 
 	// example: call QPE/System execute(QString) addressbook
 
 	if ( msg.count() < 3 ) {
 	    send( "500 Syntax error, command unrecognized" ); // No tr
 	}
 	else {
 
 	    QString channel = msg[1];
 	    QString command = msg[2];
 
 	    command.stripWhiteSpace();
 
 	    int paren = command.find( "(" );
 	    if ( paren <= 0 ) {
 		send( "500 Syntax error, command unrecognized" ); // No tr
 		return;
 	    }
 
 	    QString params = command.mid( paren + 1 );
 	    if ( params[(int)params.length()-1] != ')' ) {
 		send( "500 Syntax error, command unrecognized" ); // No tr
 		return;
 	    }
 
 	    params.truncate( params.length()-1 );
 	    QByteArray buffer;
 	    QDataStream ds( buffer, IO_WriteOnly );
 
 	    int msgId = 3;
 
 	    QStringList paramList = QStringList::split( ",", params );
 	    if ( paramList.count() > msg.count() - 3 ) {
 		send( "500 Syntax error, command unrecognized" ); // No tr
 		return;
 	    }
 
 	    for ( QStringList::Iterator it = paramList.begin(); it != paramList.end(); ++it ) {
 
 		QString arg = msg[msgId];
 		arg.replace( QRegExp("&0x20;"), " " );
 		arg.replace( QRegExp("&amp;"), "&" );
 		arg.replace( QRegExp("&0x0d;"), "\n" );
 		arg.replace( QRegExp("&0x0a;"), "\r" );
 		if ( *it == "QString" )
 		    ds << arg;
 		else if ( *it == "QCString" )
 		    ds << arg.local8Bit();
 		else if ( *it == "int" )
 		    ds << arg.toInt();
 		else if ( *it == "bool" )
 		    ds << arg.toInt();
 		else {
 		    send( "500 Syntax error, command unrecognized" ); // No tr
 		    return;
 		}
 		msgId++;
 	    }
 
 #ifndef QT_NO_COP
 	    if ( !QCopChannel::isRegistered( channel.latin1() ) ) {
 		// send message back about it
 		QString answer = "599 ChannelNotRegistered " + channel;
 		send( answer );
 		return;
 	    }
 #endif
 
 #ifndef QT_NO_COP
 	    if ( paramList.count() )
 		QCopChannel::send( channel.latin1(), command.latin1(), buffer );
 	    else
 		QCopChannel::send( channel.latin1(), command.latin1() );
 
 	    send( "200 Command okay" ); // No tr
 #endif
 	}
     }
     // not implemented
     else
 	send( "502 Command not implemented" ); // No tr
 }
 
 
diff --git a/core/launcher/runningappbar.cpp b/core/launcher/runningappbar.cpp
index 1fda5a4..11d10dc 100644
--- a/core/launcher/runningappbar.cpp
+++ b/core/launcher/runningappbar.cpp
@@ -1,179 +1,172 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 ***********************************************************************/
 
 #define QTOPIA_INTERNAL_PRELOADACCESS
 
-#include <qtopia/global.h>
 
 #include <stdlib.h>
 
-#include <qtimer.h>
-#include <qpopupmenu.h>
 #include <qpainter.h>
-#include <qmessagebox.h>
 
-#include <qtopia/qpeapplication.h>
-#include <qtopia/applnk.h>
 #include <qtopia/qcopenvelope_qws.h>
-#include <qtopia/mimetype.h>
 
 #include "runningappbar.h"
 #include "serverinterface.h"
 
 RunningAppBar::RunningAppBar(QWidget* parent)
   : QFrame(parent), selectedAppIndex(-1)
 {
     QCopChannel* channel = new QCopChannel( "QPE/System", this );
     connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
 	     this, SLOT(received(const QCString&, const QByteArray&)) );
 
     spacing = AppLnk::smallIconSize()+3;
 }
 
 RunningAppBar::~RunningAppBar()
 {
 }
 
 void RunningAppBar::received(const QCString& msg, const QByteArray& data) {
     // Since fast apps appear and disappear without disconnecting from their
     // channel we need to watch for the showing/hiding events and update according.
     QDataStream stream( data, IO_ReadOnly );
     if ( msg == "fastAppShowing(QString)") {
 	QString appName;
 	stream >> appName;
 	//    qDebug("fastAppShowing %s", appName.data() );
 	const AppLnk* f = ServerInterface::appLnks().findExec(appName);
 	if ( f ) addTask(*f);
     } else if ( msg == "fastAppHiding(QString)") {
 	QString appName;
 	stream >> appName;
 	const AppLnk* f = ServerInterface::appLnks().findExec(appName);
 	if ( f ) removeTask(*f);
     }
 }
 
 void RunningAppBar::addTask(const AppLnk& appLnk) {
     qDebug("Added %s to app list.", appLnk.name().latin1());
     AppLnk* newApp = new AppLnk(appLnk);
     newApp->setExec(appLnk.exec());
     appList.prepend(newApp);
     update();
 }
 
 void RunningAppBar::removeTask(const AppLnk& appLnk) {
   unsigned int i = 0;
   for (; i < appList.count() ; i++) {
     AppLnk* target = appList.at(i);
     if (target->exec() == appLnk.exec()) {
        qDebug("Removing %s from app list.", appLnk.name().latin1());
       appList.remove();
       delete target;
     }
   }
   update();
 }
 
 void RunningAppBar::mousePressEvent(QMouseEvent *e)
 {
   // Find out if the user is clicking on an app icon...
   // If so, snag the index so when we repaint we show it
   // as highlighed.
   selectedAppIndex = 0;
   int x=0;
   QListIterator<AppLnk> it( appList );
   for ( ; it.current(); ++it,++selectedAppIndex,x+=spacing ) {
     if ( x + spacing <= width() ) {
       if ( e->x() >= x && e->x() < x+spacing ) {
 	if ( selectedAppIndex < (int)appList.count() ) {
 	  repaint(FALSE);
 	  return;
 	}
       }
     } else {
       break;
     }
   }
   selectedAppIndex = -1;
   repaint( FALSE );
 }
 
 void RunningAppBar::mouseReleaseEvent(QMouseEvent *e)
 {
     if (e->button() == QMouseEvent::RightButton)
 	return;
     if ( selectedAppIndex >= 0 ) {
 	QString app = appList.at(selectedAppIndex)->exec();
 	QCopEnvelope e("QPE/System", "raise(QString)");
 	e << app;
 	selectedAppIndex = -1;
 	update();
     }
 }
 
 void RunningAppBar::paintEvent( QPaintEvent * )
 {
     QPainter p( this );
     AppLnk *curApp;
     int x = 0;
     int y = (height() - AppLnk::smallIconSize()) / 2;
     int i = 0;
 
     p.fillRect( 0, 0, width(), height(), colorGroup().background() );
 
     QListIterator<AppLnk> it(appList);
 
     for (; it.current(); i++, ++it ) {
       if ( x + spacing <= width() ) {
 	curApp = it.current();
         qWarning("Drawing %s", curApp->name().latin1() );
  	if ( (int)i == selectedAppIndex )
  	  p.fillRect( x, y, spacing, curApp->pixmap().height()+1, colorGroup().highlight() );
   	else
 	  p.eraseRect( x, y, spacing, curApp->pixmap().height()+1 );
 	p.drawPixmap( x, y, curApp->pixmap() );
 	x += spacing;
       }
     }
 }
 
 QSize RunningAppBar::sizeHint() const
 {
     return QSize( frameWidth(), AppLnk::smallIconSize()+frameWidth()*2+3 );
 }
 
 void RunningAppBar::applicationLaunched(const QString &appName)
 {
     qDebug("desktop:: app: %s launched with pid ", appName.data() );
     const AppLnk* newGuy = ServerInterface::appLnks().findExec(appName);
     if ( newGuy && !newGuy->isPreloaded() ) {
 	addTask( *newGuy );
     }
 }
 
 void RunningAppBar::applicationTerminated(const QString &app)
 {
     const AppLnk* gone = ServerInterface::appLnks().findExec(app);
     if ( gone ) {
 	removeTask(*gone);
     }
 }
 
 
 
diff --git a/core/launcher/screensaver.cpp b/core/launcher/screensaver.cpp
index 1146dcd..e544c61 100644
--- a/core/launcher/screensaver.cpp
+++ b/core/launcher/screensaver.cpp
@@ -1,329 +1,328 @@
 
 #include "screensaver.h"
 
 #include <qpe/config.h>
-#include <qpe/power.h>
 #include <qpe/network.h>
 
 #include <opie2/odevice.h>
 
 
 using namespace Opie;
 
 
 
 OpieScreenSaver::OpieScreenSaver ( )
 		: QObject ( 0, "screensaver" ), QWSScreenSaver ( )
 {
 	m_disable_suspend = 100;
 	m_enable_dim = false;
 	m_enable_lightoff = false;
 	m_enable_suspend = false;
 	m_onlylcdoff = false;
 
 	m_enable_dim_ac = false;
 	m_enable_lightoff_ac = false;
 	m_enable_suspend_ac = false;
 	m_onlylcdoff_ac = false;
 
 	m_use_light_sensor = false;
 	m_backlight_sensor = -1;
 	::memset ( m_sensordata, 0xff, LS_Count * sizeof( m_sensordata [0] ));
 
 	m_lcd_status = true;
 
 	m_backlight_normal = -1;
 	m_backlight_current = -1;
 	m_backlight_forcedoff = false;
 
 	m_on_ac = false;
 
 	m_level = -1;
 
 	// Make sure the LCD is in fact on, (if opie was killed while the LCD is off it would still be off)
 	ODevice::inst ( )-> setDisplayStatus ( true );
 	setBacklight ( -1 );
 }
 
 
 /**
  * Stops the screen saver
  */
 void OpieScreenSaver::restore()
 {
 	m_level = -1;
 
 	if ( !m_lcd_status ) {    // We must have turned it off
 		ODevice::inst ( ) -> setDisplayStatus ( true );
 		m_lcd_status = true;
 	}
 
 	setBacklightInternal ( -1 );
 }
 
 
 /**
  * Starts the screen saver
  *
  * @param level what level of screen saving should happen (0=lowest non-off, 1=off,
  * 2=suspend whole machine)
  * @returns true on success
  */
 bool OpieScreenSaver::save( int level )
 {
 	m_level = level;
 
 	switch ( level ) {
 		case 0:
 			if (( m_on_ac && m_enable_dim_ac ) ||
 			        ( !m_on_ac && m_enable_dim )) {
 				if (( m_disable_suspend > 0 ) && ( m_backlight_current > 1 ) && !m_use_light_sensor )
 					setBacklightInternal ( 1 ); // lowest non-off
 			}
 			return true;
 			break;
 
 		case 1:
 			if (( m_on_ac && m_enable_lightoff_ac ) ||
 			        ( !m_on_ac && m_enable_lightoff )) {
 				if ( m_disable_suspend > 1 )
 					setBacklightInternal ( 0 ); // off
 			}
 			return true;
 			break;
 
 		case 2:
 			if (( m_on_ac && !m_enable_suspend_ac ) ||
 			        ( !m_on_ac && !m_enable_suspend )) {
 				return true;
 			}
 
 			if (( m_on_ac && m_onlylcdoff_ac ) ||
 			        ( !m_on_ac && m_onlylcdoff )) {
 				ODevice::inst ( ) -> setDisplayStatus ( false );
 				m_lcd_status = false;
 				return true;
 			}
 
 			// We're going to suspend the whole machine
 
 			if (( m_disable_suspend > 2 ) && !Network::networkOnline ( )) {
 				// TODO: why is this key F34 hard coded?  -- schurig
 				// Does this now only work an devices with a ODevice::filter?
 				QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE );
 				return true;
 			}
 
 			break;
 	}
 	return false;
 }
 
 
 /**
  * Set intervals in seconds for automatic dimming, light off and suspend
  *
  * This function also sets the member variables m_m_enable_dim[_ac],
  * m_enable_lightoff[_ac], m_enable_suspend[_ac], m_onlylcdoff[_ac]
  *
  * @param dim      time in seconds to dim, -1 to read value from config file,
  *                 0 to disable
  * @param lightoff time in seconds to turn LCD backlight off, -1 to
  *                 read value from config file, 0 to disable
  * @param suspend  time in seconds to do an APM suspend, -1 to
  *                 read value from config file, 0 to disable
  */
 void OpieScreenSaver::setIntervals ( int dim, int lightoff, int suspend )
 {
 	Config config ( "apm" );
 	config. setGroup ( m_on_ac ? "AC" : "Battery" );
 
 	int v[ 4 ];
 	if ( dim < 0 )
 		dim = config. readNumEntry ( "Dim", m_on_ac ? 60 : 30 );
 	if ( lightoff < 0 )
 		lightoff = config. readNumEntry ( "LightOff", m_on_ac ? 120 : 20 );
 	if ( suspend < 0 )
 		suspend = config. readNumEntry ( "Suspend", m_on_ac ? 0 : 60 );
 
 	if ( m_on_ac ) {
 		m_enable_dim_ac = ( dim > 0 );
 		m_enable_lightoff_ac = ( lightoff > 0 );
 		m_enable_suspend_ac = ( suspend > 0 );
 		m_onlylcdoff_ac = config.readBoolEntry ( "LcdOffOnly", false );
 	}
 	else {
 		m_enable_dim = ( dim > 0 );
 		m_enable_lightoff = ( lightoff > 0 );
 		m_enable_suspend = ( suspend > 0 );
 		m_onlylcdoff = config.readBoolEntry ( "LcdOffOnly", false );
 	}
 	
 	//qDebug("screen saver intervals: %d %d %d", dim, lightoff, suspend);
 
 	v [ 0 ] = QMAX( 1000 * dim, 100 );
 	v [ 1 ] = QMAX( 1000 * lightoff, 100 );
 	v [ 2 ] = QMAX( 1000 * suspend, 100 );
 	v [ 3 ] = 0;
 
 	if ( !dim && !lightoff && !suspend )
 		QWSServer::setScreenSaverInterval( 0 );
 	else
 		QWSServer::setScreenSaverIntervals( v );
 }
 
 
 /**
  * Set suspend time. Will read the dim and lcd-off times from the config file.
  *
  * @param suspend  time in seconds to go into APM suspend, -1 to
  *                 read value from config file, 0 to disable
  */
 void OpieScreenSaver::setInterval ( int interval )
 {
 	setIntervals ( -1, -1, interval );
 }
 
 
 void OpieScreenSaver::setMode ( int mode )
 {
 	if ( mode > m_disable_suspend )
 		setInterval ( -1 );
 	m_disable_suspend = mode;
 }
 
 
 /**
  * Set display brightness
  *
  * Get's default values for backlight, contrast and light sensor from config file.
  *
  * @param bright desired brighness (-1 to use automatic sensor data or value
  *               from config file, -2 to toggle backlight on and off, -3 to
  *               force backlight off)
  */
 void OpieScreenSaver::setBacklight ( int bright )
 {
 	// Read from config
 	Config config ( "apm" );
 	config. setGroup ( m_on_ac ? "AC" : "Battery" );
 	m_backlight_normal = config. readNumEntry ( "Brightness", m_on_ac ? 255 : 127 );
 	int contrast = config. readNumEntry ( "Contrast", 127);
 	m_use_light_sensor = config. readBoolEntry ( "LightSensor", false );
 
 	//qDebug ( "setBacklight: %d (norm: %d) (ls: %d)", bright, m_backlight_normal, m_use_light_sensor ? 1 : 0 );
 
 	killTimers ( );
 	if (( bright < 0 ) && m_use_light_sensor ) {
 		QStringList sl = config. readListEntry ( "LightSensorData", ';' );
 		
 		m_sensordata [LS_SensorMin] = 40;
 		m_sensordata [LS_SensorMax] = 215;
 		m_sensordata [LS_LightMin] = 1;
 		m_sensordata [LS_LightMax] = 255;
 		m_sensordata [LS_Steps] = 12;
 		m_sensordata [LS_Interval] = 2000;		
 		
 		for ( uint i = 0; i < LS_Count; i++ ) {
 			if ( i < sl. count ( ))
 				m_sensordata [i] = sl [i]. toInt ( );
 		}
 		if ( m_sensordata [LS_Steps] < 2 ) // sanity check to avoid SIGFPE
 			m_sensordata [LS_Steps] = 2;
 
 		timerEvent ( 0 );
 		startTimer ( m_sensordata [LS_Interval] );
 	}
 
 	setBacklightInternal ( bright );
 	ODevice::inst ( )-> setDisplayContrast(contrast);
 }
 
 
 /**
  * Internal brightness setting method
  *
  * Get's default values for backlight and light sensor from config file.
  *
  * @param bright desired brighness (-1 to use automatic sensor data or value
  *               from config file, -2 to toggle backlight on and off, -3 to
  *               force backlight off)
  */
 void OpieScreenSaver::setBacklightInternal ( int bright )
 {
 	if ( bright == -3 ) {
 		// Forced on
 		m_backlight_forcedoff = false;
 		bright = -1;
 	}
 	if ( m_backlight_forcedoff && bright != -2 )
 		return ;
 	if ( bright == -2 ) {
 		// Toggle between off and on
 		bright = m_backlight_current ? 0 : -1;
 		m_backlight_forcedoff = !bright;
 	}
 	if ( bright == -1 )
 		bright = m_use_light_sensor ? m_backlight_sensor : m_backlight_normal;
 
 	if ( bright != m_backlight_current ) {
 		ODevice::inst ( )-> setDisplayBrightness ( bright );
 		m_backlight_current = bright;
 	}
 }
 
 
 /**
  * Timer event used for automatic setting the backlight according to a light sensor
  * and to set the default brightness
  */
 void OpieScreenSaver::timerEvent ( QTimerEvent * )
 {
 	int s = ODevice::inst ( )-> readLightSensor ( ) * 256 / ODevice::inst ( )-> lightSensorResolution ( );
 	
 	if ( s < m_sensordata [LS_SensorMin] )
 		m_backlight_sensor = m_sensordata [LS_LightMax];
 	else if ( s >= m_sensordata [LS_SensorMax] )
 		m_backlight_sensor = m_sensordata [LS_LightMin];
 	else {
 		int dx = m_sensordata [LS_SensorMax] - m_sensordata [LS_SensorMin];
 		int dy = m_sensordata [LS_LightMax] - m_sensordata [LS_LightMin];
 		
 		int stepno = ( s - m_sensordata [LS_SensorMin] ) * m_sensordata [LS_Steps] / dx; // dx is never 0
 		
 		m_backlight_sensor = m_sensordata [LS_LightMax] - dy * stepno / ( m_sensordata [LS_Steps] - 1 );
 	}
 
 	//qDebug ( "f(%d) = %d [%d - %d] -> [%d - %d] / %d", s, m_backlight_sensor, m_sensordata [LS_SensorMin], m_sensordata [LS_SensorMax], m_sensordata [LS_LightMin], m_sensordata [LS_LightMax], m_sensordata [LS_Steps] );
 
 	if ( m_level <= 0 )
 		setBacklightInternal ( -1 );
 }
 
 
 /**
  * Like ODevice::setDisplayStatus(), but keep current state in m_lcd_status.
  */
 void OpieScreenSaver::setDisplayState ( bool on )
 {
 	if ( m_lcd_status != on ) {
 		ODevice::inst ( ) -> setDisplayStatus ( on );
 		m_lcd_status = on;
 	}
 }
 
 
 /**
  * Set display to default ac/battery settings when power status changed.
  */
 void OpieScreenSaver::powerStatusChanged ( PowerStatus ps )
 {
 	bool newonac = ( ps. acStatus ( ) == PowerStatus::Online );
 	
 	if ( newonac != m_on_ac ) {
 		m_on_ac = newonac;
 		setInterval ( -1 );
 		setBacklight ( -1 );
 		restore ( );		
 	}
 }
diff --git a/core/launcher/server.cpp b/core/launcher/server.cpp
index 32fcdd0..068d716 100644
--- a/core/launcher/server.cpp
+++ b/core/launcher/server.cpp
@@ -1,730 +1,729 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "server.h"
 #include "serverapp.h"
-#include "launcher.h"
 #include "startmenu.h"
+#include "launcher.h"
 #include "transferserver.h"
 #include "qcopbridge.h"
 #include "irserver.h"
 #include "packageslave.h"
 #include "calibrate.h"
 #include "qrsync.h"
 #include "syncdialog.h"
-#include "launcher.h"
 #include "shutdownimpl.h"
 #include "applauncher.h"
 #if 0
 #include "suspendmonitor.h"
 #endif
 #include "documentlist.h"
 
 #include <qtopia/applnk.h>
 #include <qtopia/private/categories.h>
 #include <qtopia/mimetype.h>
 #include <qtopia/config.h>
 #include <qtopia/resource.h>
 #include <qtopia/version.h>
 #include <qtopia/storage.h>
 
 #include <qtopia/qcopenvelope_qws.h>
 #include <qwindowsystem_qws.h>
 #include <qgfx_qws.h>
 #include <qtopia/global.h>
 //#include <qtopia/custom.h>
 
 #include <opie2/odevicebutton.h>
 #include <opie2/odevice.h>
 
 #include <unistd.h>
 #include <qmainwindow.h>
 #include <qmessagebox.h>
 #include <qtimer.h>
 #include <qtextstream.h>
 
 #include <stdlib.h>
 
 extern QRect qt_maxWindowRect;
 
 using namespace Opie;
 
 static QWidget *calibrate(bool)
 {
 #ifdef Q_WS_QWS
     Calibrate *c = new Calibrate;
     c->show();
     return c;
 #else
     return 0;
 #endif
 }
 
 #define FACTORY(T) \
     static QWidget *new##T( bool maximized ) { \
 	QWidget *w = new T( 0, 0, QWidget::WDestructiveClose | QWidget::WGroupLeader ); \
 	if ( maximized ) { \
 	    if ( qApp->desktop()->width() <= 350 ) { \
 		w->showMaximized(); \
 	    } else { \
 		w->resize( QSize( 300, 300 ) ); \
 	    } \
 	} \
 	w->show(); \
 	return w; \
     }
 
 
 #ifdef SINGLE_APP
 #define APP(a,b,c,d) FACTORY(b)
 #include "apps.h"
 #undef APP
 #endif // SINGLE_APP
 
 static Global::Command builtins[] = {
 
 #ifdef SINGLE_APP
 #define APP(a,b,c,d) { a, new##b, c, d },
 #include "apps.h"
 #undef APP
 #endif
 
     /* FIXME defines need to be defined*/
 #if !defined(OPIE_NO_BUILTIN_CALIBRATE)
         { "calibrate",          calibrate,	        1, 0 }, // No tr
 #endif
 #if !defined(OPIE_NO_BUILTIN_SHUTDOWN)
 	{ "shutdown",           Global::shutdown,      	1, 0 }, // No tr
 //	{ "run",                run,			1, 0 }, // No tr
 #endif
 
 	{ 0,            calibrate,	0, 0 },
 };
 
 
 //---------------------------------------------------------------------------
 
 
 //===========================================================================
 
 Server::Server() :
     QWidget( 0, 0, WStyle_Tool | WStyle_Customize ),
     qcopBridge( 0 ),
     transferServer( 0 ),
     packageHandler( 0 ),
     syncDialog( 0 )
 {
     Global::setBuiltinCommands(builtins);
 
     tid_xfer = 0;
     /* ### FIXME ### */
 /*    tid_today = startTimer(3600*2*1000);*/
     last_today_show = QDate::currentDate();
 
 #if 0
     tsmMonitor = new TempScreenSaverMode();
     connect( tsmMonitor, SIGNAL(forceSuspend()), qApp, SIGNAL(power()) );
 #endif
 
     serverGui = new Launcher;
     serverGui->createGUI();
 
     docList = new DocumentList( serverGui );
     appLauncher = new AppLauncher(this);
     connect(appLauncher, SIGNAL(launched(int, const QString &)), this, SLOT(applicationLaunched(int, const QString &)) );
     connect(appLauncher, SIGNAL(terminated(int, const QString &)), this, SLOT(applicationTerminated(int, const QString &)) );
     connect(appLauncher, SIGNAL(connected(const QString &)), this, SLOT(applicationConnected(const QString &)) );
 
     storage = new StorageInfo( this );
     connect( storage, SIGNAL(disksChanged()), this, SLOT(storageChanged()) );
 
     // start services
     startTransferServer();
     (void) new IrServer( this );
 
     packageHandler = new PackageHandler( this );
     connect(qApp, SIGNAL(activate(const Opie::ODeviceButton*,bool)),
             this,SLOT(activate(const Opie::ODeviceButton*,bool)));
 
     setGeometry( -10, -10, 9, 9 );
 
     QCopChannel *channel = new QCopChannel("QPE/System", this);
     connect(channel, SIGNAL(received(const QCString &, const QByteArray &)),
 	    this, SLOT(systemMsg(const QCString &, const QByteArray &)) );
 
     QCopChannel *tbChannel = new QCopChannel( "QPE/TaskBar", this );
     connect( tbChannel, SIGNAL(received(const QCString&, const QByteArray&)),
 	    this, SLOT(receiveTaskBar(const QCString&, const QByteArray&)) );
 
     connect( qApp, SIGNAL(prepareForRestart()), this, SLOT(terminateServers()) );
     connect( qApp, SIGNAL(timeChanged()), this, SLOT(pokeTimeMonitors()) );
 
     preloadApps();
 }
 
 void Server::show()
 {
     ServerApplication::login(TRUE);
     QWidget::show();
 }
 
 Server::~Server()
 {
     serverGui->destroyGUI();
     delete docList;
     delete qcopBridge;
     delete transferServer;
     delete serverGui;
 #if 0
     delete tsmMonitor;
 #endif
 }
 
 static bool hasVisibleWindow(const QString& clientname, bool partial)
 {
 #ifdef QWS
     const QList<QWSWindow> &list = qwsServer->clientWindows();
     QWSWindow* w;
     for (QListIterator<QWSWindow> it(list); (w=it.current()); ++it) {
 	if ( w->client()->identity() == clientname ) {
 	    if ( partial && !w->isFullyObscured() )
 		return TRUE;
 	    if ( !partial && !w->isFullyObscured() && !w->isPartiallyObscured() ) {
 # if QT_VERSION < 0x030000
 		QRect mwr = qt_screen->mapToDevice(qt_maxWindowRect,
 			QSize(qt_screen->width(),qt_screen->height()) );
 # else
 		QRect mwr = qt_maxWindowRect;
 # endif
 		if ( mwr.contains(w->requested().boundingRect()) )
 		    return TRUE;
 	    }
 	}
     }
 #endif
     return FALSE;
 }
 
 void Server::activate(const Opie::ODeviceButton* button, bool held)
 {
     Global::terminateBuiltin("calibrate"); // No tr
     Opie::OQCopMessage om;
     if ( held ) {
 	om = button->heldAction();
     } else {
 	om = button->pressedAction();
     }
 
     if ( om.channel() != "ignore" )
         om.send();
 
     // A button with no action defined, will return a null ServiceRequest.  Don't attempt
     // to send/do anything with this as it will crash
     /* ### FIXME */
 #if 0
     if ( !sr.isNull() ) {
 	QString app = sr.app();
 	bool vis = hasVisibleWindow(app, app != "qpe");
 	if ( sr.message() == "raise()" && vis ) {
 	    sr.setMessage("nextView()");
 	} else {
 	    // "back door"
 	    sr << (int)vis;
 	}
 
 	sr.send();
     }
 #endif
 }
 
 
 #ifdef Q_WS_QWS
 
 
 typedef struct KeyOverride {
     ushort scan_code;
     QWSServer::KeyMap map;
 };
 
 
 static const KeyOverride jp109keys[] = {
    { 0x03, {   Qt::Key_2,      '2'     , 0x22     , 0xffff  } },
    { 0x07, {   Qt::Key_6,      '6'     , '&'     , 0xffff  } },
    { 0x08, {   Qt::Key_7,      '7'     , '\''     , 0xffff  } },
    { 0x09, {   Qt::Key_8,      '8'     , '('     , 0xffff  } },
    { 0x0a, {   Qt::Key_9,      '9'     , ')'     , 0xffff  } },
    { 0x0b, {   Qt::Key_0,      '0'     , 0xffff  , 0xffff  } },
    { 0x0c, {   Qt::Key_Minus,      '-'     , '='     , 0xffff  } },
    { 0x0d, {   Qt::Key_AsciiCircum,'^'     , '~'     , '^' - 64  } },
    { 0x1a, {   Qt::Key_At,     '@'     , '`'     , 0xffff  } },
    { 0x1b, {   Qt::Key_BraceLeft, '['     , '{'  , '[' - 64  } },
    { 0x27, {   Qt::Key_Semicolon,  ';'     , '+'     , 0xffff  } },
    { 0x28, {   Qt::Key_Colon,  ':'    ,  '*'     , 0xffff  } },
    { 0x29, {   Qt::Key_Zenkaku_Hankaku,  0xffff  , 0xffff     , 0xffff  } },
    { 0x2b, {   Qt::Key_BraceRight,  ']'    , '}'     , ']'-64  } },
    { 0x70, {   Qt::Key_Hiragana_Katakana,    0xffff  , 0xffff  , 0xffff  } },
    { 0x73, {   Qt::Key_Backslash,  '\\'    , '_'  ,    0xffff  } },
    { 0x79, {   Qt::Key_Henkan,     0xffff  , 0xffff  , 0xffff  } },
    { 0x7b, {   Qt::Key_Muhenkan,   0xffff  , 0xffff  , 0xffff  } },
    { 0x7d, {   Qt::Key_yen,        0x00a5  , '|'     , 0xffff  } },
    { 0x00, {   0,          0xffff  , 0xffff  , 0xffff  } }
 };
 
 bool Server::setKeyboardLayout( const QString &kb )
 {
     //quick demo version that can be extended
 
     QIntDict<QWSServer::KeyMap> *om = 0;
     if ( kb == "us101" ) { // No tr
 	om = 0;
     } else if ( kb == "jp109" ) {
 	om = new QIntDict<QWSServer::KeyMap>(37);
 	const KeyOverride *k = jp109keys;
 	while ( k->scan_code ) {
 	    om->insert( k->scan_code, &k->map );
 	    k++;
 	}
     }
     QWSServer::setOverrideKeys( om );
 
     return TRUE;
 }
 
 #endif
 
 void Server::systemMsg(const QCString &msg, const QByteArray &data)
 {
     QDataStream stream( data, IO_ReadOnly );
 
     if ( msg == "securityChanged()" ) {
 	if ( transferServer )
 	   transferServer->authorizeConnections();
 	if ( qcopBridge )
 	    qcopBridge->authorizeConnections();
     }
     /* ### FIXME support TempScreenSaverMode */
 #if 0
     else if ( msg == "setTempScreenSaverMode(int,int)" ) {
 	int mode, pid;
 	stream >> mode >> pid;
 	tsmMonitor->setTempMode(mode, pid);
     }
 #endif
     else if ( msg == "linkChanged(QString)" ) {
 	QString link;
 	stream >> link;
 	qDebug( "desktop.cpp systemMsg -> linkchanged( %s )", link.latin1() );
 	docList->linkChanged(link);
     } else if ( msg == "serviceChanged(QString)" ) {
 	MimeType::updateApplications();
     } else if ( msg == "mkdir(QString)" ) {
 	QString dir;
 	stream >> dir;
 	if ( !dir.isEmpty() )
 	    mkdir( dir );
     } else if ( msg == "rdiffGenSig(QString,QString)" ) {
 	QString baseFile, sigFile;
 	stream >> baseFile >> sigFile;
 	QRsync::generateSignature( baseFile, sigFile );
     } else if ( msg == "rdiffGenDiff(QString,QString,QString)" ) {
 	QString baseFile, sigFile, deltaFile;
 	stream >> baseFile >> sigFile >> deltaFile;
 	QRsync::generateDiff( baseFile, sigFile, deltaFile );
     } else if ( msg == "rdiffApplyPatch(QString,QString)" ) {
 	QString baseFile, deltaFile;
 	stream >> baseFile >> deltaFile;
 	if ( !QFile::exists( baseFile ) ) {
 	    QFile f( baseFile );
 	    f.open( IO_WriteOnly );
 	    f.close();
 	}
 	QRsync::applyDiff( baseFile, deltaFile );
 #ifndef QT_NO_COP
 	QCopEnvelope e( "QPE/Desktop", "patchApplied(QString)" );
 	e << baseFile;
 #endif
     } else if ( msg == "rdiffCleanup()" ) {
 	mkdir( "/tmp/rdiff" );
 	QDir dir;
 	dir.setPath( "/tmp/rdiff" );
 	QStringList entries = dir.entryList();
 	for ( QStringList::Iterator it = entries.begin(); it != entries.end(); ++it )
 	    dir.remove( *it );
     } else if ( msg == "sendHandshakeInfo()" ) {
 	QString home = getenv( "HOME" );
 #ifndef QT_NO_COP
 	QCopEnvelope e( "QPE/Desktop", "handshakeInfo(QString,bool)" );
 	e << home;
 	int locked = (int) ServerApplication::screenLocked();
 	e << locked;
 #endif
 
     }
     /*
      * QtopiaDesktop relies on the major number
      * to start with 1. We're at 0.9
      * so wee need to fake at least 1.4 to be able
      * to sync with QtopiaDesktop1.6
      */
     else if ( msg == "sendVersionInfo()" ) {
 	QCopEnvelope e( "QPE/Desktop", "versionInfo(QString,QString)" );
         /* ### FIXME Architecture ### */
 	e << QString::fromLatin1("1.7") << "Uncustomized Device";
     } else if ( msg == "sendCardInfo()" ) {
 #ifndef QT_NO_COP
 	QCopEnvelope e( "QPE/Desktop", "cardInfo(QString)" );
 #endif
 	storage->update();
 	const QList<FileSystem> &fs = storage->fileSystems();
 	QListIterator<FileSystem> it ( fs );
 	QString s;
 	QString homeDir = getenv("HOME");
 	QString homeFs, homeFsPath;
 	for ( ; it.current(); ++it ) {
 	    int k4 = (*it)->blockSize()/256;
 	    if ( (*it)->isRemovable() ) {
 		s += (*it)->name() + "=" + (*it)->path() + "/Documents " // No tr
 		     + QString::number( (*it)->availBlocks() * k4/4 )
 		     + "K " + (*it)->options() + ";";
 	    } else if ( homeDir.contains( (*it)->path() ) &&
 		      (*it)->path().length() > homeFsPath.length() ) {
 		homeFsPath = (*it)->path();
 		homeFs =
 		    (*it)->name() + "=" + homeDir + "/Documents " // No tr
 		    + QString::number( (*it)->availBlocks() * k4/4 )
 		    + "K " + (*it)->options() + ";";
 	    }
 	}
 	if ( !homeFs.isEmpty() )
 	    s += homeFs;
 
 #ifndef QT_NO_COP
 	e << s;
 #endif
     } else if ( msg == "sendSyncDate(QString)" ) {
 	QString app;
 	stream >> app;
 	Config cfg( "qpe" );
 	cfg.setGroup("SyncDate");
 #ifndef QT_NO_COP
 	QCopEnvelope e( "QPE/Desktop", "syncDate(QString,QString)" );
 	e  << app  << cfg.readEntry( app );
 #endif
 	//qDebug("QPE/System sendSyncDate for %s: response %s", app.latin1(),
 	//cfg.readEntry( app ).latin1() );
     } else if ( msg == "setSyncDate(QString,QString)" ) {
 	QString app, date;
 	stream >> app >> date;
 	Config cfg( "qpe" );
 	cfg.setGroup("SyncDate");
 	cfg.writeEntry( app, date );
 	//qDebug("setSyncDate(QString,QString) %s %s", app.latin1(), date.latin1());
     } else if ( msg == "startSync(QString)" ) {
 	QString what;
 	stream >> what;
 	delete syncDialog;
 	syncDialog = new SyncDialog( this, what );
 	syncDialog->show();
 	connect( syncDialog, SIGNAL(cancel()), SLOT(cancelSync()) );
     } else if ( msg == "stopSync()") {
 	delete syncDialog;
 	syncDialog = 0;
     } else if (msg == "restoreDone(QString)") {
 	docList->restoreDone();
     } else if ( msg == "getAllDocLinks()" ) {
 	docList->sendAllDocLinks();
     }
 #ifdef Q_WS_QWS
     else if ( msg == "setMouseProto(QString)" ) {
 	QString mice;
 	stream >> mice;
 	setenv("QWS_MOUSE_PROTO",mice.latin1(),1);
 	qwsServer->openMouse();
     } else if ( msg == "setKeyboard(QString)" ) {
 	QString kb;
 	stream >> kb;
 	setenv("QWS_KEYBOARD",kb.latin1(),1);
 	qwsServer->openKeyboard();
 
     } else if ( msg == "setKeyboardAutoRepeat(int,int)" ) {
 	int delay, period;
 	stream >> delay >> period;
 	qwsSetKeyboardAutoRepeat( delay, period );
 	Config cfg( "qpe" );
 	cfg.setGroup("Keyboard");
 	cfg.writeEntry( "RepeatDelay", delay );
 	cfg.writeEntry( "RepeatPeriod", period );
     } else if ( msg == "setKeyboardLayout(QString)" ) {
 	QString kb;
 	stream >> kb;
 	setKeyboardLayout( kb );
 	Config cfg( "qpe" );
 	cfg.setGroup("Keyboard");
 	cfg.writeEntry( "Layout", kb );
     } else if ( msg == "autoStart(QString)" ) {
         QString appName;
         stream >> appName;
         Config cfg( "autostart" );
         cfg.setGroup( "AutoStart" );
         if ( appName.compare("clear") == 0){
             cfg.writeEntry("Apps", "");
         }
     } else if ( msg == "autoStart(QString,QString)" ) {
         QString modifier, appName;
         stream >> modifier >> appName;
         Config cfg( "autostart" );
         cfg.setGroup( "AutoStart" );
         if ( modifier.compare("add") == 0 ){
             // only add if appname is entered
            if (!appName.isEmpty()) {
                 cfg.writeEntry("Apps", appName);
             }
         } else if (modifier.compare("remove") == 0 ) {
             // need to change for multiple entries
             // actually remove is right now simular to clear, but in future there
             // should be multiple apps in autostart possible.
             QString checkName;
             checkName = cfg.readEntry("Apps", "");
             if (checkName == appName) {
                 cfg.writeEntry("Apps", "");
             }
         }
         // case the autostart feature should be delayed
     } else if ( msg == "autoStart(QString,QString,QString)") {
          QString modifier, appName, delay;
          stream >> modifier >> appName >> delay;
         Config cfg( "autostart" );
 
         cfg.setGroup( "AutoStart" );
         if ( modifier.compare("add") == 0 ){
             // only add it appname is entered
             if (!appName.isEmpty()) {
                 cfg.writeEntry("Apps", appName);
                 cfg.writeEntry("Delay", delay);
             }
         } else {
         }
     }
 #endif
 }
 
 void Server::receiveTaskBar(const QCString &msg, const QByteArray &data)
 {
     QDataStream stream( data, IO_ReadOnly );
 
     if ( msg == "reloadApps()" ) {
 	docList->reloadAppLnks();
     } else if ( msg == "soundAlarm()" ) {
 	ServerApplication::soundAlarm();
     }
     else if ( msg == "setLed(int,bool)" ) {
 	int led, status;
 	stream >> led >> status;
 
         QValueList <OLed> ll = ODevice::inst ( )-> ledList ( );
         if ( ll. count ( ))	{
             OLed l = ll. contains ( Led_Mail ) ? Led_Mail : ll [0];
             bool canblink = ODevice::inst ( )-> ledStateList ( l ). contains ( Led_BlinkSlow );
 
             ODevice::inst ( )-> setLedState ( l, status ? ( canblink ? Led_BlinkSlow : Led_On ) : Led_Off );
         }
     }
 }
 
 void Server::cancelSync()
 {
 #ifndef QT_NO_COP
     QCopEnvelope e( "QPE/Desktop", "cancelSync()" );
 #endif
     delete syncDialog;
     syncDialog = 0;
 }
 
 bool Server::mkdir(const QString &localPath)
 {
     QDir fullDir(localPath);
     if (fullDir.exists())
 	return true;
 
     // at this point the directory doesn't exist
     // go through the directory tree and start creating the direcotories
     // that don't exist; if we can't create the directories, return false
 
     QString dirSeps = "/";
     int dirIndex = localPath.find(dirSeps);
     QString checkedPath;
 
     // didn't find any seps; weird, use the cur dir instead
     if (dirIndex == -1) {
 	//qDebug("No seperators found in path %s", localPath.latin1());
 	checkedPath = QDir::currentDirPath();
     }
 
     while (checkedPath != localPath) {
 	// no more seperators found, use the local path
 	if (dirIndex == -1)
 	    checkedPath = localPath;
 	else {
 	    // the next directory to check
 	    checkedPath = localPath.left(dirIndex) + "/";
 	    // advance the iterator; the next dir seperator
 	    dirIndex = localPath.find(dirSeps, dirIndex+1);
 	}
 
 	QDir checkDir(checkedPath);
 	if (!checkDir.exists()) {
 	    //qDebug("mkdir making dir %s", checkedPath.latin1());
 
 	    if (!checkDir.mkdir(checkedPath)) {
 		qDebug("Unable to make directory %s", checkedPath.latin1());
 		return FALSE;
 	    }
 	}
 
     }
     return TRUE;
 }
 
 void Server::styleChange( QStyle &s )
 {
     QWidget::styleChange( s );
 }
 
 void Server::startTransferServer()
 {
     if ( !qcopBridge ) {
 	// start qcop bridge server
 	qcopBridge = new QCopBridge( 4243 );
 	if ( qcopBridge->ok() ) {
 	    // ... OK
 	    connect( qcopBridge, SIGNAL(connectionClosed(const QHostAddress &)),
 		    this, SLOT(syncConnectionClosed(const QHostAddress &)) );
 	} else {
 	    delete qcopBridge;
 	    qcopBridge = 0;
 	}
     }
     if ( !transferServer ) {
 	// start transfer server
 	transferServer = new TransferServer( 4242 );
 	if ( transferServer->ok() ) {
 	    // ... OK
 	} else {
 	    delete transferServer;
 	    transferServer = 0;
 	}
     }
     if ( !transferServer || !qcopBridge )
 	tid_xfer = startTimer( 2000 );
 }
 
 void Server::timerEvent( QTimerEvent *e )
 {
     if ( e->timerId() == tid_xfer ) {
 	killTimer( tid_xfer );
 	tid_xfer = 0;
 	startTransferServer();
     }
     /* ### FIXME today startin */
 #if 0
     else if ( e->timerId() == tid_today ) {
 	QDate today = QDate::currentDate();
 	if ( today != last_today_show ) {
 	    last_today_show = today;
 	    Config cfg("today");
 	    cfg.setGroup("Start");
 #ifndef QPE_DEFAULT_TODAY_MODE
 #define QPE_DEFAULT_TODAY_MODE "Never"
 #endif
 	    if ( cfg.readEntry("Mode",QPE_DEFAULT_TODAY_MODE) == "Daily" ) {
 		QCopEnvelope env(Service::channel("today"),"raise()");
 	    }
 	}
     }
 #endif
 }
 
 void Server::terminateServers()
 {
     delete transferServer;
     delete qcopBridge;
     transferServer = 0;
     qcopBridge = 0;
 }
 
 void Server::syncConnectionClosed( const QHostAddress & )
 {
     qDebug( "Lost sync connection" );
     delete syncDialog;
     syncDialog = 0;
 }
 
 void Server::pokeTimeMonitors()
 {
 #if 0
     // inform all TimeMonitors
     QStrList tms = Service::channels("TimeMonitor");
     for (const char* ch = tms.first(); ch; ch=tms.next()) {
 	QString t = getenv("TZ");
 	QCopEnvelope e(ch, "timeChange(QString)");
 	e << t;
     }
 #endif
 }
 
 void Server::applicationLaunched(int, const QString &app)
 {
     serverGui->applicationStateChanged( app, ServerInterface::Launching );
 }
 
 void Server::applicationTerminated(int pid, const QString &app)
 {
     serverGui->applicationStateChanged( app, ServerInterface::Terminated );
 #if 0
     tsmMonitor->applicationTerminated( pid );
 #endif
 }
 
 void Server::applicationConnected(const QString &app)
 {
     serverGui->applicationStateChanged( app, ServerInterface::Running );
 }
 
 void Server::storageChanged()
 {
     system( "qtopia-update-symlinks" );
     serverGui->storageChanged( storage->fileSystems() );
     docList->storageChanged();
 }
 
 
 
 void Server::preloadApps()
 {
     Config cfg("Launcher");
     cfg.setGroup("Preload");
     QStringList apps = cfg.readListEntry("Apps",',');
     for (QStringList::ConstIterator it=apps.begin(); it!=apps.end(); ++it) {
 #ifndef QT_NO_COP
 	QCopEnvelope e("QPE/Application/"+(*it).local8Bit(), "enablePreload()");
 #endif
     }
 }
 
diff --git a/core/launcher/shutdownimpl.cpp b/core/launcher/shutdownimpl.cpp
index 899d9ac..f43a2a3 100644
--- a/core/launcher/shutdownimpl.cpp
+++ b/core/launcher/shutdownimpl.cpp
@@ -1,174 +1,173 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "shutdownimpl.h"
 
 #include <qpe/global.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qtimer.h>
 #include <qprogressbar.h>
 #include <qpushbutton.h>
 #include <qbuttongroup.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qpalette.h>
 
 
 static void changeButtonColor ( QPushButton *btn, const QColor &col )
 {
 	QPalette pal = btn-> palette ( );
 
 	pal. setColor ( QPalette::Active, QColorGroup::Button, col );
 	pal. setColor ( QPalette::Disabled, QColorGroup::Button, col );
 	pal. setColor ( QPalette::Inactive, QColorGroup::Button, col );
 
 	btn-> setPalette ( pal );
 }
 
 
 ShutdownImpl::ShutdownImpl( QWidget* parent, const char *name, WFlags fl )
 		: QWidget ( parent, name, fl )
 {
 	setCaption ( tr( "Shutdown..." ) );
 
 	QVBoxLayout *vbox = new QVBoxLayout ( this );
 	vbox-> setSpacing ( 3 );
 	vbox-> setMargin ( 6 );
 
 	QButtonGroup *btngrp = new QButtonGroup ( this );
 
 	btngrp-> setTitle ( tr( "Terminate" ) );
 	btngrp-> setColumnLayout ( 0, Qt::Vertical );
 	btngrp-> layout ( ) -> setSpacing ( 0 );
 	btngrp-> layout ( ) -> setMargin ( 0 );
 
 	QGridLayout *grid = new QGridLayout ( btngrp-> layout ( ) );
 	grid-> setAlignment ( Qt::AlignTop );
 	grid-> setSpacing ( 3 );
 	grid-> setMargin ( 7 );
 
 	QPushButton *quit = new QPushButton ( tr( "Terminate Opie" ), btngrp, "quit" );
 	changeButtonColor ( quit, QColor ( 236, 236, 179 ) );
 	btngrp-> insert ( quit, 4 );
 	grid-> addWidget ( quit, 1, 1 );
 
 	QPushButton *reboot = new QPushButton ( tr( "Reboot" ), btngrp, "reboot" );
 	changeButtonColor ( reboot, QColor( 236, 183, 181 ) );
 	btngrp-> insert ( reboot, 2 );
 	grid-> addWidget( reboot, 1, 0 );
 
 	QPushButton *restart = new QPushButton ( tr( "Restart Opie" ), btngrp, "restart" );
 	changeButtonColor ( restart, QColor( 236, 236, 179 ) );
 	btngrp-> insert ( restart, 3 );
 	grid-> addWidget ( restart, 0, 1 );
 
 	QPushButton *shutdown = new QPushButton( tr( "Shutdown" ), btngrp, "shutdown" );
 	changeButtonColor ( shutdown, QColor( 236, 183, 181 ) );
 	btngrp-> insert ( shutdown, 1 );
 	grid-> addWidget ( shutdown, 0, 0 );
 
 	vbox-> addWidget ( btngrp );
 
 	m_info = new QLabel ( this, "info" );
 	m_info-> setText( tr( "<p>\n" "These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary." ) );
 	vbox-> addWidget ( m_info );
 
 	m_progress = new QProgressBar ( this, "progressBar" );
 	m_progress-> setFrameShape ( QProgressBar::Panel );
 	m_progress-> setFrameShadow ( QProgressBar::Sunken );
 	m_progress-> setTotalSteps ( 20 );
 	m_progress-> setIndicatorFollowsStyle ( false );
 	vbox-> addWidget ( m_progress );
 
 	vbox-> addItem ( new QSpacerItem ( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
 
 	QPushButton *cancel = new QPushButton ( tr( "Cancel" ), this, "cancel" );
 	changeButtonColor ( cancel, QColor( 181, 222, 178 ) );
 	cancel-> setDefault ( true );
 	cancel-> setSizePolicy ( QSizePolicy ( QSizePolicy::Minimum, QSizePolicy::Expanding, cancel-> sizePolicy ( ). hasHeightForWidth ( ) ) );
 	vbox-> addWidget ( cancel );
 
 	m_timer = new QTimer ( this );
 	connect ( m_timer, SIGNAL( timeout ( ) ), this, SLOT( timeout ( ) ) );
 
 	connect ( btngrp, SIGNAL( clicked ( int ) ), this, SLOT( buttonClicked ( int ) ) );
 	connect ( cancel, SIGNAL( clicked ( ) ), this, SLOT( cancelClicked ( ) ) );
 
 	m_progress-> hide ( );
 	Global::hideInputMethod ( );
 }
 
 void ShutdownImpl::buttonClicked ( int b )
 {
 	m_counter = 0;
 
 	switch ( b ) {
 		case 1:
 			m_operation = ShutdownSystem;
 			break;
 		case 2:
 			m_operation = RebootSystem;
 			break;
 		case 3:
 			m_operation = RestartDesktop;
 			break;
 		case 4:
 			m_operation = TerminateDesktop;
 			break;
 	}
 	m_info-> hide ( );
 	m_progress-> show ( );
 	m_timer-> start ( 300 );
 	timeout ( );
 }
 
 void ShutdownImpl::cancelClicked ( )
 {
 	m_progress-> hide ( );
 	m_info-> show ( );
 	if ( m_timer-> isActive ( ) )
 		m_timer-> stop ( );
 	else
 		close ( );
 }
 
 void ShutdownImpl::timeout ( )
 {
 	if ( ( m_counter += 2 ) > m_progress-> totalSteps ( ) ) {
 		m_progress-> hide ( );
 		m_timer-> stop ( );
 		emit shutdown ( m_operation );
 	}
 	else
 		m_progress-> setProgress ( m_counter );
 }
 
 void ShutdownImpl::hide ( )
 {
 	if ( isVisible ( )) {
 		// hack - shutdown is a launcher dialog, but treated like a standalone app
 		QCopEnvelope e( "QPE/System", "closing(QString)" );
 		e << QString ( "shutdown" );
 	
 	}
 	QWidget::hide ( );
 }
 
diff --git a/core/launcher/stabmon.cpp b/core/launcher/stabmon.cpp
index 4e5f290..f2d694b 100644
--- a/core/launcher/stabmon.cpp
+++ b/core/launcher/stabmon.cpp
@@ -1,102 +1,101 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 
 #include "stabmon.h"
 
 #ifdef QWS
 #include <qtopia/qcopenvelope_qws.h>
 #endif
 
 #include <qfile.h>
-#include <qcstring.h>
 
 #include <sys/stat.h>
 #if defined(Q_OS_LINUX) || defined(_OS_LINUX_)
 #include <unistd.h>
 #endif
 #include <stdlib.h>
 
 SysFileMonitor::SysFileMonitor(QObject* parent) :
     QObject(parent)
 {
     startTimer(2000);
 }
 
 const char * stab0 = "/var/run/stab";
 const char * stab1 = "/var/state/pcmcia/stab";
 const char * stab2 = "/var/lib/pcmcia/stab";
 
 void SysFileMonitor::timerEvent(QTimerEvent*)
 {
     struct stat s;
 
     static const char * tab [] = {
 	stab0,
 	stab1,
 	stab2
     };
     static const int nstab = sizeof(tab)/sizeof(const char *);
     static int last[nstab];
 
     bool ch = FALSE;
     for ( int i=0; i<nstab; i++ ) {
 	if ( ::stat(tab[i], &s)==0 && (long)s.st_mtime != last[i] ) {
 	    last[i] = (long)s.st_mtime;
 	    ch=TRUE;
 	}
 	if ( ch ) {
 #ifndef QT_NO_COP
 	    QCopEnvelope("QPE/Card", "stabChanged()" );
 #endif
 	    break;
 	}
     }
 
     // st_size is no use, it's 0 for /proc/mounts too. Read it all.
     static int mtabSize = 0;
     QFile f( "/proc/mounts" );
     if ( f.open(IO_ReadOnly) ) {
 #if 0
 	// readAll does not work correctly on sequential devices (as eg. /proc files)
 	QByteArray ba = f.readAll();
 	if ( (int)ba.size() != mtabSize ) {
 	    mtabSize = (int)ba.size();
 #ifndef QT_NO_COP
 	    QCopEnvelope("QPE/Card", "mtabChanged()" );
 #endif
 	}
 #else
 	QString s;
 	while( !f.atEnd() ) {
 	    QString tmp;
 	    f.readLine( tmp, 1024 );
 	    s += tmp;
 	}
 	if ( (int)s.length() != mtabSize ) {
 	    mtabSize = (int)s.length();
 #ifndef QT_NO_COP
 	    QCopEnvelope("QPE/Card", "mtabChanged()" );
 #endif
 	}
 #endif
     }
 }
 
diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp
index c199063..f3a7651 100644
--- a/core/launcher/startmenu.cpp
+++ b/core/launcher/startmenu.cpp
@@ -1,394 +1,390 @@
 /**********************************************************************

 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.

 **

 ** This file is part of the Qtopia Environment.

 **

 ** This file may be distributed and/or modified under the terms of the

 ** GNU General Public License version 2 as published by the Free Software

 ** Foundation and appearing in the file LICENSE.GPL included in the

 ** packaging of this file.

 **

 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE

 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

 **

 ** See http://www.trolltech.com/gpl/ for GPL licensing information.

 **

 ** Contact info@trolltech.com if any conditions of this licensing are

 ** not clear to you.

 **

 **********************************************************************/

 

 // TODO. During startup

 // Launcher::typeAdded

 // is called for each new tab and calls then each time the refresh of startmenu

 // suboptimal

 

 #define INCLUDE_MENUITEM_DEF

 

 #include "startmenu.h"

 

 #include <qtopia/qpeapplication.h>

 #include <qtopia/config.h>

-#include <qtopia/applnk.h>

-#include <qtopia/global.h>

 #include <qtopia/resource.h>

 #include <qtopia/mimetype.h>

 #include <qtopia/qlibrary.h>

 

-#include <qdict.h>

-#include <qdir.h>

 //#include <qpainter.h>

 

 //#include <stdlib.h>

 

 

 #define APPLNK_ID_OFFSET 250

 #define NO_ID -1

 

 

 void StartPopupMenu::keyPressEvent( QKeyEvent *e )

 {

     if ( e->key() == Key_F33 || e->key() == Key_Space ) {

     	// "OK" button, little hacky

 	    QKeyEvent ke(QEvent::KeyPress, Key_Enter, 13, 0);

 	    QPopupMenu::keyPressEvent( &ke );

     } else {

 	    QPopupMenu::keyPressEvent( e );

     }

 }

 

 //---------------------------------------------------------------------------

 

 StartMenu::StartMenu(QWidget *parent) : QLabel( parent )

 {

     startButtonPixmap = "go"; // No tr

 

     int sz = AppLnk::smallIconSize()+3;

     QPixmap pm;

     pm.convertFromImage(Resource::loadImage( startButtonPixmap).smoothScale( sz,sz) );

     setPixmap(pm);

     setFocusPolicy( NoFocus );

 

     useWidePopupMenu = true;

     launchMenu = 0;

     refreshMenu();

 }

 

 

 void StartMenu::mousePressEvent( QMouseEvent * )

 {

     launch();

 }

 

 

 StartMenu::~StartMenu()

 {

     clearApplets();

 }

 

 void StartMenu::createMenu()

 {

     clearApplets();

     delete launchMenu;

 

     launchMenu = new StartPopupMenu( this );

     loadMenu( launchMenu );

     loadApplets();

 

     bool result = currentItem || menuApplets.count();

     if ( result )

 	    connect( launchMenu, SIGNAL(activated(int)), SLOT(itemSelected(int)) );

 }

 

 void StartMenu::refreshMenu()

 {

     Config cfg( "StartMenu" );

     cfg.setGroup( "Menu" );

     bool ltabs = cfg.readBoolEntry( "LauncherTabs", TRUE );

     bool lot = cfg.readBoolEntry( "LauncherOther", TRUE );

     useWidePopupMenu = cfg.readBoolEntry(  "LauncherSubPopup",  TRUE );

 

     if ( launchMenu && !(ltabs || lot) ) return; // nothing to do

 

 	createMenu();

 }

 

 void StartMenu::itemSelected( int id )

 {

     if ( id == NO_ID ) return;

 

     if ( id < 0 ) {

         MenuApplet *applet = menuApplets.find( id );

         if ( applet ) {

             applet->iface->activated();

         }

     } else if ( id >= APPLNK_ID_OFFSET ) {

     	AppLnk * appLnk = appLnks.find( id );

         if ( appLnk ) {

 		    appLnk->execute();

         }

     } else {

     	QString *tabName = tabNames.find( id );

         if ( tabName ) {

     		emit tabSelected( *tabName );

 	    }

     }

 }

 

 void StartMenu::createAppEntry( QPopupMenu *menu, QDir dir, QString file )

 {

     if ( file.right(8) == ".desktop" ) {

    		AppLnk* applnk = new AppLnk( dir.path() + "/" + file );

     	if ( !applnk->isValid() ) {

             delete applnk;

             return;

         }

 

 	    if ( applnk->type() == "Separator" ) { // No tr

 		    menu->insertSeparator();

     		delete applnk;

        	} else {

                 QPixmap test;

                 QImage img = Resource::loadImage( applnk->icon() );

                 if(!img.isNull() )

                     test.convertFromImage(

                            img.smoothScale(

                             AppLnk::smallIconSize(), AppLnk::smallIconSize() ), 0 );

 

                 menu->insertItem( test, applnk->name(),

                               currentItem + APPLNK_ID_OFFSET );

             appLnks.insert( currentItem + APPLNK_ID_OFFSET, applnk );

             currentItem++;

    		}

     }

 

 }

 

 void StartMenu::createDirEntry( QPopupMenu *menu, QDir dir, QString file, bool lot )

 {

     // do some sanity checks and collect information

 

     if ( file == "." || file == ".." ) return;

 

     Config cfg( dir.path() + "/" + file + "/.directory", Config::File );

     if ( !cfg.isValid() ) return;

 

    	QString name = cfg.readEntry( "Name" );

     QString icon = cfg.readEntry( "Icon" );

 	if ( !name || !icon ) return;

 

     QDir subdir = QDir( dir );

     subdir.cd( file );

     subdir.setFilter( QDir::Files );

     subdir.setNameFilter( "*.desktop" );

     // we don' t show the menu if there are no entries

     // perhaps one should check if there exist subsubdirs with entries...

     if ( subdir.entryList().isEmpty() ) return;

 

     // checks were ok

 

     QPixmap test;

     test.convertFromImage( Resource::loadImage( icon ).smoothScale(

         AppLnk::smallIconSize(), AppLnk::smallIconSize() ), 0 );

 

 	if ( useWidePopupMenu ) {

         // generate submenu

         QPopupMenu *submenu = new QPopupMenu( menu );

         connect( submenu,  SIGNAL(activated(int)), SLOT(itemSelected(int)) );

         menu->insertItem( test, name, submenu, NO_ID );

 

         // ltabs is true cause else we wouldn't stuck around..

         createMenuEntries( submenu, subdir, true, lot );

     } else {

         // no submenus - just bring corresponding tab to front

         menu->insertItem( test, name, currentItem );

         tabNames.insert( currentItem, new QString( file ) );

         currentItem++;

     }

 }

 

 void StartMenu::createMenuEntries( QPopupMenu *menu, QDir dir, bool ltabs, bool lot )

 {

     if ( lot ) {

         dir.setFilter( QDir::Files );

         dir.setNameFilter( "*.desktop" );

         QStringList files = dir.entryList();

         files.sort();

 

         for ( QStringList::Iterator it = files.begin(); it != files.end(); it++ ) {

             createAppEntry( menu, dir, *it );

         }

     }

     if ( ltabs ) {

         dir.setNameFilter( "*" );

         dir.setFilter( QDir::Dirs );

         QStringList dirs = dir.entryList();

         dirs.sort();

 

         for ( QStringList::Iterator it = dirs.begin(); it != dirs.end(); it++ ) {

             createDirEntry( menu, dir, *it, lot );

     	}

     }

 }

 

 bool StartMenu::loadMenu( QPopupMenu *menu )

 {

     Config cfg("StartMenu");

     cfg.setGroup("Menu");

 

     bool ltabs = cfg.readBoolEntry("LauncherTabs", TRUE);

     bool lot = cfg.readBoolEntry("LauncherOther", TRUE);

     useWidePopupMenu = cfg.readBoolEntry(  "LauncherSubPopup",  TRUE );

     bool sepfirst = !ltabs && !lot;

 

     currentItem = 0;

 	launchMenu->clear();

 

     appLnks.setAutoDelete( true );

     tabNames.setAutoDelete( true );

     appLnks.clear();

     tabNames.clear();

     appLnks.setAutoDelete( false );

     tabNames.setAutoDelete( false );

 

     QDir dir( MimeType::appsFolderName(), QString::null, QDir::Name );

     createMenuEntries( menu, dir, ltabs, lot );

 

    	if ( !menu->count() ) sepfirst = TRUE;

 

     launchMenu->setName( sepfirst ? "accessories" : "accessories_need_sep" ); // No tr

 

     return currentItem;

 }

 

 

 void StartMenu::launch()

 {

     int y = mapToGlobal( QPoint() ).y() - launchMenu->sizeHint().height();

 

     if ( launchMenu->isVisible() )

         launchMenu->hide();

     else

         launchMenu->popup( QPoint( 1, y ) );

 }

 

 

 

 

 static int compareAppletPositions(const void *b, const void *a)

 {

     const MenuApplet* aa = *(const MenuApplet**)a;

     const MenuApplet* ab = *(const MenuApplet**)b;

     int d = aa->iface->position() - ab->iface->position();

     if ( d ) return d;

     return QString::compare(aa->library->library(),ab->library->library());

 }

 

 void StartMenu::clearApplets()

 {

     if ( launchMenu )

         launchMenu-> hide();

 

     for ( QIntDictIterator<MenuApplet> it( menuApplets ); it.current(); ++it ) {

     	MenuApplet *applet = it.current();

     	if ( launchMenu ) {

     		launchMenu->removeItem( applet-> id );

     		delete applet->popup;

     	}

 

         applet->iface->release();

         applet->library->unload();

         delete applet-> library;

     }

     menuApplets.clear();

 }

 

 

 

 

 void StartMenu::loadApplets()

 {

     Config cfg( "StartMenu" );

     cfg.setGroup( "Applets" );

 

     // SafeMode causes too much problems, so we disable it for now --

     // maybe we should reenable it for OPIE 1.0 - sandman 26.09.02

     // removed in the remerge PluginManager could handle it

     // we don't currently use it -zecke

 

     QStringList exclude = cfg.readListEntry( "ExcludeApplets", ',' );

 

     QString lang = getenv( "LANG" );

     QString path = QPEApplication::qpeDir() + "/plugins/applets";

     QDir dir( path, "lib*.so" );

     QStringList list = dir.entryList();

     QStringList::Iterator it;

     int napplets = 0;

     MenuApplet* *xapplets = new MenuApplet*[list.count()];

     for ( it = list.begin(); it != list.end(); ++it ) {

         if ( exclude.find( *it ) != exclude.end() )

             continue;

         MenuAppletInterface *iface = 0;

         QLibrary *lib = new QLibrary( path + "/" + *it );

         if (( lib->queryInterface( IID_MenuApplet, (QUnknownInterface**)&iface ) == QS_OK ) && iface ) {

             MenuApplet *applet = new MenuApplet;

             xapplets[napplets++] = applet;

             applet->library = lib;

             applet->iface = iface;

 

             QTranslator *trans = new QTranslator(qApp);

             QString type = (*it).left( (*it).find(".") );

             QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm";

             if ( trans->load( tfn ))

                 qApp->installTranslator( trans );

             else

                 delete trans;

         } else {

             exclude += *it;

             delete lib;

         }

     }

     cfg.writeEntry( "ExcludeApplets", exclude, ',' );

     qsort(xapplets, napplets, sizeof(menuApplets[0]), compareAppletPositions);

 

 

     while ( napplets-- ) {

         MenuApplet *applet = xapplets[napplets];

         applet->popup = applet->iface->popup( this );

 

         // menuApplets got an id < -1

         menuApplets.insert( -( currentItem + 2 ), new MenuApplet( *applet ) );

         currentItem++;

     }

     delete [] xapplets;

 

     addApplets( launchMenu );

 }

 

 

 /*

  * Launcher calls loadMenu too often fix that

  */

 void StartMenu::addApplets(QPopupMenu* pop) {

     QIntDict<MenuApplet> dict;

     if( pop-> count ( ))

         pop-> insertSeparator ( );

 

     for ( QIntDictIterator<MenuApplet> it( menuApplets ); it.current(); ++it ) {

     	MenuApplet *applet = it.current();

         if ( applet->popup )

             applet->id = pop->insertItem( applet->iface->icon(),

                                           applet->iface->text(), applet->popup );

         else

             applet->id = pop->insertItem( applet->iface->icon(),

                                           applet->iface->text() );

 

 

         dict.insert( applet->id, new MenuApplet( *applet ) );

     }

     /* need to update the key */

     menuApplets.setAutoDelete( true );

     menuApplets.clear();

     menuApplets.setAutoDelete( false );

     menuApplets = dict;

 }

diff --git a/core/launcher/syncdialog.cpp b/core/launcher/syncdialog.cpp
index 6f6c781..4a2b8ff 100644
--- a/core/launcher/syncdialog.cpp
+++ b/core/launcher/syncdialog.cpp
@@ -1,184 +1,183 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "syncdialog.h"
 
 #include <qtopia/resource.h>
 
-#include <qimage.h>
 #include <qpainter.h>
 #include <qapplication.h>
 #include <qpushbutton.h>
 #include <qfile.h>
 
 
 SyncDialog::SyncDialog( QWidget *parent, const QString &w )
     : QDialog( parent, "SyncDialog", FALSE, WStyle_Tool | WStyle_Customize |
 	WStyle_StaysOnTop ), what(w), nextPt(0), rev(FALSE), hideDot(TRUE)
 {
     QFont f( font() );
     f.setPointSize( 16 );
     setFont(f);
 
     loadPath();
 
     QSize ds = qApp->desktop()->size();
     setGeometry( 0, 0, ds.width(), ds.height() );
     img = Resource::loadImage( "SyncScreen" );
     if ( img.width() > ds.width() || img.height() > ds.height() ) {
 	path = scalePath( path, ds.width(), img.width(), ds.height(), img.height() );
 	img = img.smoothScale( ds.width(), ds.height() );
     }
     dot = Resource::loadImage( "syncdot" );
     setBackgroundColor( white );
 
     QPushButton *pb = new QPushButton( tr("Abort"), this, "CancelSync" );
     QSize bs = pb->sizeHint();
     bs.rwidth() += 10;
     bs.rheight() += 5;
     pb->setGeometry( (ds.width()-bs.width())/2, 4*ds.height()/5,
 			bs.width(), bs.height() );
     connect( pb, SIGNAL(clicked()), this, SIGNAL(cancel()) );
 
     if ( path.count() >= 2 ) {
 	path = generatePath( path, 8 );
 	startTimer( 200 );
     }
 }
 
 void SyncDialog::paintEvent( QPaintEvent *pe )
 {
     QPainter p(this );
     p.setClipRect( pe->rect() );
     int ox = (width() - img.width())/2;
     int oy = (height() - img.height())/2;
 
     QRect ir = QRect(ox, oy, img.width(), img.height()) & pe->rect();
 
     if ( ir.isValid() )
 	p.drawImage( ir.x(), ir.y(), img, ir.x()-ox, ir.y()-oy, ir.width(), ir.height() );
 
     QString syncMsg = tr("Syncing:");
     p.setPen( black );
     QRect r( 0, 0, width()/2-5, QMAX(oy,80) );
     p.drawText( r, AlignRight | AlignVCenter, syncMsg );
     r.moveBy( width()/2, 0 );
     QFont f( font() );
     f.setWeight( QFont::Bold );
     p.setFont( f );
     p.drawText( r, AlignLeft | AlignVCenter, what );
 
     if ( !hideDot )
 	p.drawImage( ox+path[nextPt].x()-dot.width()/2, oy+path[nextPt].y()-dot.height()/2, dot );
 }
 
 void SyncDialog::timerEvent( QTimerEvent * )
 {
     int ox = (width() - img.width())/2;
     int oy = (height() - img.height())/2;
     int oldPt = nextPt;
 
     if ( !rev ) {
 	nextPt++;
 	if ( nextPt == (int)path.count() ) {
 	    nextPt -= 2;
 	    rev = TRUE;
 	}
     } else {
 	nextPt--;
 	if ( nextPt < 0 ) {
 	    nextPt = 1;
 	    rev = FALSE;
 	}
     }
 
     hideDot = FALSE;
     repaint( ox+path[nextPt].x()-dot.width()/2, oy+path[nextPt].y()-dot.height()/2,
 	    dot.width(), dot.height() );
     hideDot = TRUE;
     repaint( ox+path[oldPt].x()-dot.width()/2, oy+path[oldPt].y()-dot.height()/2,
 	    dot.width(), dot.height() );
 }
 
 void SyncDialog::loadPath()
 {
     QString pfile = Resource::findPixmap( "syncdot" );
     if ( pfile.isEmpty() )
 	return;
     int dp = pfile.findRev('.');
     pfile.replace( dp, pfile.length()-dp, ".path" );
 
     int count = 0;
     QFile file( pfile );
     if ( file.open( IO_ReadOnly ) ) {
 	QString line;
 	while ( file.readLine( line, 256 ) > 0 ) {
 	    int x, y;
 	    if ( sscanf( line.latin1(), "%d %d", &x, &y ) == 2 ) {
 		path.resize( count+1 );
 		path[count++] = QPoint(x, y);
 	    }
 	}
     }
 }
 
 QPointArray SyncDialog::scalePath( const QPointArray &pa, int xn, int xd, int yn, int yd )
 {
     QPointArray sa( pa.size() );
 
     for ( unsigned i = 0; i < pa.count(); i++ ) {
 	int x = xn * pa[int(i)].x() / xd;
 	int y = yn * pa[int(i)].y() / yd;
 	sa[int(i)] = QPoint( x, y );
     }
 
     return sa;
 }
 
 QPointArray SyncDialog::generatePath( const QPointArray &pa, int dist )
 {
     if ( pa.count() < 2 )
 	return pa;
 
     QPointArray fa;
     int count = 0;
     fa.resize( count+1 );
     fa[count++] = pa[0];
     for ( unsigned i = 0; i < pa.count()-1; i++ ) {
 	int x1 = pa[int(i)].x();
 	int y1 = pa[int(i)].y();
 	int x2 = pa[int(i+1)].x();
 	int y2 = pa[int(i+1)].y();
 	int dx = x2 - x1;
 	int dy = y2 - y1;
 	int pts = (QMAX(QABS(dx),QABS(dy)) + dist/2 )/dist;
 	for ( int j = 1; j < pts; j++ ) {
 	    int x = j * dx / pts;
 	    int y = j * dy / pts;
 	    fa.resize( count+1 );
 	    fa[count++] = pa[int(i)] + QPoint( x, y );
 	}
 	fa.resize( count+1 );
 	fa[count++] = pa[int(i+1)];
     }
 
     return fa;
 }
 
diff --git a/core/launcher/systray.cpp b/core/launcher/systray.cpp
index 691f6b8..6cc1446 100644
--- a/core/launcher/systray.cpp
+++ b/core/launcher/systray.cpp
@@ -1,154 +1,152 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include <qtopia/qpeapplication.h>
 #include <qtopia/qlibrary.h>
 #include <qtopia/config.h>
 
 #include <qlayout.h>
 #include <qdir.h>
-#include <qmessagebox.h>
-#include <qtranslator.h>
 
 #include "systray.h"
 
 #include <stdlib.h>
 
 /* ### Single build floppies ### */
 #if 0
 #ifdef QT_NO_COMPONENTS
 #include "../plugins/applets/clockapplet/clockappletimpl.h"
 #endif
 #endif
 
 SysTray::SysTray( QWidget *parent ) : QFrame( parent ), layout(0)
 {
     //setFrameStyle( QFrame::Panel | QFrame::Sunken );
     loadApplets();
 }
 
 SysTray::~SysTray()
 {
     clearApplets();
 }
 
 static int compareAppletPositions(const void *a, const void *b)
 {
     const TaskbarApplet* aa = *(const TaskbarApplet**)a;
     const TaskbarApplet* ab = *(const TaskbarApplet**)b;
     int d = ab->iface->position() - aa->iface->position();
     if ( d ) return d;
     return QString::compare(ab->name,aa->name);
 }
 
 void SysTray::loadApplets()
 {
     hide();
     clearApplets();
     addApplets();
 }
 
 void SysTray::clearApplets()
 {
 #ifndef QT_NO_COMPONENTS
 
     /*
      * Note on clearing. SOme applets delete their
      * applets themselves some don't do it
      * and on restart this can crash. If we delete it
      * here we might end up in a double deletion. We could
      * use QGuardedPtr but that would be one QOBject
      * for every applet more but only useful for restart
      */
     QValueList<TaskbarApplet>::Iterator mit;
     for ( mit = appletList.begin(); mit != appletList.end(); ++mit ) {
         (*mit).iface->release();
 	(*mit).library->unload();
 	delete (*mit).library;
     }
 
 #endif
     appletList.clear();
     if ( layout )
 	delete layout;
     layout = new QHBoxLayout( this, 0, 1 );
     layout->setAutoAdd(TRUE);
 }
 
 void SysTray::addApplets()
 {
     hide();
 #ifndef QT_NO_COMPONENTS
     Config cfg( "Taskbar" );
     cfg.setGroup( "Applets" );
     QStringList exclude = cfg.readListEntry( "ExcludeApplets", ',' );
 
     QString lang = getenv( "LANG" );
     QString path = QPEApplication::qpeDir() + "/plugins/applets";
 #ifdef Q_OS_MACX
     QDir dir( path, "lib*.dylib" );
 #else
     QDir dir( path, "lib*.so" );
 #endif /* Q_OS_MACX */
     QStringList list = dir.entryList();
     QStringList::Iterator it;
     int napplets=0;
     TaskbarApplet* *applets = new TaskbarApplet*[list.count()];
     for ( it = list.begin(); it != list.end(); ++it ) {
 	if ( exclude.find( *it ) != exclude.end() )
 	    continue;
 	qWarning( "Found Applet: %s", (*it).latin1() );
 	TaskbarAppletInterface *iface = 0;
 	QLibrary *lib = new QLibrary( path + "/" + *it );
 	if (( lib->queryInterface( IID_TaskbarApplet, (QUnknownInterface**)&iface ) == QS_OK ) && iface ) {
 	    TaskbarApplet *applet = new TaskbarApplet;
 	    applets[napplets++] = applet;
 	    applet->library = lib;
 	    applet->iface = iface;
 
 	    QTranslator *trans = new QTranslator(qApp);
 	    QString type = (*it).left( (*it).find(".") );
 	    QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm";
 	    if ( trans->load( tfn ))
 		qApp->installTranslator( trans );
 	    else
 		delete trans;
 	} else {
 	    exclude += *it;
 	    delete lib;
 	}
     }
     cfg.writeEntry( "ExcludeApplets", exclude, ',' );
     qsort(applets,napplets,sizeof(applets[0]),compareAppletPositions);
     while (napplets--) {
 	TaskbarApplet *applet = applets[napplets];
 	applet->applet = applet->iface->applet( this );
 	appletList.append(*applet);
     }
     delete [] applets;
 #else /* ## FIXME single app */
     TaskbarApplet * const applet = new TaskbarApplet();
     applet->iface = new ClockAppletImpl();
     applet->applet = applet->iface->applet( this );
     appletList.append( applet );
 #endif
     show();
 }
 
diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp
index 8367a62..b998e95 100644
--- a/core/launcher/transferserver.cpp
+++ b/core/launcher/transferserver.cpp
@@ -1,1084 +1,1074 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 //#define _XOPEN_SOURCE
 
 #include <opie2/oglobal.h>
-#include <qtopia/qpeapplication.h>
 
 #ifndef Q_OS_WIN32
 #include <pwd.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <time.h>
 
 #ifndef Q_OS_MACX
 #include <shadow.h>
 #include <crypt.h>
 #endif /* Q_OS_MACX */
 
 #else
 #include <stdlib.h>
 #include <time.h>
 #endif
 
 
 #if defined(_OS_LINUX_)
 #include <shadow.h>
 #endif
 
-#include <qdir.h>
-#include <qfile.h>
 #include <qtextstream.h>
-#include <qdatastream.h>
 #include <qmessagebox.h>
-#include <qstringlist.h>
-#include <qfileinfo.h>
-#include <qregexp.h>
 //#include <qtopia/qcopchannel_qws.h>
 #include <qtopia/process.h>
-#include <qtopia/global.h>
-#include <qtopia/config.h>
 #include <qtopia/private/contact.h>
-#include <qtopia/quuid.h>
 #include <qtopia/version.h>
 #ifdef Q_WS_QWS
 #include <qtopia/qcopenvelope_qws.h>
 #endif
 
 
 #include "transferserver.h"
 #include <qtopia/qprocess.h>
 
 const int block_size = 51200;
 
 TransferServer::TransferServer( Q_UINT16 port, QObject *parent,
         const char* name)
     : QServerSocket( port, 1, parent, name )
 {
     connections.setAutoDelete( TRUE );
     if ( !ok() )
 	qWarning( "Failed to bind to port %d", port );
 }
 
 void TransferServer::authorizeConnections()
 {
     QListIterator<ServerPI> it(connections);
     while ( it.current() ) {
 	if ( !it.current()->verifyAuthorised() ) {
 	    disconnect( it.current(), SIGNAL(connectionClosed(ServerPI *)), this, SLOT( closed(ServerPI *)) );
 	    connections.removeRef( it.current() );
 	} else
 	    ++it;
     }
 }
 
 void TransferServer::closed(ServerPI *item)
 {
     connections.removeRef(item);
 }
 
 TransferServer::~TransferServer()
 {
 }
 
 void TransferServer::newConnection( int socket )
 {
     ServerPI *ptr = new ServerPI( socket, this );
     connect( ptr, SIGNAL(connectionClosed(ServerPI *)), this, SLOT( closed(ServerPI *)) );
     connections.append( ptr );
 }
 
 QString SyncAuthentication::serverId()
 {
     Config cfg("Security");
     cfg.setGroup("Sync");
     QString r = cfg.readEntry("serverid");
 
     if ( r.isEmpty() ) {
         r = OGlobal::generateUuid();
         cfg.writeEntry("serverid", r );
     }
    return r;
 }
 
 QString SyncAuthentication::ownerName()
 {
     QString vfilename = Global::applicationFileName("addressbook",
                 "businesscard.vcf");
     if (QFile::exists(vfilename)) {
 	Contact c;
 	c = Contact::readVCard( vfilename )[0];
 	return c.fullName();
     }
 
     return QString::null;
 }
 
 QString SyncAuthentication::loginName()
 {
     struct passwd *pw = 0L;
 #ifndef Q_OS_WIN32
     pw = getpwuid( geteuid() );
     return QString::fromLocal8Bit( pw->pw_name );
 #else
     //### revise
     return QString();
 #endif
 }
 
 int SyncAuthentication::isAuthorized(QHostAddress peeraddress)
 {
     Config cfg("Security");
 	cfg.setGroup("Sync");
 	//    QString allowedstr = cfg.readEntry("auth_peer","192.168.1.0");
 	uint auth_peer = cfg.readNumEntry("auth_peer", 0xc0a80100);
 
 	//    QHostAddress allowed;
 	//    allowed.setAddress(allowedstr);
 	//    uint auth_peer = allowed.ip4Addr();
 	uint auth_peer_bits = cfg.readNumEntry("auth_peer_bits", 24);
 	uint mask = auth_peer_bits >= 32 // shifting by 32 is not defined
 	            ? 0xffffffff : (((1 << auth_peer_bits) - 1) << (32 - auth_peer_bits));
 
 	return (peeraddress.ip4Addr() & mask) == auth_peer;
 }
 
 bool SyncAuthentication::checkUser( const QString& user )
 {
     if ( user.isEmpty() ) return FALSE;
     QString euser = loginName();
     return user == euser;
 }
 
 bool SyncAuthentication::checkPassword( const QString& password )
 {
 #ifdef ALLOW_UNIX_USER_FTP
     // First, check system password...
 
     struct passwd *pw = 0;
     struct spwd *spw = 0;
 
     pw = getpwuid( geteuid() );
     spw = getspnam( pw->pw_name );
 
     QString cpwd = QString::fromLocal8Bit( pw->pw_passwd );
     if ( cpwd == "x" && spw )
 	cpwd = QString::fromLocal8Bit( spw->sp_pwdp );
 
     // Note: some systems use more than crypt for passwords.
     QString cpassword = QString::fromLocal8Bit( crypt( password.local8Bit(), cpwd.local8Bit() ) );
     if ( cpwd == cpassword )
 	return TRUE;
 #endif
 
     static int lastdenial=0;
     static int denials=0;
     int now = time(0);
 
     Config cfg("Security");
     cfg.setGroup("SyncMode");
     int mode = cfg.readNumEntry("Mode", 0x02 );
 
     //No pass word needed if the user really needs it
     if (mode & 0x04) {
         QMessageBox unauth(
             tr("Sync Connection"),
             tr("<qt><p>An unauthorized system is requesting access to this device."
                "<p>You chose IntelliSync so you may I allow or deny this connection.</qt>" ),
             QMessageBox::Warning,
             QMessageBox::Ok, QMessageBox::Cancel|QMessageBox::Default, QMessageBox::NoButton,
             0, QString::null, TRUE, WStyle_StaysOnTop);
         unauth.setButtonText(QMessageBox::Ok, tr("Allow" ) );
         unauth.setButtonText(QMessageBox::Cancel, tr("Deny"));
         switch( unauth.exec() ) {
         case QMessageBox::Ok:
             return TRUE;
             break;
         case QMessageBox::Cancel:
         default:
             denials++;
             lastdenial=now;
             return FALSE;
         }
     }
 
     // Detect old Qtopia Desktop (no password) and fail
     if ( password.isEmpty() ) {
 		if ( denials < 3 || now > lastdenial+600 ) {
 		    QMessageBox unauth(
 			tr("Sync Connection"),
 			tr("<p>An unauthorized system is requesting access to this device."
 			    "<p>If you are using a version of Qtopia Desktop older than 1.5.1, "
 			    "please upgrade or change the security setting to use IntelliSync." ),
 			QMessageBox::Warning,
 			QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton,
 			0, QString::null, TRUE, WStyle_StaysOnTop);
 		    unauth.setButtonText(QMessageBox::Cancel, tr("Deny"));
 		    unauth.exec();
 
 		    denials++;
 		    lastdenial=now;
 		 }
 		return FALSE;
 
     }
 
     // Second, check sync password...
 
     static int lock=0;
     if ( lock ) return FALSE;
 
     ++lock;
 
     /*
      *  we need to support old Sync software and QtopiaDesktop
      */
     if ( password.left(6) == "Qtopia" || password.left(6) == "rootme" ) {
 	Config cfg( "Security" );
 	cfg.setGroup("Sync");
 	QStringList pwds = cfg.readListEntry("Passwords",' ');
 	for (QStringList::ConstIterator it=pwds.begin(); it!=pwds.end(); ++it) {
 #ifndef Q_OS_WIN32
 	    QString cpassword = QString::fromLocal8Bit(
 		crypt( password.mid(8).local8Bit(), (*it).left(2).latin1() ) );
 #else
 	    // ### revise
 	    QString cpassword("");
 #endif
 	    if ( *it == cpassword ) {
 		lock--;
 		return TRUE;
 	    }
 	}
 
 	// Unrecognized system. Be careful...
 	QMessageBox unrecbox(
 	    tr("Sync Connection"),
 	    tr(	"<p>An unrecognized system is requesting access to this device."
 		"<p>If you have just initiated a Sync for the first time, this is normal."),
 		QMessageBox::Warning,
 		QMessageBox::Cancel, QMessageBox::Yes, QMessageBox::NoButton,
 		0, QString::null, TRUE, WStyle_StaysOnTop);
 	unrecbox.setButtonText(QMessageBox::Cancel, tr("Deny"));
 	unrecbox.setButtonText(QMessageBox::Yes, tr("Allow"));
 
 	if ( (denials > 2 && now < lastdenial+600)
 	    || unrecbox.exec() != QMessageBox::Yes)
 	{
 	    denials++;
 	    lastdenial=now;
 	    lock--;
 	    return FALSE;
 	} else {
 	    const char salty[]="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789/.";
 	    char salt[2];
 	    salt[0]= salty[rand() % (sizeof(salty)-1)];
 	    salt[1]= salty[rand() % (sizeof(salty)-1)];
 #ifndef Q_OS_WIN32
 	    QString cpassword = QString::fromLocal8Bit(
 		crypt( password.mid(8).local8Bit(), salt ) );
 #else
 	    //### revise
 	    QString cpassword("");
 #endif
 	    denials=0;
 	    pwds.prepend(cpassword);
 	    cfg.writeEntry("Passwords",pwds,' ');
 	    lock--;
 	    return TRUE;
 	}
     }
     lock--;
 
     return FALSE;
 }
 
 
 ServerPI::ServerPI( int socket, QObject *parent, const char* name )
     : QSocket( parent, name ) , dtp( 0 ), serversocket( 0 ), waitsocket( 0 ),
       storFileSize(-1)
 {
     state = Connected;
 
     setSocket( socket );
 
     peerport = peerPort();
     peeraddress = peerAddress();
 
 #ifndef INSECURE
     if ( !SyncAuthentication::isAuthorized(peeraddress) ) {
 	state = Forbidden;
 	startTimer( 0 );
     } else
 #endif
     {
 	connect( this, SIGNAL( readyRead() ), SLOT( read() ) );
 	connect( this, SIGNAL( connectionClosed() ), SLOT( connectionClosed() ) );
 
 	passiv = FALSE;
 	for( int i = 0; i < 4; i++ )
 	    wait[i] = FALSE;
 
 	send( "220 Qtopia " QPE_VERSION " FTP Server" ); // No tr
 	state = Wait_USER;
 
 	dtp = new ServerDTP( this );
 	connect( dtp, SIGNAL( completed() ), SLOT( dtpCompleted() ) );
 	connect( dtp, SIGNAL( failed() ), SLOT( dtpFailed() ) );
 	connect( dtp, SIGNAL( error( int ) ), SLOT( dtpError( int ) ) );
 
 
 	directory = QDir::currentDirPath();
 
 	static int p = 1024;
 
 	while ( !serversocket || !serversocket->ok() ) {
 	    delete serversocket;
 	    serversocket = new ServerSocket( ++p, this );
 	}
 	connect( serversocket, SIGNAL( newIncomming( int ) ),
 		 SLOT( newConnection( int ) ) );
     }
 }
 
 ServerPI::~ServerPI()
 {
     close();
 
     if ( dtp )
         dtp->close();
     delete dtp;
     delete serversocket;
 }
 
 bool ServerPI::verifyAuthorised()
 {
     if ( !SyncAuthentication::isAuthorized(peerAddress()) ) {
 	state = Forbidden;
 	return FALSE;
     }
     return TRUE;
 }
 
 void ServerPI::connectionClosed()
 {
     // qDebug( "Debug: Connection closed" );
     emit connectionClosed(this);
 }
 
 void ServerPI::send( const QString& msg )
 {
     QTextStream os( this );
     os << msg << endl;
     //qDebug( "Reply: %s", msg.latin1() );
 }
 
 void ServerPI::read()
 {
     while ( canReadLine() )
 	process( readLine().stripWhiteSpace() );
 }
 
 bool ServerPI::checkReadFile( const QString& file )
 {
     QString filename;
 
     if ( file[0] != "/" )
 	filename = directory.path() + "/" + file;
     else
 	filename = file;
 
     QFileInfo fi( filename );
     return ( fi.exists() && fi.isReadable() );
 }
 
 bool ServerPI::checkWriteFile( const QString& file )
 {
     QString filename;
 
     if ( file[0] != "/" )
 	filename = directory.path() + "/" + file;
     else
 	filename = file;
 
     QFileInfo fi( filename );
 
     if ( fi.exists() )
 	if ( !QFile( filename ).remove() )
 	    return FALSE;
     return TRUE;
 }
 
 void ServerPI::process( const QString& message )
 {
     //qDebug( "Command: %s", message.latin1() );
 
     // split message using "," as separator
     QStringList msg = QStringList::split( " ", message );
     if ( msg.isEmpty() ) return;
 
     // command token
     QString cmd = msg[0].upper();
 
     // argument token
     QString arg;
     if ( msg.count() >= 2 )
 	arg = msg[1];
 
     // full argument string
     QString args;
     if ( msg.count() >= 2 ) {
         QStringList copy( msg );
         // FIXME: for Qt3
         // copy.pop_front()
         copy.remove( copy.begin() );
         args = copy.join( " " );
     }
 
     //qDebug( "args: %s", args.latin1() );
 
     // we always respond to QUIT, regardless of state
     if ( cmd == "QUIT" ) {
 	send( "211 Good bye!" ); // No tr
 	close();
 	return;
     }
 
     // connected to client
     if ( Connected == state )
 	return;
 
     // waiting for user name
     if ( Wait_USER == state ) {
 
 	if ( cmd != "USER" || msg.count() < 2 || !SyncAuthentication::checkUser( arg ) ) {
 	    send( "530 Please login with USER and PASS" ); // No tr
 	    return;
 	}
 	send( "331 User name ok, need password" ); // No tr
 	state = Wait_PASS;
 	return;
     }
 
     // waiting for password
     if ( Wait_PASS == state ) {
 
 	if ( cmd != "PASS" || !SyncAuthentication::checkPassword( arg ) ) {
 	    send( "530 Please login with USER and PASS" ); // No tr
 	    return;
 	}
 	send( "230 User logged in, proceed" ); // No tr
 	state = Ready;
 	return;
     }
 
     // ACCESS CONTROL COMMANDS
 
     // Only an ALLO sent immediately before STOR is valid.
     if ( cmd != "STOR" )
 	storFileSize = -1;
 
     // account (ACCT)
     if ( cmd == "ACCT" ) {
 	// even wu-ftp does not support it
 	send( "502 Command not implemented" ); // No tr
     }
 
     // change working directory (CWD)
     else if ( cmd == "CWD" ) {
 
 	if ( !args.isEmpty() ) {
 	    if ( directory.cd( args, TRUE ) )
 		send( "250 Requested file action okay, completed" ); // No tr
 	    else
 		send( "550 Requested action not taken" ); // No tr
 	}
 	else
 	    send( "500 Syntax error, command unrecognized" ); // No tr
     }
 
     // change to parent directory (CDUP)
     else if ( cmd == "CDUP" ) {
 	if ( directory.cdUp() )
 	    send( "250 Requested file action okay, completed" ); // No tr
 	else
 	    send( "550 Requested action not taken" ); // No tr
     }
 
     // structure mount (SMNT)
     else if ( cmd == "SMNT" ) {
 	// even wu-ftp does not support it
 	send( "502 Command not implemented" ); // No tr
     }
 
     // reinitialize (REIN)
     else if ( cmd == "REIN" ) {
 	// even wu-ftp does not support it
 	send( "502 Command not implemented" ); // No tr
     }
 
 
     // TRANSFER PARAMETER COMMANDS
 
 
     // data port (PORT)
     else if ( cmd == "PORT" ) {
 	if ( parsePort( arg ) )
 	    send( "200 Command okay" ); // No tr
 	else
 	    send( "500 Syntax error, command unrecognized" ); // No tr
     }
 
     // passive (PASV)
     else if ( cmd == "PASV" ) {
 	passiv = TRUE;
 	send( "227 Entering Passive Mode (" // No tr
 	      + address().toString().replace( QRegExp( "\\." ), "," ) + ","
 	      + QString::number( ( serversocket->port() ) >> 8 ) + ","
 	      + QString::number( ( serversocket->port() ) & 0xFF ) +")" );
     }
 
     // representation type (TYPE)
     else if ( cmd == "TYPE" ) {
 	if ( arg.upper() == "A" || arg.upper() == "I" )
 	    send( "200 Command okay" ); // No tr
 	else
 	    send( "504 Command not implemented for that parameter" ); // No tr
     }
 
     // file structure (STRU)
     else if ( cmd == "STRU" ) {
 	if ( arg.upper() == "F" )
 	    send( "200 Command okay" ); // No tr
 	else
 	    send( "504 Command not implemented for that parameter" ); // No tr
     }
 
     // transfer mode (MODE)
     else if ( cmd == "MODE" ) {
 	if ( arg.upper() == "S" )
 	    send( "200 Command okay" ); // No tr
 	else
 	    send( "504 Command not implemented for that parameter" ); // No tr
     }
 
 
     // FTP SERVICE COMMANDS
 
 
     // retrieve (RETR)
     else if ( cmd == "RETR" )
 	if ( !args.isEmpty() && checkReadFile( absFilePath( args ) )
 	     || backupRestoreGzip( absFilePath( args ) ) ) {
 	    send( "150 File status okay" ); // No tr
 	    sendFile( absFilePath( args ) );
 	}
 	else {
 	    qDebug("550 Requested action not taken");
 	    send( "550 Requested action not taken" ); // No tr
 	}
 
     // store (STOR)
     else if ( cmd == "STOR" )
 	if ( !args.isEmpty() && checkWriteFile( absFilePath( args ) ) ) {
 	    send( "150 File status okay" ); // No tr
 	    retrieveFile( absFilePath( args ) );
 	}
 	else
 	    send( "550 Requested action not taken" ); // No tr
 
     // store unique (STOU)
     else if ( cmd == "STOU" ) {
 	send( "502 Command not implemented" ); // No tr
     }
 
     // append (APPE)
     else if ( cmd == "APPE" ) {
 	send( "502 Command not implemented" ); // No tr
     }
 
     // allocate (ALLO)
     else if ( cmd == "ALLO" ) {
 	storFileSize = args.toInt();
 	send( "200 Command okay" ); // No tr
     }
 
     // restart (REST)
     else if ( cmd == "REST" ) {
 	send( "502 Command not implemented" ); // No tr
     }
 
     // rename from (RNFR)
     else if ( cmd == "RNFR" ) {
 	renameFrom = QString::null;
 	if ( args.isEmpty() )
 	    send( "500 Syntax error, command unrecognized" ); // No tr
 	else {
 	    QFile file( absFilePath( args ) );
 	    if ( file.exists() ) {
 		send( "350 File exists, ready for destination name" ); // No tr
 		renameFrom = absFilePath( args );
 	    }
 	    else
 		send( "550 Requested action not taken" ); // No tr
 	}
     }
 
     // rename to (RNTO)
     else if ( cmd == "RNTO" ) {
 	if ( lastCommand != "RNFR" )
 	    send( "503 Bad sequence of commands" ); // No tr
 	else if ( args.isEmpty() )
 	    send( "500 Syntax error, command unrecognized" ); // No tr
 	else {
 	    QDir dir( absFilePath( args ) );
 	    if ( dir.rename( renameFrom, absFilePath( args ), TRUE ) )
 		send( "250 Requested file action okay, completed." ); // No tr
 	    else
 		send( "550 Requested action not taken" ); // No tr
 	}
     }
 
     // abort (ABOR)
     else if ( cmd.contains( "ABOR" ) ) {
 	dtp->close();
 	if ( dtp->dtpMode() != ServerDTP::Idle )
 	    send( "426 Connection closed; transfer aborted" ); // No tr
 	else
 	    send( "226 Closing data connection" ); // No tr
     }
 
     // delete (DELE)
     else if ( cmd == "DELE" ) {
 	if ( args.isEmpty() )
 	    send( "500 Syntax error, command unrecognized" ); // No tr
 	else {
 	    QFile file( absFilePath( args ) ) ;
 	    if ( file.remove() ) {
 		send( "250 Requested file action okay, completed" ); // No tr
 		QCopEnvelope e("QPE/System", "linkChanged(QString)" );
 		e << file.name();
 	    } else {
 		send( "550 Requested action not taken" ); // No tr
 	    }
 	}
     }
 
     // remove directory (RMD)
     else if ( cmd == "RMD" ) {
 	if ( args.isEmpty() )
 	    send( "500 Syntax error, command unrecognized" ); // No tr
 	else {
 	    QDir dir;
 	    if ( dir.rmdir( absFilePath( args ), TRUE ) )
 		send( "250 Requested file action okay, completed" ); // No tr
 	    else
 		send( "550 Requested action not taken" ); // No tr
 	}
     }
 
     // make directory (MKD)
     else if ( cmd == "MKD" ) {
 	if ( args.isEmpty() ) {
 	    qDebug(" Error: no arg");
 	    send( "500 Syntax error, command unrecognized" ); // No tr
 	}
 	else {
 	    QDir dir;
 	    if ( dir.mkdir( absFilePath( args ), TRUE ) )
 		send( "250 Requested file action okay, completed." ); // No tr
 	    else
 		send( "550 Requested action not taken" ); // No tr
 	}
     }
 
     // print working directory (PWD)
     else if ( cmd == "PWD" ) {
 	send( "257 \"" + directory.path() +"\"" );
     }
 
     // list (LIST)
     else if ( cmd == "LIST" ) {
 	if ( sendList( absFilePath( args ) ) )
 	    send( "150 File status okay" ); // No tr
 	else
 	    send( "500 Syntax error, command unrecognized" ); // No tr
     }
 
     // size (SIZE)
     else if ( cmd == "SIZE" ) {
 	QString filePath = absFilePath( args );
 	QFileInfo fi( filePath );
 	bool gzipfile = backupRestoreGzip( filePath );
 	if ( !fi.exists() && !gzipfile )
 	    send( "500 Syntax error, command unrecognized" ); // No tr
 	else {
 	    if ( !gzipfile )
 		send( "213 " + QString::number( fi.size() ) );
 	    else {
 		Process duproc( QString("du") );
 		duproc.addArgument("-s");
 		QString in, out;
 		if ( !duproc.exec(in, out) ) {
 		    qDebug("du process failed; just sending back 1K");
 		    send( "213 1024");
 		}
 		else {
 		    QString size = out.left( out.find("\t") );
 		    int guess = size.toInt()/5;
 		    if ( filePath.contains("doc") ) // No tr
 			guess *= 1000;
 		    qDebug("sending back gzip guess of %d", guess);
 		    send( "213 " + QString::number(guess) );
 		}
 	    }
 	}
     }
     // name list (NLST)
     else if ( cmd == "NLST" ) {
 	send( "502 Command not implemented" ); // No tr
     }
 
     // site parameters (SITE)
     else if ( cmd == "SITE" ) {
 	send( "502 Command not implemented" ); // No tr
     }
 
     // system (SYST)
     else if ( cmd == "SYST" ) {
 	send( "215 UNIX Type: L8" ); // No tr
     }
 
     // status (STAT)
     else if ( cmd == "STAT" ) {
 	send( "502 Command not implemented" ); // No tr
     }
 
     // help (HELP )
     else if ( cmd == "HELP" ) {
 	send( "502 Command not implemented" ); // No tr
     }
 
     // noop (NOOP)
     else if ( cmd == "NOOP" ) {
 	send( "200 Command okay" ); // No tr
     }
 
     // not implemented
     else
 	send( "502 Command not implemented" ); // No tr
 
     lastCommand = cmd;
 }
 
 bool ServerPI::backupRestoreGzip( const QString &file )
 {
     return (file.find( "backup" ) != -1 && // No tr
 	    file.findRev( ".tgz" ) == (int)file.length()-4 );
 }
 
 bool ServerPI::backupRestoreGzip( const QString &file, QStringList &targets )
 {
   if ( file.find( "backup" ) != -1 && // No tr
        file.findRev( ".tgz" ) == (int)file.length()-4 ) {
       QFileInfo info( file );
       targets = info.dirPath( TRUE );
       qDebug("ServerPI::backupRestoreGzip for %s = %s", file.latin1(),
 	     targets.join(" ").latin1() );
       return true;
   }
   return false;
 }
 
 void ServerPI::sendFile( const QString& file )
 {
     if ( passiv ) {
 	wait[SendFile] = TRUE;
 	waitfile = file;
 	if ( waitsocket )
 	    newConnection( waitsocket );
     }
     else {
       QStringList targets;
       if ( backupRestoreGzip( file, targets ) )
 	  dtp->sendGzipFile( file, targets, peeraddress, peerport );
       else dtp->sendFile( file, peeraddress, peerport );
     }
 }
 
 void ServerPI::retrieveFile( const QString& file )
 {
     if ( passiv ) {
 	wait[RetrieveFile] = TRUE;
 	waitfile = file;
 	if ( waitsocket )
 	    newConnection( waitsocket );
     }
     else {
       QStringList targets;
       if ( backupRestoreGzip( file, targets ) )
 	dtp->retrieveGzipFile( file, peeraddress, peerport );
       else
 	dtp->retrieveFile( file, peeraddress, peerport, storFileSize );
     }
 }
 
 bool ServerPI::parsePort( const QString& pp )
 {
     QStringList p = QStringList::split( ",", pp );
     if ( p.count() != 6 ) return FALSE;
 
     // h1,h2,h3,h4,p1,p2
     peeraddress = QHostAddress( ( p[0].toInt() << 24 ) + ( p[1].toInt() << 16 ) +
 				( p[2].toInt() << 8 ) + p[3].toInt() );
     peerport = ( p[4].toInt() << 8 ) + p[5].toInt();
     return TRUE;
 }
 
 void ServerPI::dtpCompleted()
 {
     send( "226 Closing data connection, file transfer successful" ); // No tr
     if ( dtp->dtpMode() == ServerDTP::RetrieveFile ) {
 	QString fn = dtp->fileName();
 	if ( fn.right(8)==".desktop" && fn.find("/Documents/")>=0 ) {
 	    QCopEnvelope e("QPE/System", "linkChanged(QString)" );
 	    e << fn;
 	}
     }
     waitsocket = 0;
     dtp->close();
     storFileSize = -1;
 }
 
 void ServerPI::dtpFailed()
 {
     dtp->close();
     waitsocket = 0;
     send( "451 Requested action aborted: local error in processing" ); // No tr
     storFileSize = -1;
 }
 
 void ServerPI::dtpError( int )
 {
     dtp->close();
     waitsocket = 0;
     send( "451 Requested action aborted: local error in processing" ); // No tr
     storFileSize = -1;
 }
 
 bool ServerPI::sendList( const QString& arg )
 {
     QByteArray listing;
     QBuffer buffer( listing );
 
     if ( !buffer.open( IO_WriteOnly ) )
 	return FALSE;
 
     QTextStream ts( &buffer );
     QString fn = arg;
 
     if ( fn.isEmpty() )
 	fn = directory.path();
 
     QFileInfo fi( fn );
     if ( !fi.exists() ) return FALSE;
 
     // return file listing
     if ( fi.isFile() ) {
 	ts << fileListing( &fi ) << endl;
     }
 
     // return directory listing
     else if ( fi.isDir() ) {
 	QDir dir( fn );
 	const QFileInfoList *list = dir.entryInfoList( QDir::All | QDir::Hidden );
 
 	QFileInfoListIterator it( *list );
 	QFileInfo *info;
 
 	unsigned long total = 0;
 	while ( ( info = it.current() ) ) {
 	    if ( info->fileName() != "." && info->fileName() != ".." )
 		total += info->size();
 	    ++it;
 	}
 
 	ts << "total " << QString::number( total / 1024 ) << endl; // No tr
 
 	it.toFirst();
 	while ( ( info = it.current() ) ) {
 	    if ( info->fileName() == "." || info->fileName() == ".." ) {
 		++it;
 		continue;
 	    }
 	    ts << fileListing( info ) << endl;
 	    ++it;
 	}
     }
 
     if ( passiv ) {
 	waitarray = buffer.buffer();
 	wait[SendByteArray] = TRUE;
 	if ( waitsocket )
 	    newConnection( waitsocket );
     }
     else
 	dtp->sendByteArray( buffer.buffer(), peeraddress, peerport );
     return TRUE;
 }
 
 QString ServerPI::fileListing( QFileInfo *info )
 {
     if ( !info ) return QString::null;
     QString s;
 
     // type char
     if ( info->isDir() )
 	s += "d";
     else if ( info->isSymLink() )
 	s += "l";
     else
 	s += "-";
 
     // permisson string
     s += permissionString( info ) + " ";
 
     // number of hardlinks
     int subdirs = 1;
 
     if ( info->isDir() )
 	subdirs = 2;
     // FIXME : this is to slow
     //if ( info->isDir() )
     //subdirs = QDir( info->absFilePath() ).entryList( QDir::Dirs ).count();
 
     s += QString::number( subdirs ).rightJustify( 3, ' ', TRUE ) + " ";
 
     // owner
     QString o = info->owner();
     if ( o.isEmpty() )
 	o = QString::number(info->ownerId());
     s += o.leftJustify( 8, ' ', TRUE ) + " ";
 
     // group
     QString g = info->group();
     if ( g.isEmpty() )
 	g = QString::number(info->groupId());
     s += g.leftJustify( 8, ' ', TRUE ) + " ";
 
     // file size in bytes
     s += QString::number( info->size() ).rightJustify( 9, ' ', TRUE ) + " ";
 
     // last modified date
     QDate date = info->lastModified().date();
     QTime time = info->lastModified().time();
     s += date.monthName( date.month() ) + " "
 	 + QString::number( date.day() ).rightJustify( 2, ' ', TRUE ) + " "
 	 + QString::number( time.hour() ).rightJustify( 2, '0', TRUE ) + ":"
 	 + QString::number( time.minute() ).rightJustify( 2,'0', TRUE ) + " ";
 
     // file name
     s += info->fileName();
 
     return s;
 }
 
 QString ServerPI::permissionString( QFileInfo *info )
 {
     if ( !info ) return QString( "---------" );
     QString s;
 
     // user
     if ( info->permission( QFileInfo::ReadUser ) ) s += "r";
     else s += "-";
     if ( info->permission( QFileInfo::WriteUser ) ) s += "w";
     else s += "-";
     if ( info->permission( QFileInfo::ExeUser ) ) s += "x";
     else s += "-";
 
     // group
     if ( info->permission( QFileInfo::ReadGroup ) ) s += "r";
     else s += "-";
     if ( info->permission( QFileInfo::WriteGroup ) )s += "w";
     else s += "-";
     if ( info->permission( QFileInfo::ExeGroup ) ) s += "x";
     else s += "-";
 
     // exec
     if ( info->permission( QFileInfo::ReadOther ) ) s += "r";
     else s += "-";
     if ( info->permission( QFileInfo::WriteOther ) ) s += "w";
     else s += "-";
     if ( info->permission( QFileInfo::ExeOther ) ) s += "x";
     else s += "-";
 
     return s;
 }
 
 void ServerPI::newConnection( int socket )
 {
     //qDebug( "New incomming connection" );
 
     if ( !passiv ) return;
 
     if ( wait[SendFile] ) {
 	QStringList targets;
 	if ( backupRestoreGzip( waitfile, targets ) )
 	    dtp->sendGzipFile( waitfile, targets );
 	else
 	    dtp->sendFile( waitfile );
 	dtp->setSocket( socket );
     }
     else if ( wait[RetrieveFile] ) {
       qDebug("check retrieve file");
       if ( backupRestoreGzip( waitfile ) )
 	dtp->retrieveGzipFile( waitfile );
       else
 	dtp->retrieveFile( waitfile, storFileSize );
       dtp->setSocket( socket );
     }
     else if ( wait[SendByteArray] ) {
 	dtp->sendByteArray( waitarray );
 	dtp->setSocket( socket );
     }
     else if ( wait[RetrieveByteArray] ) {
 	qDebug("retrieve byte array");
 	dtp->retrieveByteArray();
 	dtp->setSocket( socket );
     }
     else
 	waitsocket = socket;
 
     for( int i = 0; i < 4; i++ )
 	wait[i] = FALSE;
 }
 
 QString ServerPI::absFilePath( const QString& file )
 {
     if ( file.isEmpty() ) return file;
 
     QString filepath( file );
     if ( file[0] != "/" )
 	filepath = directory.path() + "/" + file;
 
     return filepath;
 }
 
diff --git a/core/launcher/wait.cpp b/core/launcher/wait.cpp
index 34ffd1a..4148e57 100644
--- a/core/launcher/wait.cpp
+++ b/core/launcher/wait.cpp
@@ -1,78 +1,74 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "wait.h"
 
-#include <qtopia/resource.h>
 #include <qtopia/config.h>
 
 #include <opie2/owait.h>
 
-#include <qwidget.h>
-#include <qpixmap.h>
-#include <qpainter.h>
 
 
 Wait *lastWaitObject = NULL;
 
 
 Wait::Wait( QWidget *parent ) : QWidget( parent ),
 	pm( Resource::loadPixmap( "wait" ) ), waiting( FALSE )
 {
     setFixedSize( pm.size() );
     lastWaitObject = this;
     m_centralWait = new OWait( 0l );
     m_centralWait->hide();
     hide();
 }
 
 
 Wait *Wait::getWaitObject()
 {
     return lastWaitObject;
 }
 
 
 void Wait::setWaiting( bool w )
 {
     Config cfg ( "Launcher" );
     cfg.setGroup("GUI");
 
 
     waiting = w;
     if ( w ) {
         if ( cfg. readBoolEntry( "BigBusy" ) )
             m_centralWait->show();
         else
             show();
     }else{
         m_centralWait->hide();
 	hide();
     }
 }
 
 
 void Wait::paintEvent( QPaintEvent * )
 {
     QPainter p( this );
     p.drawPixmap( 0, 0, pm );
 }