summaryrefslogtreecommitdiff
authorzecke <zecke>2004-07-15 18:58:59 (UTC)
committer zecke <zecke>2004-07-15 18:58:59 (UTC)
commitc96296038ac74083c5bf8009449cb22392cd02dc (patch) (side-by-side diff)
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) (show 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
@@ -63,74 +63,25 @@ 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();
@@ -141,29 +92,24 @@ void initEnvironment()
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 */
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
@@ -507,52 +507,24 @@ void ServerApplication::login(bool at_poweron)
#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