summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-02-08 23:40:04 (UTC)
committer mickeyl <mickeyl>2005-02-08 23:40:04 (UTC)
commitdf9f73f2505ac66e804aca3bf490b80e61d3f90d (patch) (side-by-side diff)
treebcf38ecaaac77bf517c04c32649529beebf95900
parentb61772fe39346e724f560161d9885589ba86a23f (diff)
downloadopie-df9f73f2505ac66e804aca3bf490b80e61d3f90d.zip
opie-df9f73f2505ac66e804aca3bf490b80e61d3f90d.tar.gz
opie-df9f73f2505ac66e804aca3bf490b80e61d3f90d.tar.bz2
catch up w/ override changes
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/opie-login/main.cpp9
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
@@ -3,14 +3,14 @@
             .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
           .>+-=
 _;:,     .>    :=|. This file is free software; you can
.> <`_,   >  .   <= redistribute it and/or modify it under
:`=1 )Y*s>-.--   : the terms of the GNU General Public
.="- .-=="i,     .._ License as published by the Free Software
- - .   .-<_>     .<> Foundation; either version 2 of the License,
-     ._= =}       : or (at your option) any later version.
+ - .   .-<_>     .<> Foundation; version 2 of the License.
+     ._= =}       :
    .%`+i>       _;_.
    .i_,=:_.      -<s. This file is distributed in the hope that
     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
    : ..    .:,     . . . without even the implied warranty of
    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
@@ -318,22 +318,17 @@ private:
int m_backlight_bright;
bool m_backlight_forcedoff;
};
-namespace Opie { extern int force_appearance; } // HACK to get around the force-style setting
-
-
int login_main ( int argc, char **argv, pid_t ppid )
{
QWSServer::setDesktopBackground( QImage() );
LoginApplication *app = new LoginApplication ( argc, argv, ppid );
- Opie::force_appearance = 0;
-
app-> setFont ( QFont ( "Helvetica", 10 ));
app-> setStyle ( new QPEStyle ( ));
if ( QWSServer::mouseHandler() &&
QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
if ( !QFile::exists ( "/etc/pointercal" )) {