From 7b74f202db22d458c43b2063ae128bf79b0e9777 Mon Sep 17 00:00:00 2001 From: mickeyl Date: Tue, 02 Dec 2003 16:00:17 +0000 Subject: warning: file restrucuration on server ahead be sure to do a complete checkout of libopie2 again tomorrow --- 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,7 +1,6 @@ /*                 This file is part of the Opie Project - -              Copyright (C) 2003 Michael Lauer +              Copyright (C) 2003 Michael 'Mickey' Lauer =. .=l.            .>+-= @@ -101,7 +100,9 @@ void OApplication::init() } 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 ); } } 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,7 +1,6 @@ /*                 This file is part of the Opie Project - -              Copyright (C) 2003 Michael Lauer +              Copyright (C) 2003 Michael 'Mickey' Lauer =. .=l.            .>+-= 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,7 +1,6 @@ /*                 This file is part of the Opie Project - -              Copyright (C) 2003 Michael 'Mickey' Lauer +              Copyright (C) 2003 Michael 'Mickey' Lauer =. .=l.            .>+-= @@ -26,7 +25,7 @@ If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ +*/ #include @@ -36,6 +35,7 @@ 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" ); } -- cgit v0.9.0.2