-rw-r--r-- | libopie2/opiecore/oglobal.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libopie2/opiecore/oglobal.cpp b/libopie2/opiecore/oglobal.cpp index 2968a7d..706ac6c 100644 --- a/libopie2/opiecore/oglobal.cpp +++ b/libopie2/opiecore/oglobal.cpp | |||
@@ -63,34 +63,35 @@ static char Base64DecMap[128] = | |||
63 | 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, | 63 | 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, |
64 | 0x3C, 0x3D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 64 | 0x3C, 0x3D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
65 | 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, | 65 | 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, |
66 | 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, | 66 | 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, |
67 | 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, | 67 | 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, |
68 | 0x17, 0x18, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, | 68 | 0x17, 0x18, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, |
69 | 0x00, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, | 69 | 0x00, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, |
70 | 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, | 70 | 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, |
71 | 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, | 71 | 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, |
72 | 0x31, 0x32, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00 | 72 | 0x31, 0x32, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00 |
73 | }; | 73 | }; |
74 | 74 | ||
75 | 75 | ||
76 | OConfig* OGlobal::_config = 0; | 76 | OConfig* OGlobal::_config = 0; |
77 | OConfig* OGlobal::_qpe_config = 0; | 77 | OConfig* OGlobal::_qpe_config = 0; |
78 | 78 | ||
79 | void OGlobal::clean_up() { | 79 | void OGlobal::clean_up() |
80 | qWarning( "Oglobal clean up" ); | 80 | { |
81 | qDebug( "Oglobal clean up" ); | ||
81 | delete OGlobal::_config; | 82 | delete OGlobal::_config; |
82 | delete OGlobal::_qpe_config; | 83 | delete OGlobal::_qpe_config; |
83 | OGlobal::_config = 0; | 84 | OGlobal::_config = 0; |
84 | OGlobal::_qpe_config = 0; | 85 | OGlobal::_qpe_config = 0; |
85 | } | 86 | } |
86 | 87 | ||
87 | OConfig* OGlobal::config() | 88 | OConfig* OGlobal::config() |
88 | { | 89 | { |
89 | if ( !OGlobal::_config ) | 90 | if ( !OGlobal::_config ) |
90 | { | 91 | { |
91 | // odebug classes are reading config, so can't use them here! | 92 | // odebug classes are reading config, so can't use them here! |
92 | qAddPostRoutine( OGlobal::clean_up ); | 93 | qAddPostRoutine( OGlobal::clean_up ); |
93 | qDebug( "OGlobal::creating global configuration instance." ); | 94 | qDebug( "OGlobal::creating global configuration instance." ); |
94 | OGlobal::_config = new OConfig( "global" ); | 95 | OGlobal::_config = new OConfig( "global" ); |
95 | } | 96 | } |
96 | return OGlobal::_config; | 97 | return OGlobal::_config; |