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
@@ -51,131 +51,77 @@ using namespace Opie::Core;
 
 /* 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 )
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
@@ -495,76 +495,48 @@ bool ServerApplication::screenLocked()
 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;