removed include custom.h cause build system doesn't create it for me and I am tired of not having a compiling opie to work on. fix it if you need too

6 files changed, 6 insertions, 6 deletions

diff --git a/core/launcher/firstuse.cpp b/core/launcher/firstuse.cpp
index 3f769ae..57469cf 100644
--- a/core/launcher/firstuse.cpp
+++ b/core/launcher/firstuse.cpp
@@ -1,160 +1,160 @@
 /**********************************************************************
 ** 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 <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") },
 #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);
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 35d404a..d697c43 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -1,160 +1,160 @@
 /**********************************************************************
 ** 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 <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 )
 {
     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 ) );
 
     QLabel *textLabel = new QLabel( docLoadingVBox );
     textLabel->setText( tr( "<b>Finding Documents...</b>" ) );
     textLabel->setAlignment( int( QLabel::AlignCenter ) );
 
     docLoadingWidgetProgress = new QProgressBar( docLoadingVBox );
     docLoadingWidgetProgress->setProgress( 0 );
     docLoadingWidgetProgress->setCenterIndicator( TRUE );
     docLoadingWidgetProgress->setBackgroundMode( NoBackground ); // No flicker
     setProgressStyle();
 
     QWidget *space2 = new QWidget( docLoadingVBox );
     docLoadingVBox->setStretchFactor( space2, 1 );
 
     Config cfg("Launcher");
     cfg.setGroup( "Tab Documents" ); // No tr
     setTabViewAppearance( docLoadingWidget, cfg );
 
     stack->addWidget( docLoadingWidget, 0 );
 }
 
 void LauncherTabWidget::initLayout()
 {
     layout()->activate();
     docView()->setFocus();
     categoryBar->showTab("Documents");
 }
 
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 5416d33..988e432 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -1,163 +1,163 @@
 /**********************************************************************
 ** 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 "launcherglobal.h"
 
 #include <qtopia/qpeapplication.h>
 #include <qtopia/network.h>
 #include <qtopia/config.h>
-#include <qtopia/custom.h>
+//#include <qtopia/custom.h>
 #include <qtopia/global.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 <opie/odevice.h>
 
 using namespace Opie;
 
 
 static void cleanup()
 {
     QDir dir( Opie::Global::tempDir(), "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
diff --git a/core/launcher/server.cpp b/core/launcher/server.cpp
index 4c62b78..6a140e9 100644
--- a/core/launcher/server.cpp
+++ b/core/launcher/server.cpp
@@ -1,180 +1,180 @@
 /**********************************************************************
 ** 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 "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 <qtopia/custom.h>
 
 #include <opie/odevicebutton.h>
 #include <opie/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(QPE_NEED_CALIBRATION)
                 { "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();
 }
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp
index 69e083d..23a7f95 100644
--- a/core/launcher/serverapp.cpp
+++ b/core/launcher/serverapp.cpp
@@ -1,161 +1,161 @@
 /**********************************************************************
 ** Copyright (C) 2000-2003 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 "serverapp.h"
 
 #include <opie/odevice.h>
 
 #include <qtopia/password.h>
 #include <qtopia/config.h>
 #include <qtopia/power.h>
 
 #ifdef Q_WS_QWS
 #include <qtopia/qcopenvelope_qws.h>
 #endif
 #include <qtopia/global.h>
-#include <qtopia/custom.h>
+//#include <qtopia/custom.h>
 
 #ifdef Q_WS_QWS
 #include <qgfx_qws.h>
 #endif
 #ifdef Q_OS_WIN32
 #include <io.h>
 #include <process.h>
 #else
 #include <unistd.h>
 #endif
 #include <qmessagebox.h>
 #include <qtimer.h>
 #include <qpainter.h>
 #include <qfile.h>
 #include <qpixmapcache.h>
 
 #include <stdlib.h>
 #include "screensaver.h"
 
 static ServerApplication *serverApp = 0;
 static int loggedin=0;
 
 using namespace Opie;
 
 QCopKeyRegister::QCopKeyRegister()
     : m_keyCode( 0 ) {
 }
 
 QCopKeyRegister::QCopKeyRegister( int k, const QCString& c, const QCString& m )
     :m_keyCode( k ), m_channel( c ), m_message( m ) {
 }
 
 int QCopKeyRegister::keyCode()const {
     return m_keyCode;
 }
 
 QCString QCopKeyRegister::channel()const {
     return m_channel;
 }
 
 QCString QCopKeyRegister::message()const {
     return m_message;
 }
 
 bool QCopKeyRegister::send() {
     if (m_channel.isNull() )
         return false;
 
     QCopEnvelope( m_channel, m_message );
 
     return true;
 }
 
 //---------------------------------------------------------------------------
 
 /*
   Priority is number of alerts that are needed to pop up
   alert.
  */
 class DesktopPowerAlerter : public QMessageBox
 {
     Q_OBJECT
 public:
     DesktopPowerAlerter( QWidget *parent, const char *name = 0 )
         : QMessageBox( tr("Battery Status"), tr("Low Battery"),
                        QMessageBox::Critical,
                        QMessageBox::Ok | QMessageBox::Default,
                        QMessageBox::NoButton, QMessageBox::NoButton,
                        parent, name, FALSE )
     {
         currentPriority = INT_MAX;
         alertCount = 0;
     }
 
     void alert( const QString &text, int priority );
     void hideEvent( QHideEvent * );
 private:
     int currentPriority;
     int alertCount;
 };
 
 void DesktopPowerAlerter::alert( const QString &text, int priority )
 {
     alertCount++;
     if ( alertCount < priority )
         return;
     if ( priority > currentPriority )
         return;
     currentPriority = priority;
     setText( text );
     show();
 }
 
 
 void DesktopPowerAlerter::hideEvent( QHideEvent *e )
 {
     QMessageBox::hideEvent( e );
     alertCount = 0;
     currentPriority = INT_MAX;
 }
 
 //---------------------------------------------------------------------------
 
 KeyFilter::KeyFilter(QObject* parent) : QObject(parent), held_tid(0), heldButton(0)
 {
     /* We don't do this cause it would interfere with ODevice */
 #if 0
     qwsServer->setKeyboardFilter(this);
 #endif
 }
 
 void KeyFilter::timerEvent(QTimerEvent* e)
 {
     if ( e->timerId() == held_tid ) {
         killTimer(held_tid);
         // button held
         if ( heldButton ) {
             emit activate(heldButton, TRUE);
             heldButton = 0;
         }
         held_tid = 0;
     }
 }
 
 void KeyFilter::registerKey( const QCopKeyRegister& key ) {
     m_keys.insert( key.keyCode(), key );
 }
 
diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp
index 2966168..491a8a3 100644
--- a/core/launcher/taskbar.cpp
+++ b/core/launcher/taskbar.cpp
@@ -1,165 +1,165 @@
 /**********************************************************************
 ** 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 "startmenu.h"
 #include "inputmethods.h"
 #include "runningappbar.h"
 #include "systray.h"
 #include "wait.h"
 #include "appicons.h"
 
 #include "taskbar.h"
 #include "server.h"
 
 #include <qtopia/config.h>
 #include <qtopia/qpeapplication.h>
 #ifdef QWS
 #include <qtopia/qcopenvelope_qws.h>
 #endif
 #include <qtopia/global.h>
-#include <qtopia/custom.h>
+//#include <qtopia/custom.h>
 
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qtimer.h>
 #ifdef QWS
 #include <qwindowsystem_qws.h>
 #endif
 #include <qwidgetstack.h>
 
 #if defined( Q_WS_QWS )
 #include <qwsdisplay_qws.h>
 #include <qgfx_qws.h>
 #endif
 
 
 static bool initNumLock()
 {
 #ifdef QPE_INITIAL_NUMLOCK_STATE
     QPE_INITIAL_NUMLOCK_STATE
 #endif
     return FALSE;
 }
 
 //---------------------------------------------------------------------------
 
 class SafeMode : public QWidget
 {
     Q_OBJECT
 public:
     SafeMode( QWidget *parent ) : QWidget( parent ), menu(0)
     {
         message = tr("Safe Mode");
         QFont f( font() );
         f.setWeight( QFont::Bold );
         setFont( f );
     }
 
     void mousePressEvent( QMouseEvent *);
     QSize sizeHint() const;
     void paintEvent( QPaintEvent* );
 
 private slots:
     void action(int i);
 
 private:
     QString message;
     QPopupMenu *menu;
 };
 
 void SafeMode::mousePressEvent( QMouseEvent *)
 {
     if ( !menu ) {
         menu = new QPopupMenu(this);
         menu->insertItem( tr("Plugin Manager..."), 0 );
         menu->insertItem( tr("Restart Qtopia"), 1 );
         menu->insertItem( tr("Help..."), 2 );
         connect(menu, SIGNAL(activated(int)), this, SLOT(action(int)));
     }
     QPoint curPos = mapToGlobal( QPoint(0,0) );
     QSize sh = menu->sizeHint();
     menu->popup( curPos-QPoint((sh.width()-width())/2,sh.height()) );
 }
 
 void SafeMode::action(int i)
 {
     switch (i) {
         case 0:
             Global::execute( "pluginmanager" );
             break;
         case 1:
             Global::restart();
             break;
         case 2:
             Global::execute( "helpbrowser", "safemode.html" );
             break;
     }
 }
 
 QSize SafeMode::sizeHint() const
 {
     QFontMetrics fm = fontMetrics();
 
     return QSize( fm.width(message), fm.height() );
 }
 
 void SafeMode::paintEvent( QPaintEvent* )
 {
     QPainter p(this);
     p.drawText( rect(), AlignCenter, message );
 }
 
 //---------------------------------------------------------------------------
 
 class LockKeyState : public QWidget
 {
 public:
     LockKeyState( QWidget *parent ) :
         QWidget(parent),
         nl(initNumLock()), cl(FALSE)
     {
         nl_pm = Resource::loadPixmap("numlock");
         cl_pm = Resource::loadPixmap("capslock");
     }
     QSize sizeHint() const
     {
         return QSize(nl_pm.width()+2,nl_pm.width()+nl_pm.height()+1);
     }
     void toggleNumLockState()
     {
         nl = !nl; repaint();
     }
     void toggleCapsLockState()
     {
         cl = !cl; repaint();
     }
     void paintEvent( QPaintEvent * )
     {
         int y = (height()-sizeHint().height())/2;
         QPainter p(this);
         if ( nl )
             p.drawPixmap(1,y,nl_pm);
         if ( cl )
             p.drawPixmap(1,y+nl_pm.height()+1,cl_pm);
     }
 private:
     QPixmap nl_pm, cl_pm;
     bool nl, cl;
 };