author | mickeyl <mickeyl> | 2005-01-23 21:35:29 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-01-23 21:35:29 (UTC) |
commit | dd410f1eb69e68f04cf26b6d3e6bca88f0987f71 (patch) (unidiff) | |
tree | 0f2b59bae4c326011783e9cdea0754e180ae0e27 /core | |
parent | 78e658cecc7521cf3932f5eb44d3f551d73f3181 (diff) | |
download | opie-dd410f1eb69e68f04cf26b6d3e6bca88f0987f71.zip opie-dd410f1eb69e68f04cf26b6d3e6bca88f0987f71.tar.gz opie-dd410f1eb69e68f04cf26b6d3e6bca88f0987f71.tar.bz2 |
remove setSoftSuspend() from ODevice. this is a left-over from the old days
-rw-r--r-- | core/launcher/main.cpp | 7 | ||||
-rw-r--r-- | core/opie-login/main.cpp | 7 |
2 files changed, 1 insertions, 13 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index 734d072..5bbed59 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp | |||
@@ -158,9 +158,6 @@ int initApplication( int argc, char ** argv ) | |||
158 | return 0; | 158 | return 0; |
159 | } | 159 | } |
160 | 160 | ||
161 | #ifndef Q_OS_MACX | ||
162 | ODevice::inst()->setSoftSuspend( true ); | ||
163 | #endif | ||
164 | { | 161 | { |
165 | QCopEnvelope e("QPE/System", "setBacklight(int)" ); | 162 | QCopEnvelope e("QPE/System", "setBacklight(int)" ); |
166 | e << -3; // Forced on | 163 | e << -3; // Forced on |
@@ -195,10 +192,6 @@ int initApplication( int argc, char ** argv ) | |||
195 | odebug << "removing server object..." << oendl; | 192 | odebug << "removing server object..." << oendl; |
196 | delete s; | 193 | delete s; |
197 | 194 | ||
198 | #ifndef Q_OS_MACX | ||
199 | ODevice::inst()->setSoftSuspend( false ); | ||
200 | #endif | ||
201 | |||
202 | odebug << "returning from qpe/initapplication..." << oendl; | 195 | odebug << "returning from qpe/initapplication..." << oendl; |
203 | return rv; | 196 | return rv; |
204 | } | 197 | } |
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp index 0699d0a..2de0180 100644 --- a/core/opie-login/main.cpp +++ b/core/opie-login/main.cpp | |||
@@ -192,8 +192,7 @@ int main ( int argc, char **argv ) | |||
192 | if ( autolog && !userExited ) { | 192 | if ( autolog && !userExited ) { |
193 | 193 | ||
194 | QWSServer::setDesktopBackground( QImage() ); | 194 | QWSServer::setDesktopBackground( QImage() ); |
195 | ODevice::inst ( )-> setDisplayStatus ( true ); | 195 | ODevice::inst()->setDisplayStatus( true ); |
196 | ODevice::inst ( )-> setSoftSuspend ( false ); | ||
197 | LoginApplication *app = new LoginApplication ( argc, argv, ppid ); | 196 | LoginApplication *app = new LoginApplication ( argc, argv, ppid ); |
198 | LoginApplication::setLoginAs ( autolog ); | 197 | LoginApplication::setLoginAs ( autolog ); |
199 | 198 | ||
@@ -335,8 +334,6 @@ int login_main ( int argc, char **argv, pid_t ppid ) | |||
335 | app-> setFont ( QFont ( "Helvetica", 10 )); | 334 | app-> setFont ( QFont ( "Helvetica", 10 )); |
336 | app-> setStyle ( new QPEStyle ( )); | 335 | app-> setStyle ( new QPEStyle ( )); |
337 | 336 | ||
338 | ODevice::inst ( )-> setSoftSuspend ( true ); | ||
339 | |||
340 | if ( QWSServer::mouseHandler() && | 337 | if ( QWSServer::mouseHandler() && |
341 | QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { | 338 | QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { |
342 | if ( !QFile::exists ( "/etc/pointercal" )) { | 339 | if ( !QFile::exists ( "/etc/pointercal" )) { |
@@ -361,8 +358,6 @@ int login_main ( int argc, char **argv, pid_t ppid ) | |||
361 | 358 | ||
362 | int rc = app-> exec ( ); | 359 | int rc = app-> exec ( ); |
363 | 360 | ||
364 | ODevice::inst ( )-> setSoftSuspend ( false ); | ||
365 | |||
366 | if ( app-> loginAs ( )) { | 361 | if ( app-> loginAs ( )) { |
367 | if ( app-> changeIdentity ( )) { | 362 | if ( app-> changeIdentity ( )) { |
368 | app-> login ( ); | 363 | app-> login ( ); |