| -rw-r--r-- | core/launcher/main.cpp | 56 | ||||
| -rw-r--r-- | core/launcher/serverapp.cpp | 28 |
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 @@ -72,56 +72,7 @@ static void cleanup() 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() @@ -150,11 +101,6 @@ void initEnvironment() config.writeEntry("Language", lang); config.write(); -#if 0 - setenv( "QWS_SIZE", "240x320", 0 ); -#endif - - QString env(getenv("QWS_DISPLAY")); if (env.contains("Transformed")) { 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 @@ -516,34 +516,6 @@ void ServerApplication::login(bool at_poweron) #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; |