author | zecke <zecke> | 2004-07-15 18:58:59 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-07-15 18:58:59 (UTC) |
commit | c96296038ac74083c5bf8009449cb22392cd02dc (patch) (side-by-side diff) | |
tree | 0ab461a85b9ab0e13e1382cacc109fd6df277c9c /core/launcher/main.cpp | |
parent | 323e9a7472a110b4befba7320540263147505bae (diff) | |
download | opie-c96296038ac74083c5bf8009449cb22392cd02dc.zip opie-c96296038ac74083c5bf8009449cb22392cd02dc.tar.gz opie-c96296038ac74083c5bf8009449cb22392cd02dc.tar.bz2 |
Start removing #if 0 which originates from a sync and libqtopia dependency
-rw-r--r-- | core/launcher/main.cpp | 56 |
1 files changed, 1 insertions, 55 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 @@ -69,62 +69,13 @@ static void cleanup() 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 @@ -147,17 +98,12 @@ void initEnvironment() 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"); |