| author | mickeyl <mickeyl> | 2003-12-01 22:44:38 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2003-12-01 22:44:38 (UTC) |
| commit | 7a7683d435cfbb4fa2d6ed99fd4a94d388402aec (patch) (side-by-side diff) | |
| tree | 1a34de131d935f34dd2622e3606ba664a7783e24 /libopie2/opiecore/oglobal.h | |
| parent | a4a47fca8badeca2b1aae51b39295ccdc8782c4f (diff) | |
| download | opie-7a7683d435cfbb4fa2d6ed99fd4a94d388402aec.zip opie-7a7683d435cfbb4fa2d6ed99fd4a94d388402aec.tar.gz opie-7a7683d435cfbb4fa2d6ed99fd4a94d388402aec.tar.bz2 | |
slowly start to refactor & cleanup libopie2 before merging it with libopie1
| -rw-r--r-- | libopie2/opiecore/oglobal.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libopie2/opiecore/oglobal.h b/libopie2/opiecore/oglobal.h index 23cedde..2dc4f9e 100644 --- a/libopie2/opiecore/oglobal.h +++ b/libopie2/opiecore/oglobal.h @@ -1,7 +1,6 @@ /* 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. .>+-= @@ -31,19 +30,20 @@ #ifndef OGLOBAL_H #define OGLOBAL_H -#include <qpe/global.h> #include <opie2/oconfig.h> -static OConfig *globalconfig = new OConfig( "global" ); - -//FIXME: Is it wise or even necessary to inherit OGlobal from Global? -// once we totally skip libqpe it should ideally swallow Global -zecke +//FIXME Is it wise or even necessary to inherit OGlobal from Global? +// once we totally skip libqpe it should ideally swallow Global -zecke +// You're right. I deleted global as the base class. -mickeyl -class OGlobal : public Global +class OGlobal { public: - // do we want to put that into OApplication as in KApplication -zecke + //FIXME Do we want to put that into OApplication as in KApplication? -zecke + // We already have a per-application config in OApplication + // ( accessed through oApp->config() ), but this one is the global one! -mickeyl static OConfig* config(); + static OConfig* _config; }; #endif // OGLOBAL_H |