Start removing #if 0 which originates from a sync and libqtopia dependency

2 files changed, 1 insertions, 83 deletions

diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index a86aca6..b119399 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -1,253 +1,199 @@
 /**********************************************************************
 ** 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
 #ifdef QT_QWS_LOGIN
 #include "../login/qdmdialogimpl.h"
 #endif
 #include "calibrate.h"
 #include "server.h"
 #include "serverapp.h"
 #include "stabmon.h"
 #include "firstuse.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <opie2/odevice.h>
 #include <opie2/oglobal.h>
 #include <qtopia/network.h>
 #include <qtopia/alarmserver.h>
 using namespace Opie::Core;
 
 /* QT */
 #include <qdir.h>
 #include <qmessagebox.h>
 #ifdef QWS
 #include <qwindowsystem_qws.h>
 #include <qtopia/qcopenvelope_qws.h>
 #endif
 #ifdef Q_WS_QWS
 #include <qkeyboard_qws.h>
 #endif
 
 /* STD */
 #include <stdlib.h>
 #include <stdio.h>
 #include <signal.h>
 #ifndef Q_OS_WIN32
 #include <unistd.h>
 #else
 #include <process.h>
 #endif
 
 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() ){
-        odebug << "initEnvironment() Invalid TimeZone " << zoneID << "" << oendl;
-            break;
-        }
-        cfg.writeEntry( "ZoneName" + QString::number( zoneIndex ), curZone.city() );
-        zoneIndex++;
-    }
-#endif
+    /* ### FIXME timezone handling for qtopia */
 }
 
 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
 
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp
index 54cc313..3d88873 100644
--- a/core/launcher/serverapp.cpp
+++ b/core/launcher/serverapp.cpp
@@ -423,220 +423,192 @@ void ServerApplication::systemMessage( const QCString& msg,
         int bright;
         stream >> bright;
         m_screensaver-> setBacklight( bright );
     }
     else if ( msg == "setScreenSaverMode(int)" ) {
         int mode;
         stream >> mode;
         m_screensaver-> setMode ( mode );
     }
     else if ( msg == "reloadPowerWarnSettings()" ) {
         reloadPowerWarnSettings();
     }
     else if ( msg == "setDisplayState(int)" ) {
         int state;
         stream >> state;
         m_screensaver-> setDisplayState ( state != 0 );
     }
     else if ( msg == "suspend()" ) {
         emit power();
     }
     else if ( msg == "sendBusinessCard()" ) {
         QString card = ::getenv ( "HOME" );
         card += "/Applications/addressbook/businesscard.vcf";
 
         if ( QFile::exists( card ) ) {
             QCopEnvelope e ( "QPE/Obex", "send(QString,QString,QString)" );
             QString mimetype = "text/x-vCard";
             e << tr( "business card" ) << card << mimetype;
         }
     }
 }
 
 void ServerApplication::reloadPowerWarnSettings ( )
 {
     Config cfg ( "apm" );
     cfg. setGroup ( "Warnings" );
 
     int iv = cfg. readNumEntry ( "checkinterval", 10000 );
 
     m_apm_timer-> stop ( );
     if ( iv )
         m_apm_timer-> start ( iv );
 
     m_powerVeryLow  = cfg. readNumEntry ( "powerverylow", 10 );
     m_powerCritical = cfg. readNumEntry ( "powervcritical", 5 );
 }
 
 void ServerApplication::launcherMessage( const QCString & msg, const QByteArray & data )
 {
     QDataStream stream ( data, IO_ReadOnly );
 
     if ( msg == "deviceButton(int,int,int)" ) {
         int keycode, press, autoRepeat;
         stream >> keycode >> press >> autoRepeat;
 
         kf->checkButtonAction ( true, keycode, press, autoRepeat );
     }
     else if ( msg == "keyRegister(int,QCString,QCString)" ) {
         int k;
         QCString c, m;
         stream >> k >> c >> m;
 
         kf -> registerKey( QCopKeyRegister(k, c, m) );
     }
 }
 
 
 bool ServerApplication::screenLocked()
 {
     return loggedin == 0;
 }
 
 void ServerApplication::login(bool at_poweron)
 {
     if ( !loggedin ) {
     Global::terminateBuiltin("calibrate"); // No tr
     Password::authenticate(at_poweron);
     loggedin=1;
 #ifndef QT_NO_COP
     QCopEnvelope e( "QPE/Desktop", "unlocked()" );
 #endif
     }
 }
 
 #if defined(QPE_HAVE_TOGGLELIGHT)
 #include <qtopia/config.h>
 
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
 #include <linux/ioctl.h>
 #include <time.h>
 #endif
 
-#if 0
-static bool blanked=FALSE;
-
-static void blankScreen()
-{
-#ifdef QWS
-    QWidget w(0, 0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_Tool | Qt::WStyle_StaysOnTop | Qt::WPaintUnclipped);
-    w.resize( qt_screen->width(), qt_screen->height() );
-    w.move(0, 0);
-
-    QPainter p(&w);
-    p.fillRect(w.rect(), QBrush(QColor(255,255,255)) );
-    p.end();
-    w.repaint();
-
-    blanked = TRUE;
-#endif
-}
-
-static void darkScreen()
-{
-    /* ### Screen blanking ODevice */
-#if 0
-    qpe_setBacklight(0); // force off
-#endif
-}
-#endif
-
 namespace {
     void execAutoStart(const QDateTime& suspendTime ) {
         QString appName;
     int delay;
     QDateTime now = QDateTime::currentDateTime();
 
         Config cfg( "autostart" );
     cfg.setGroup( "AutoStart" );
     appName = cfg.readEntry( "Apps", "" );
     delay = cfg.readNumEntry( "Delay", 0  );
 
     // If the time between suspend and resume was longer then the
     // value saved as delay, start the app
     if ( suspendTime.secsTo( now ) >= ( delay * 60 ) && !appName.isEmpty() ) {
         QCopEnvelope e( "QPE/System", "execute(QString)" );
         e << QString( appName );
     }
     }
 }
 
 
 void ServerApplication::togglePower()
 {
     static bool excllock = false;
 
     if ( excllock )
         return ;
 
     excllock = true;
 
     bool wasloggedin = loggedin;
     loggedin = 0;
     m_suspendTime = QDateTime::currentDateTime();
 
 #ifdef QWS
 
     if ( Password::needToAuthenticate ( true ) && qt_screen ) {
         // Should use a big black window instead.
         // But this would not show up fast enough
         QGfx *g = qt_screen-> screenGfx ( );
         g-> fillRect ( 0, 0, qt_screen-> width ( ), qt_screen-> height ( ));
         delete g;
     }
 #endif
 
     ODevice::inst ( )-> suspend ( );
 
     ServerApplication::switchLCD ( true ); // force LCD on without slow qcop call
     QWSServer::screenSaverActivate ( false );
 
     {
         QCopEnvelope( "QPE/Card", "mtabChanged()" ); // might have changed while asleep
     }
 
     if ( wasloggedin )
         login ( true );
 
     execAutoStart(m_suspendTime);
     //qcopBridge->closeOpenConnections();
 
     excllock = false;
 }
 
 void ServerApplication::toggleLight()
 {
 #ifndef QT_NO_COP
     QCopEnvelope e("QPE/System", "setBacklight(int)");
     e << -2; // toggle
 #endif
 }
 
 
 /*
  * We still listen to key events but handle them in
  * a special class
  */
 
 bool ServerApplication::eventFilter( QObject *o, QEvent *e) {
     if ( e->type() != QEvent::KeyPress &&
          e->type() != QEvent::KeyRelease )
         return QPEApplication::eventFilter( o, e );
 
     QKeyEvent *ke = static_cast<QKeyEvent*>( e );
     if ( kf->checkButtonAction( true, ke->key(),
                                 e->type() == QEvent::KeyPress,
                                 ke-> isAutoRepeat() ))
         return true;
 
     return QPEApplication::eventFilter( o, e );
 
 }
 
 #ifdef Q_WS_QWS
 bool ServerApplication::qwsEventFilter( QWSEvent *e )
 {
     checkMemory();