author | mickeyl <mickeyl> | 2005-02-08 23:40:04 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-02-08 23:40:04 (UTC) |
commit | df9f73f2505ac66e804aca3bf490b80e61d3f90d (patch) (unidiff) | |
tree | bcf38ecaaac77bf517c04c32649529beebf95900 /core/opie-login/main.cpp | |
parent | b61772fe39346e724f560161d9885589ba86a23f (diff) | |
download | opie-df9f73f2505ac66e804aca3bf490b80e61d3f90d.zip opie-df9f73f2505ac66e804aca3bf490b80e61d3f90d.tar.gz opie-df9f73f2505ac66e804aca3bf490b80e61d3f90d.tar.bz2 |
catch up w/ override changes
-rw-r--r-- | core/opie-login/main.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp index 2de0180..711bedc 100644 --- a/core/opie-login/main.cpp +++ b/core/opie-login/main.cpp | |||
@@ -5,10 +5,10 @@ | |||
5 | _;:, .> :=|. This file is free software; you can | 5 | _;:, .> :=|. This file is free software; you can |
6 | .> <`_, > . <= redistribute it and/or modify it under | 6 | .> <`_, > . <= redistribute it and/or modify it under |
7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
8 | .="- .-=="i, .._ License as published by the Free Software | 8 | .="- .-=="i, .._ License as published by the Free Software |
9 | - . .-<_> .<> Foundation; either version 2 of the License, | 9 | - . .-<_> .<> Foundation; version 2 of the License. |
10 | ._= =} : or (at your option) any later version. | 10 | ._= =} : |
11 | .%`+i> _;_. | 11 | .%`+i> _;_. |
12 | .i_,=:_. -<s. This file is distributed in the hope that | 12 | .i_,=:_. -<s. This file is distributed in the hope that |
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
14 | : .. .:, . . . without even the implied warranty of | 14 | : .. .:, . . . without even the implied warranty of |
@@ -320,18 +320,13 @@ private: | |||
320 | bool m_backlight_forcedoff; | 320 | bool m_backlight_forcedoff; |
321 | }; | 321 | }; |
322 | 322 | ||
323 | 323 | ||
324 | namespace Opie { extern int force_appearance; } // HACK to get around the force-style setting | ||
325 | |||
326 | |||
327 | int login_main ( int argc, char **argv, pid_t ppid ) | 324 | int login_main ( int argc, char **argv, pid_t ppid ) |
328 | { | 325 | { |
329 | QWSServer::setDesktopBackground( QImage() ); | 326 | QWSServer::setDesktopBackground( QImage() ); |
330 | LoginApplication *app = new LoginApplication ( argc, argv, ppid ); | 327 | LoginApplication *app = new LoginApplication ( argc, argv, ppid ); |
331 | 328 | ||
332 | Opie::force_appearance = 0; | ||
333 | |||
334 | app-> setFont ( QFont ( "Helvetica", 10 )); | 329 | app-> setFont ( QFont ( "Helvetica", 10 )); |
335 | app-> setStyle ( new QPEStyle ( )); | 330 | app-> setStyle ( new QPEStyle ( )); |
336 | 331 | ||
337 | if ( QWSServer::mouseHandler() && | 332 | if ( QWSServer::mouseHandler() && |