summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-01-26 03:30:49 (UTC)
committer kergoth <kergoth>2003-01-26 03:30:49 (UTC)
commit77af78cf44026f52cc119a16554749daefc59617 (patch) (side-by-side diff)
tree8b2afa79b4efa5a1b0f0e4d5a488796067d904a1
parent7efc361470c6c91eb06ae7e800bb64aa645f6f73 (diff)
downloadopie-77af78cf44026f52cc119a16554749daefc59617.zip
opie-77af78cf44026f52cc119a16554749daefc59617.tar.gz
opie-77af78cf44026f52cc119a16554749daefc59617.tar.bz2
Undo unintentional commit
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/main.cpp104
-rw-r--r--packages1
2 files changed, 44 insertions, 61 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 1e5eb46..49b41d6 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -51,20 +51,19 @@ using namespace Opie;
-void initEnvironment( )
+void initEnvironment()
{
- Config config("locale");
- config.setGroup( "Location" );
- QString tz = config.readEntry( "Timezone", getenv("TZ") );
+ Config config("locale");
+ config.setGroup( "Location" );
+ QString tz = config.readEntry( "Timezone", getenv("TZ") );
- // if not timezone set, pick New York
- if (tz.isNull())
- tz = "America/New_York";
+ // if not timezone set, pick New York
+ if (tz.isNull())
+ tz = "America/New_York";
- setenv( "TZ", tz, 1 );
- config.writeEntry( "Timezone", tz);
-
- config.setGroup( "Language" );
- QString lang = config.readEntry( "Language", getenv("LANG") );
- if ( !lang.isNull() )
- setenv( "LANG", lang, 1 );
+ setenv( "TZ", tz, 1 );
+ config.writeEntry( "Timezone", tz);
+ config.setGroup( "Language" );
+ QString lang = config.readEntry( "Language", getenv("LANG") );
+ if ( !lang.isNull() )
+ setenv( "LANG", lang, 1 );
}
@@ -74,5 +73,3 @@ int initApplication( int argc, char ** argv )
{
- struct ODevice *odev = ODevice::inst();
-
- initEnvironment( );
+ initEnvironment();
@@ -86,21 +83,8 @@ int initApplication( int argc, char ** argv )
- int rot;
- switch ( odev-> rotation( ) ) {
- case None:
- rot = 0;
- case Rot90:
- rot = 90;
- case Rot180:
- rot = 180;
- case Rot270:
- rot = 270;
- }
- a.setDefaultRotation( rot );
-
- odev-> setSoftSuspend ( true );
+ ODevice::inst ( )-> setSoftSuspend ( true );
- { // init backlight
- QCopEnvelope e("QPE/System", "setBacklight(int)" );
- e << -3; // Forced on
- }
+ { // init backlight
+ QCopEnvelope e("QPE/System", "setBacklight(int)" );
+ e << -3; // Forced on
+ }
@@ -122,6 +106,6 @@ int initApplication( int argc, char ** argv )
if ( !QFile::exists( "/etc/pointercal" ) ) {
- // Make sure calibration widget starts on top.
- Calibrate *cal = new Calibrate;
- cal->exec();
- delete cal;
+ // Make sure calibration widget starts on top.
+ Calibrate *cal = new Calibrate;
+ cal->exec();
+ delete cal;
}
@@ -131,8 +115,8 @@ int initApplication( int argc, char ** argv )
- if ( QDate::currentDate ( ). year ( ) < 2000 ) {
- if ( QMessageBox::information ( 0, DesktopApplication::tr( "Information" ), DesktopApplication::tr( "<p>The system date doesn't seem to be valid.\n(%1)</p><p>Do you want to correct the clock ?</p>" ). arg( TimeString::dateString ( QDate::currentDate ( ))), QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) {
- QCopEnvelope e ( "QPE/Application/systemtime", "setDocument(QString)" );
- e << QString ( );
- }
- }
+ if ( QDate::currentDate ( ). year ( ) < 2000 ) {
+ if ( QMessageBox::information ( 0, DesktopApplication::tr( "Information" ), DesktopApplication::tr( "<p>The system date doesn't seem to be valid.\n(%1)</p><p>Do you want to correct the clock ?</p>" ). arg( TimeString::dateString ( QDate::currentDate ( ))), QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) {
+ QCopEnvelope e ( "QPE/Application/systemtime", "setDocument(QString)" );
+ e << QString ( );
+ }
+ }
@@ -142,3 +126,3 @@ int initApplication( int argc, char ** argv )
- odev-> setSoftSuspend ( false );
+ ODevice::inst ( )-> setSoftSuspend ( false );
@@ -151,8 +135,8 @@ void create_pidfile ( )
{
- FILE *f;
+ FILE *f;
- if (( f = ::fopen ( pidfile_path, "w" ))) {
- ::fprintf ( f, "%d", getpid ( ));
- ::fclose ( f );
- }
+ if (( f = ::fopen ( pidfile_path, "w" ))) {
+ ::fprintf ( f, "%d", getpid ( ));
+ ::fclose ( f );
+ }
}
@@ -161,3 +145,3 @@ void remove_pidfile ( )
{
- ::unlink ( pidfile_path );
+ ::unlink ( pidfile_path );
}
@@ -166,4 +150,4 @@ void handle_sigterm ( int /* sig */ )
{
- if ( qApp )
- qApp-> quit ( );
+ if ( qApp )
+ qApp-> quit ( );
}
@@ -174,10 +158,10 @@ int main( int argc, char ** argv )
- ::signal ( SIGTERM, handle_sigterm );
- ::signal ( SIGINT, handle_sigterm );
+ ::signal ( SIGTERM, handle_sigterm );
+ ::signal ( SIGINT, handle_sigterm );
- ::setsid ( );
- ::setpgid ( 0, 0 );
+ ::setsid ( );
+ ::setpgid ( 0, 0 );
- ::atexit ( remove_pidfile );
- create_pidfile ( );
+ ::atexit ( remove_pidfile );
+ create_pidfile ( );
diff --git a/packages b/packages
index fc26ef8..b05f90a 100644
--- a/packages
+++ b/packages
@@ -10,3 +10,2 @@ CONFIG_GSMTOOL noncore/comm/gsmtool gsmtool.pro
CONFIG_KEYVIEW development/keyview keyview.pro
-CONFIG_ROTTEST development/rottest rottest.pro
CONFIG_LAN noncore/unsupported/netsetup/lan lan.pro