-rw-r--r-- | libopie2/opiecore/libopiecore2.control | 2 | ||||
-rw-r--r-- | libopie2/opiecore/oconfig.cpp | 4 | ||||
-rw-r--r-- | libopie2/opiecore/oconfig.h | 6 | ||||
-rw-r--r-- | libopie2/opiecore/odebug.cpp | 3 | ||||
-rw-r--r-- | libopie2/opiecore/oglobal.cpp | 9 | ||||
-rw-r--r-- | libopie2/opiecore/oglobal.h | 18 | ||||
-rw-r--r-- | libopie2/opiecore/oglobalsettings.cpp | 1 | ||||
-rw-r--r-- | libopie2/opiecore/opiecore.pro | 2 |
8 files changed, 27 insertions, 18 deletions
diff --git a/libopie2/opiecore/libopiecore2.control b/libopie2/opiecore/libopiecore2.control index 7dec1b9..956d24f 100644 --- a/libopie2/opiecore/libopiecore2.control +++ b/libopie2/opiecore/libopiecore2.control | |||
@@ -3,9 +3,9 @@ Files: $OPIEDIR/lib/libopiecore2.so.* | |||
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/system | 4 | Section: opie/system |
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | Maintainer: Opie Team <opie@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: 1.8.1-$SUB_VERSION.2 | 7 | Version: 1.8.2-$SUB_VERSION.2 |
8 | Depends: libqpe1 | 8 | Depends: libqpe1 |
9 | Provides: libopiecore2 | 9 | Provides: libopiecore2 |
10 | Description: Opie library 2.0 CORE | 10 | Description: Opie library 2.0 CORE |
11 | 11 | ||
diff --git a/libopie2/opiecore/oconfig.cpp b/libopie2/opiecore/oconfig.cpp index dc4d0b3..fb5eabb 100644 --- a/libopie2/opiecore/oconfig.cpp +++ b/libopie2/opiecore/oconfig.cpp | |||
@@ -38,14 +38,16 @@ | |||
38 | 38 | ||
39 | #include <opie2/oconfig.h> | 39 | #include <opie2/oconfig.h> |
40 | 40 | ||
41 | OConfig::OConfig( const QString &name, Domain domain ) | 41 | OConfig::OConfig( const QString &name, Domain domain ) |
42 | :OpieConfig( name, domain ) | 42 | :Config( name, domain ) |
43 | { | 43 | { |
44 | qDebug( "OConfig::OConfig()" ); | ||
44 | } | 45 | } |
45 | 46 | ||
46 | OConfig::~OConfig() | 47 | OConfig::~OConfig() |
47 | { | 48 | { |
49 | qDebug( "OConfig::~OConfig()" ); | ||
48 | } | 50 | } |
49 | 51 | ||
50 | QColor OConfig::readColorEntry( const QString& key, const QColor* pDefault ) const | 52 | QColor OConfig::readColorEntry( const QString& key, const QColor* pDefault ) const |
51 | { | 53 | { |
diff --git a/libopie2/opiecore/oconfig.h b/libopie2/opiecore/oconfig.h index 75aa170..444d280 100644 --- a/libopie2/opiecore/oconfig.h +++ b/libopie2/opiecore/oconfig.h | |||
@@ -34,9 +34,9 @@ | |||
34 | 34 | ||
35 | //FIXME: Implement for X11 or reuse libqpe/Config there also? | 35 | //FIXME: Implement for X11 or reuse libqpe/Config there also? |
36 | //FIXME: Or rather use QSettings also for libqpe? | 36 | //FIXME: Or rather use QSettings also for libqpe? |
37 | 37 | ||
38 | #include "opieconfig.h" | 38 | #include <qpe/config.h> |
39 | 39 | ||
40 | class QColor; | 40 | class QColor; |
41 | class QFont; | 41 | class QFont; |
42 | 42 | ||
@@ -44,9 +44,9 @@ class QFont; | |||
44 | * A Configuration class based on the Qtopia @ref Config class | 44 | * A Configuration class based on the Qtopia @ref Config class |
45 | * featuring additional handling of color and font entries | 45 | * featuring additional handling of color and font entries |
46 | */ | 46 | */ |
47 | 47 | ||
48 | class OConfig : public OpieConfig | 48 | class OConfig : public Config |
49 | { | 49 | { |
50 | public: | 50 | public: |
51 | /** | 51 | /** |
52 | * Constructs a OConfig object with a @a name. | 52 | * Constructs a OConfig object with a @a name. |
@@ -62,9 +62,9 @@ class OConfig : public OpieConfig | |||
62 | /** | 62 | /** |
63 | * @returns the name of the current group. | 63 | * @returns the name of the current group. |
64 | * The current group is used for searching keys and accessing entries. | 64 | * The current group is used for searching keys and accessing entries. |
65 | */ | 65 | */ |
66 | const QString& group() { return OpieConfig::group(); }; | 66 | const QString& group() { return git.key(); }; |
67 | /** | 67 | /** |
68 | * @returns a @ref QColor entry or a @a default value if the key is not found. | 68 | * @returns a @ref QColor entry or a @a default value if the key is not found. |
69 | */ | 69 | */ |
70 | QColor readColorEntry( const QString& key, const QColor* pDefault ) const; | 70 | QColor readColorEntry( const QString& key, const QColor* pDefault ) const; |
diff --git a/libopie2/opiecore/odebug.cpp b/libopie2/opiecore/odebug.cpp index b2a37bc..4505ce7 100644 --- a/libopie2/opiecore/odebug.cpp +++ b/libopie2/opiecore/odebug.cpp | |||
@@ -1,10 +1,9 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | (C) 2003 Michael 'Mickey' Lauer (mickey@tm.informatik.uni-frankfurt.de) | 3 | (C) 2003 Michael 'Mickey' Lauer (mickey@tm.informatik.uni-frankfurt.de) |
4 | Inspired by the KDE debug classes, which are | ||
5 | (C) 1997 Matthias Kalle Dalheimer (kalle@kde.org) | ||
6 | (C) 2002 Holger Freyther (freyther@kde.org) | 4 | (C) 2002 Holger Freyther (freyther@kde.org) |
5 | (C) 1997 Matthias Kalle Dalheimer (kalle@kde.org) | ||
7 | =. | 6 | =. |
8 | .=l. | 7 | .=l. |
9 | .>+-= | 8 | .>+-= |
10 | _;:, .> :=|. This program is free software; you can | 9 | _;:, .> :=|. This program is free software; you can |
diff --git a/libopie2/opiecore/oglobal.cpp b/libopie2/opiecore/oglobal.cpp index f6071be..ae2fcb6 100644 --- a/libopie2/opiecore/oglobal.cpp +++ b/libopie2/opiecore/oglobal.cpp | |||
@@ -29,8 +29,15 @@ | |||
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <opie2/oglobal.h> | 31 | #include <opie2/oglobal.h> |
32 | 32 | ||
33 | OConfig* OGlobal::_config = 0; | ||
34 | |||
33 | OConfig* OGlobal::config() | 35 | OConfig* OGlobal::config() |
34 | { | 36 | { |
35 | return globalconfig; | 37 | if ( !OGlobal::_config ) |
38 | { | ||
39 | qDebug( "OGlobal::creating global configuration instance." ); | ||
40 | OGlobal::_config = new OConfig( "global" ); | ||
41 | } | ||
42 | return OGlobal::_config; | ||
36 | } | 43 | } |
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,8 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | 3 | Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de> | |
4 | Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> | ||
5 | =. | 4 | =. |
6 | .=l. | 5 | .=l. |
7 | .>+-= | 6 | .>+-= |
8 | _;:, .> :=|. This program is free software; you can | 7 | _;:, .> :=|. This program is free software; you can |
@@ -30,20 +29,21 @@ | |||
30 | 29 | ||
31 | #ifndef OGLOBAL_H | 30 | #ifndef OGLOBAL_H |
32 | #define OGLOBAL_H | 31 | #define OGLOBAL_H |
33 | 32 | ||
34 | #include <qpe/global.h> | ||
35 | #include <opie2/oconfig.h> | 33 | #include <opie2/oconfig.h> |
36 | 34 | ||
37 | static OConfig *globalconfig = new OConfig( "global" ); | 35 | //FIXME Is it wise or even necessary to inherit OGlobal from Global? |
38 | 36 | // once we totally skip libqpe it should ideally swallow Global -zecke | |
39 | //FIXME: Is it wise or even necessary to inherit OGlobal from Global? | 37 | // You're right. I deleted global as the base class. -mickeyl |
40 | // once we totally skip libqpe it should ideally swallow Global -zecke | ||
41 | 38 | ||
42 | class OGlobal : public Global | 39 | class OGlobal |
43 | { | 40 | { |
44 | public: | 41 | public: |
45 | // do we want to put that into OApplication as in KApplication -zecke | 42 | //FIXME Do we want to put that into OApplication as in KApplication? -zecke |
43 | // We already have a per-application config in OApplication | ||
44 | // ( accessed through oApp->config() ), but this one is the global one! -mickeyl | ||
46 | static OConfig* config(); | 45 | static OConfig* config(); |
46 | static OConfig* _config; | ||
47 | }; | 47 | }; |
48 | 48 | ||
49 | #endif // OGLOBAL_H | 49 | #endif // OGLOBAL_H |
diff --git a/libopie2/opiecore/oglobalsettings.cpp b/libopie2/opiecore/oglobalsettings.cpp index 1799529..66adbd0 100644 --- a/libopie2/opiecore/oglobalsettings.cpp +++ b/libopie2/opiecore/oglobalsettings.cpp | |||
@@ -37,8 +37,9 @@ | |||
37 | #include <opie2/oglobal.h> | 37 | #include <opie2/oglobal.h> |
38 | 38 | ||
39 | /* QT */ | 39 | /* QT */ |
40 | 40 | ||
41 | #include <qobject.h> | ||
41 | #include <qdir.h> | 42 | #include <qdir.h> |
42 | #include <qpixmap.h> | 43 | #include <qpixmap.h> |
43 | #include <qfontinfo.h> | 44 | #include <qfontinfo.h> |
44 | 45 | ||
diff --git a/libopie2/opiecore/opiecore.pro b/libopie2/opiecore/opiecore.pro index fe5800e..5d630ea 100644 --- a/libopie2/opiecore/opiecore.pro +++ b/libopie2/opiecore/opiecore.pro | |||
@@ -24,9 +24,9 @@ SOURCES = oapplication.cpp \ | |||
24 | oglobalsettings.cpp | 24 | oglobalsettings.cpp |
25 | 25 | ||
26 | INTERFACES = | 26 | INTERFACES = |
27 | TARGET = opiecore2 | 27 | TARGET = opiecore2 |
28 | VERSION = 1.8.1 | 28 | VERSION = 1.8.2 |
29 | INCLUDEPATH += $(OPIEDIR)/include | 29 | INCLUDEPATH += $(OPIEDIR)/include |
30 | DEPENDPATH += $(OPIEDIR)/include | 30 | DEPENDPATH += $(OPIEDIR)/include |
31 | MOC_DIR = moc | 31 | MOC_DIR = moc |
32 | OBJECTS_DIR = obj | 32 | OBJECTS_DIR = obj |