diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-07 11:00:59 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-07 11:00:59 -0500 |
| commit | 89a87055f05e4802b96d91da490b5ec56decf8c0 (patch) | |
| tree | 23f32d104072d096d62b29629c2420417d3c386b /tdecore/tdeglobal.cpp | |
| parent | 72a2afc0afd917e93249d034b968079135588c7e (diff) | |
| parent | d227c416d00cc7774a247d0cdd5ca2c9058b87b3 (diff) | |
| download | tdelibs-89a87055f05e4802b96d91da490b5ec56decf8c0.tar.gz tdelibs-89a87055f05e4802b96d91da490b5ec56decf8c0.zip | |
Merge branch 'master' of https://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdecore/tdeglobal.cpp')
| -rw-r--r-- | tdecore/tdeglobal.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tdecore/tdeglobal.cpp b/tdecore/tdeglobal.cpp index f8639d526..8ef5f59db 100644 --- a/tdecore/tdeglobal.cpp +++ b/tdecore/tdeglobal.cpp @@ -34,8 +34,10 @@ #include <tdelocale.h> #include <kcharsets.h> #include <kiconloader.h> +#ifdef __TDE_HAVE_TDEHWLIB #include <tdehardwaredevices.h> #include <tdenetworkconnections.h> +#endif #include <kstandarddirs.h> #include <kinstance.h> #include "kstaticdeleter.h" @@ -81,6 +83,7 @@ TDEIconLoader *TDEGlobal::iconLoader() return _instance->iconLoader(); } +#ifdef __TDE_HAVE_TDEHWLIB TDEHardwareDevices *TDEGlobal::hardwareDevices() { MYASSERT(_instance); @@ -94,6 +97,7 @@ TDEGlobalNetworkManager *TDEGlobal::networkManager() return _instance->networkManager(); } +#endif TDEInstance *TDEGlobal::instance() { |