warning: file restrucuration on server ahead

be sure to do a complete checkout of libopie2 again tomorrow

3 files changed, 7 insertions, 7 deletions

diff --git a/libopie2/opiecore/oapplication.cpp b/libopie2/opiecore/oapplication.cpp
index c3cacce..1b85057 100644
--- a/libopie2/opiecore/oapplication.cpp
+++ b/libopie2/opiecore/oapplication.cpp
@@ -1,20 +1,19 @@
 /*
                              This file is part of the Opie Project
-
-                             Copyright (C) 2003 Michael Lauer <mickey@tm.informatik.uni-frankfurt.de>
+                             Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de>
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program 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
 ..}^=.=       =       ;      Library General Public License for more
@@ -88,33 +87,35 @@ void OApplication::init()
     d = new OApplicationPrivate();
     if ( !OApplication::_instance )
     {
         OApplication::_instance = this;
 
         /* register SIGSEGV handler to give programs an option
          * to exit gracefully, e.g. save or close devices or files.
         struct sigaction sa;
         sa.sa_handler = ( void (*)(int) ) &segv_handler;
         sa.sa_flags = SA_SIGINFO | SA_RESTART;
         sigemptyset(&sa.sa_mask);
         sigaction(SIGSEGV, &sa, NULL);
         */
     }
     else
     {
-        qFatal( "OApplication: Can't create more than one OApplication object. Aborting." );
+        ofatal << "OApplication: Can't create more than one OApplication object. Aborting." << oendl;
+        //FIXME exit gracefully ?
+        ::exit( -1 );
     }
 }
 
 
 void OApplication::showMainWidget( QWidget* widget, bool nomax )
 {
     QPEApplication::showMainWidget( widget, nomax );
     widget->setCaption( _appname );
 }
 
 
 void OApplication::setTitle( const QString& title ) const
 {
     if ( mainWidget() )
     {
         if ( !title.isNull() )
diff --git a/libopie2/opiecore/oapplication.h b/libopie2/opiecore/oapplication.h
index 72a659e..cc506a2 100644
--- a/libopie2/opiecore/oapplication.h
+++ b/libopie2/opiecore/oapplication.h
@@ -1,20 +1,19 @@
 /*
                              This file is part of the Opie Project
-
-                             Copyright (C) 2003 Michael Lauer <mickey@tm.informatik.uni-frankfurt.de>
+                             Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de>
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program 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
 ..}^=.=       =       ;      Library General Public License for more
diff --git a/libopie2/opiecore/oglobal.cpp b/libopie2/opiecore/oglobal.cpp
index ae2fcb6..3390ec0 100644
--- a/libopie2/opiecore/oglobal.cpp
+++ b/libopie2/opiecore/oglobal.cpp
@@ -1,20 +1,19 @@
 /*
                              This file is part of the Opie Project
-
-                             Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
+                             Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de>
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program 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
 ..}^=.=       =       ;      Library General Public License for more
@@ -23,21 +22,22 @@
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
  */
 
 #include <opie2/oglobal.h>
 
 OConfig* OGlobal::_config = 0;
 
 OConfig* OGlobal::config()
 {
     if ( !OGlobal::_config )
     {
+        // odebug classes are reading config, so can't use them here!
         qDebug( "OGlobal::creating global configuration instance." );
         OGlobal::_config = new OConfig( "global" );
     }
     return OGlobal::_config;
 }