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/kinstance.h | |
| 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/kinstance.h')
| -rw-r--r-- | tdecore/kinstance.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tdecore/kinstance.h b/tdecore/kinstance.h index be60c943c..e0fdf73de 100644 --- a/tdecore/kinstance.h +++ b/tdecore/kinstance.h @@ -18,6 +18,9 @@ #ifndef _KINSTANCE_H #define _KINSTANCE_H +#include <tqstring.h> +#include "tdelibs_export.h" + class TDEStandardDirs; class TDEAboutData; class TDEConfig; @@ -27,11 +30,10 @@ class TQFont; class TDEInstancePrivate; class KMimeSourceFactory; class TDESharedConfig; +#ifdef __TDE_HAVE_TDEHWLIB class TDEHardwareDevices; class TDEGlobalNetworkManager; - -#include <tqstring.h> -#include "tdelibs_export.h" +#endif /** @@ -110,6 +112,7 @@ class TDECORE_EXPORT TDEInstance */ TDEIconLoader *iconLoader() const; +#ifdef __TDE_HAVE_TDEHWLIB /** * Returns a TDEHardwareDevices object. * @return the hardwaredevices object. @@ -121,6 +124,7 @@ class TDECORE_EXPORT TDEInstance * @return the networkmanager object. */ TDEGlobalNetworkManager *networkManager() const; +#endif /** * Re-allocate the global iconloader. @@ -168,8 +172,10 @@ private: mutable TDEConfig *_config; mutable TDEIconLoader *_iconLoader; +#ifdef __TDE_HAVE_TDEHWLIB mutable TDEHardwareDevices *_hardwaredevices; mutable TDEGlobalNetworkManager *_networkmanager; +#endif mutable void *_placeholder; TQCString _name; |