|
Lines 24-31
Link Here
|
| 24 |
#include "tdelocale.h" |
24 |
#include "tdelocale.h" |
| 25 |
#include "kcharsets.h" |
25 |
#include "kcharsets.h" |
| 26 |
#include "kiconloader.h" |
26 |
#include "kiconloader.h" |
|
|
27 |
#ifdef WITH_TDEHWLIB |
| 27 |
#include "tdehardwaredevices.h" |
28 |
#include "tdehardwaredevices.h" |
| 28 |
#include "tdenetworkconnections.h" |
29 |
#include "tdenetworkconnections.h" |
|
|
30 |
#endif |
| 29 |
#include "tdeaboutdata.h" |
31 |
#include "tdeaboutdata.h" |
| 30 |
#include "kstandarddirs.h" |
32 |
#include "kstandarddirs.h" |
| 31 |
#include "kdebug.h" |
33 |
#include "kdebug.h" |
|
Lines 72-79
Link Here
|
| 72 |
: _dirs (0L), |
74 |
: _dirs (0L), |
| 73 |
_config (0L), |
75 |
_config (0L), |
| 74 |
_iconLoader (0L), |
76 |
_iconLoader (0L), |
|
|
77 |
#ifdef WITH_TDEHWLIB |
| 75 |
_hardwaredevices (0L), |
78 |
_hardwaredevices (0L), |
| 76 |
_networkmanager (0L), |
79 |
_networkmanager (0L), |
|
|
80 |
#endif |
| 77 |
_name( name ), _aboutData( new TDEAboutData( name, "", 0 ) ), m_configReadOnly(false) |
81 |
_name( name ), _aboutData( new TDEAboutData( name, "", 0 ) ), m_configReadOnly(false) |
| 78 |
{ |
82 |
{ |
| 79 |
DEBUG_ADD |
83 |
DEBUG_ADD |
|
Lines 92-99
Link Here
|
| 92 |
: _dirs (0L), |
96 |
: _dirs (0L), |
| 93 |
_config (0L), |
97 |
_config (0L), |
| 94 |
_iconLoader (0L), |
98 |
_iconLoader (0L), |
|
|
99 |
#ifdef WITH_TDEHWLIB |
| 95 |
_hardwaredevices (0L), |
100 |
_hardwaredevices (0L), |
| 96 |
_networkmanager (0L), |
101 |
_networkmanager (0L), |
|
|
102 |
#endif |
| 97 |
_name( aboutData->appName() ), _aboutData( aboutData ), m_configReadOnly(false) |
103 |
_name( aboutData->appName() ), _aboutData( aboutData ), m_configReadOnly(false) |
| 98 |
{ |
104 |
{ |
| 99 |
DEBUG_ADD |
105 |
DEBUG_ADD |
|
Lines 113-120
Link Here
|
| 113 |
: _dirs ( src->_dirs ), |
119 |
: _dirs ( src->_dirs ), |
| 114 |
_config ( src->_config ), |
120 |
_config ( src->_config ), |
| 115 |
_iconLoader ( src->_iconLoader ), |
121 |
_iconLoader ( src->_iconLoader ), |
|
|
122 |
#ifdef WITH_TDEHWLIB |
| 116 |
_hardwaredevices ( src->_hardwaredevices ), |
123 |
_hardwaredevices ( src->_hardwaredevices ), |
| 117 |
_networkmanager ( src->_networkmanager ), |
124 |
_networkmanager ( src->_networkmanager ), |
|
|
125 |
#endif |
| 118 |
_name( src->_name ), _aboutData( src->_aboutData ), m_configReadOnly(false) |
126 |
_name( src->_name ), _aboutData( src->_aboutData ), m_configReadOnly(false) |
| 119 |
{ |
127 |
{ |
| 120 |
DEBUG_ADD |
128 |
DEBUG_ADD |
|
Lines 133-140
Link Here
|
| 133 |
src->_dirs = 0L; |
141 |
src->_dirs = 0L; |
| 134 |
src->_config = 0L; |
142 |
src->_config = 0L; |
| 135 |
src->_iconLoader = 0L; |
143 |
src->_iconLoader = 0L; |
|
|
144 |
#ifdef WITH_TDEHWLIB |
| 136 |
src->_hardwaredevices = 0L; |
145 |
src->_hardwaredevices = 0L; |
| 137 |
src->_networkmanager = 0L; |
146 |
src->_networkmanager = 0L; |
|
|
147 |
#endif |
| 138 |
src->_aboutData = 0L; |
148 |
src->_aboutData = 0L; |
| 139 |
delete src; |
149 |
delete src; |
| 140 |
} |
150 |
} |
|
Lines 153-163
Link Here
|
| 153 |
delete _iconLoader; |
163 |
delete _iconLoader; |
| 154 |
_iconLoader = 0; |
164 |
_iconLoader = 0; |
| 155 |
|
165 |
|
|
|
166 |
#ifdef WITH_TDEHWLIB |
| 156 |
delete _hardwaredevices; |
167 |
delete _hardwaredevices; |
| 157 |
_hardwaredevices = 0; |
168 |
_hardwaredevices = 0; |
| 158 |
|
169 |
|
| 159 |
delete _networkmanager; |
170 |
delete _networkmanager; |
| 160 |
_networkmanager = 0; |
171 |
_networkmanager = 0; |
|
|
172 |
#endif |
| 161 |
|
173 |
|
| 162 |
// delete _config; // Do not delete, stored in d->sharedConfig |
174 |
// delete _config; // Do not delete, stored in d->sharedConfig |
| 163 |
_config = 0; |
175 |
_config = 0; |
|
Lines 270-275
Link Here
|
| 270 |
return _iconLoader; |
282 |
return _iconLoader; |
| 271 |
} |
283 |
} |
| 272 |
|
284 |
|
|
|
285 |
#ifdef WITH_TDEHWLIB |
| 273 |
TDEHardwareDevices *TDEInstance::hardwareDevices() const |
286 |
TDEHardwareDevices *TDEInstance::hardwareDevices() const |
| 274 |
{ |
287 |
{ |
| 275 |
DEBUG_CHECK_ALIVE |
288 |
DEBUG_CHECK_ALIVE |
|
Lines 289-294
Link Here
|
| 289 |
|
302 |
|
| 290 |
return _networkmanager; |
303 |
return _networkmanager; |
| 291 |
} |
304 |
} |
|
|
305 |
#endif |
| 292 |
|
306 |
|
| 293 |
void TDEInstance::newIconLoader() const |
307 |
void TDEInstance::newIconLoader() const |
| 294 |
{ |
308 |
{ |