summaryrefslogtreecommitdiffstats
path: root/tdecore/kinstance.cpp
diff options
context:
space:
mode:
authorFrançois Andriot <francois.andriot@free.fr>2014-10-07 01:00:47 +0200
committerSlávek Banko <slavek.banko@axis.cz>2014-10-07 01:34:09 +0200
commit84e3f9e06ba1b6a050e838ca55970f018e81b749 (patch)
treec0b5c29503c24bba5339eab5191a692ddbb674dc /tdecore/kinstance.cpp
parente255a8ca6387cc1f100beffe39f889328e8f2a41 (diff)
downloadtdelibs-84e3f9e06ba1b6a050e838ca55970f018e81b749.tar.gz
tdelibs-84e3f9e06ba1b6a050e838ca55970f018e81b749.zip
Allow conditional build of tdehwlib
Diffstat (limited to 'tdecore/kinstance.cpp')
-rw-r--r--tdecore/kinstance.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/tdecore/kinstance.cpp b/tdecore/kinstance.cpp
index 6760c95a0..cbdf86783 100644
--- a/tdecore/kinstance.cpp
+++ b/tdecore/kinstance.cpp
@@ -24,8 +24,10 @@
#include "tdelocale.h"
#include "kcharsets.h"
#include "kiconloader.h"
+#ifdef __TDE_HAVE_TDEHWLIB
#include "tdehardwaredevices.h"
#include "tdenetworkconnections.h"
+#endif
#include "tdeaboutdata.h"
#include "kstandarddirs.h"
#include "kdebug.h"
@@ -72,8 +74,10 @@ TDEInstance::TDEInstance( const TQCString& name)
: _dirs (0L),
_config (0L),
_iconLoader (0L),
+#ifdef __TDE_HAVE_TDEHWLIB
_hardwaredevices (0L),
_networkmanager (0L),
+#endif
_name( name ), _aboutData( new TDEAboutData( name, "", 0 ) ), m_configReadOnly(false)
{
DEBUG_ADD
@@ -92,8 +96,10 @@ TDEInstance::TDEInstance( const TDEAboutData * aboutData )
: _dirs (0L),
_config (0L),
_iconLoader (0L),
+#ifdef __TDE_HAVE_TDEHWLIB
_hardwaredevices (0L),
_networkmanager (0L),
+#endif
_name( aboutData->appName() ), _aboutData( aboutData ), m_configReadOnly(false)
{
DEBUG_ADD
@@ -113,8 +119,10 @@ TDEInstance::TDEInstance( TDEInstance* src )
: _dirs ( src->_dirs ),
_config ( src->_config ),
_iconLoader ( src->_iconLoader ),
+#ifdef __TDE_HAVE_TDEHWLIB
_hardwaredevices ( src->_hardwaredevices ),
_networkmanager ( src->_networkmanager ),
+#endif
_name( src->_name ), _aboutData( src->_aboutData ), m_configReadOnly(false)
{
DEBUG_ADD
@@ -133,8 +141,10 @@ TDEInstance::TDEInstance( TDEInstance* src )
src->_dirs = 0L;
src->_config = 0L;
src->_iconLoader = 0L;
+#ifdef __TDE_HAVE_TDEHWLIB
src->_hardwaredevices = 0L;
src->_networkmanager = 0L;
+#endif
src->_aboutData = 0L;
delete src;
}
@@ -153,11 +163,13 @@ TDEInstance::~TDEInstance()
delete _iconLoader;
_iconLoader = 0;
+#ifdef __TDE_HAVE_TDEHWLIB
delete _hardwaredevices;
_hardwaredevices = 0;
delete _networkmanager;
_networkmanager = 0;
+#endif
// delete _config; // Do not delete, stored in d->sharedConfig
_config = 0;
@@ -270,6 +282,7 @@ TDEIconLoader *TDEInstance::iconLoader() const
return _iconLoader;
}
+#ifdef __TDE_HAVE_TDEHWLIB
TDEHardwareDevices *TDEInstance::hardwareDevices() const
{
DEBUG_CHECK_ALIVE
@@ -289,6 +302,7 @@ TDEGlobalNetworkManager *TDEInstance::networkManager() const
return _networkmanager;
}
+#endif
void TDEInstance::newIconLoader() const
{