summaryrefslogtreecommitdiff
authorzecke <zecke>2004-07-15 18:58:59 (UTC)
committer zecke <zecke>2004-07-15 18:58:59 (UTC)
commitc96296038ac74083c5bf8009449cb22392cd02dc (patch) (unidiff)
tree0ab461a85b9ab0e13e1382cacc109fd6df277c9c
parent323e9a7472a110b4befba7320540263147505bae (diff)
downloadopie-c96296038ac74083c5bf8009449cb22392cd02dc.zip
opie-c96296038ac74083c5bf8009449cb22392cd02dc.tar.gz
opie-c96296038ac74083c5bf8009449cb22392cd02dc.tar.bz2
Start removing #if 0 which originates from a sync and libqtopia dependency
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/main.cpp56
-rw-r--r--core/launcher/serverapp.cpp28
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
@@ -69,62 +69,13 @@ static void cleanup()
69 dir.remove( *it ); 69 dir.remove( *it );
70 } 70 }
71} 71}
72 72
73static void refreshTimeZoneConfig() 73static void refreshTimeZoneConfig()
74{ 74{
75 /* ### FIXME timezone handling */ 75 /* ### FIXME timezone handling for qtopia */
76#if 0
77 // We need to help WorldTime in setting up its configuration for
78 // the current translation
79 // BEGIN no tr
80 const char *defaultTz[] = {
81 "America/New_York",
82 "America/Los_Angeles",
83 "Europe/Oslo",
84 "Asia/Tokyo",
85 "Asia/Hong_Kong",
86 "Australia/Brisbane",
87 0
88 };
89 // END no tr
90
91 TimeZone curZone;
92 QString zoneID;
93 int zoneIndex;
94 Config cfg = Config( "WorldTime" );
95 cfg.setGroup( "TimeZones" );
96 if (!cfg.hasKey( "Zone0" )){
97 // We have no existing timezones use the defaults which are untranslated strings
98 QString currTz = TimeZone::current().id();
99 QStringList zoneDefaults;
100 zoneDefaults.append( currTz );
101 for ( int i = 0; defaultTz[i] && zoneDefaults.count() < 6; i++ ) {
102 if ( defaultTz[i] != currTz )
103 zoneDefaults.append( defaultTz[i] );
104 }
105 zoneIndex = 0;
106 for (QStringList::Iterator it = zoneDefaults.begin(); it != zoneDefaults.end() ; ++it){
107 cfg.writeEntry( "Zone" + QString::number( zoneIndex ) , *it);
108 zoneIndex++;
109 }
110 }
111 // We have an existing list of timezones refresh the
112 // translations of TimeZone name
113 zoneIndex = 0;
114 while (cfg.hasKey( "Zone"+ QString::number( zoneIndex ))){
115 zoneID = cfg.readEntry( "Zone" + QString::number( zoneIndex ));
116 curZone = TimeZone( zoneID );
117 if ( !curZone.isValid() ){
118 odebug << "initEnvironment() Invalid TimeZone " << zoneID << "" << oendl;
119 break;
120 }
121 cfg.writeEntry( "ZoneName" + QString::number( zoneIndex ), curZone.city() );
122 zoneIndex++;
123 }
124#endif
125} 76}
126 77
127void initEnvironment() 78void initEnvironment()
128{ 79{
129#ifdef Q_OS_WIN32 80#ifdef Q_OS_WIN32
130 // Config file requires HOME dir which uses QDir which needs the winver 81 // Config file requires HOME dir which uses QDir which needs the winver
@@ -147,17 +98,12 @@ void initEnvironment()
147 lang = "en_US"; 98 lang = "en_US";
148 99
149 setenv( "LANG", lang, 1 ); 100 setenv( "LANG", lang, 1 );
150 config.writeEntry("Language", lang); 101 config.writeEntry("Language", lang);
151 config.write(); 102 config.write();
152 103
153#if 0
154 setenv( "QWS_SIZE", "240x320", 0 );
155#endif
156
157
158 104
159 QString env(getenv("QWS_DISPLAY")); 105 QString env(getenv("QWS_DISPLAY"));
160 if (env.contains("Transformed")) { 106 if (env.contains("Transformed")) {
161 int rot; 107 int rot;
162 // transformed driver default rotation is controlled by the hardware. 108 // transformed driver default rotation is controlled by the hardware.
163 Config config("qpe"); 109 Config config("qpe");
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
@@ -513,40 +513,12 @@ void ServerApplication::login(bool at_poweron)
513#include <unistd.h> 513#include <unistd.h>
514#include <errno.h> 514#include <errno.h>
515#include <linux/ioctl.h> 515#include <linux/ioctl.h>
516#include <time.h> 516#include <time.h>
517#endif 517#endif
518 518
519#if 0
520static bool blanked=FALSE;
521
522static void blankScreen()
523{
524#ifdef QWS
525 QWidget w(0, 0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_Tool | Qt::WStyle_StaysOnTop | Qt::WPaintUnclipped);
526 w.resize( qt_screen->width(), qt_screen->height() );
527 w.move(0, 0);
528
529 QPainter p(&w);
530 p.fillRect(w.rect(), QBrush(QColor(255,255,255)) );
531 p.end();
532 w.repaint();
533
534 blanked = TRUE;
535#endif
536}
537
538static void darkScreen()
539{
540 /* ### Screen blanking ODevice */
541#if 0
542 qpe_setBacklight(0); // force off
543#endif
544}
545#endif
546
547namespace { 519namespace {
548 void execAutoStart(const QDateTime& suspendTime ) { 520 void execAutoStart(const QDateTime& suspendTime ) {
549 QString appName; 521 QString appName;
550 int delay; 522 int delay;
551 QDateTime now = QDateTime::currentDateTime(); 523 QDateTime now = QDateTime::currentDateTime();
552 524