diff options
| author | Timothy Pearson <[email protected]> | 2014-10-18 18:35:56 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2014-10-18 18:35:56 -0500 |
| commit | 891da4b83e901780ca4becb9b6f7c9cf0fb70ffd (patch) | |
| tree | b177b8ddddf3a0e73a86e482d88e0e188c601516 /kcontrol/displayconfig | |
| parent | 0c11ace605ba33feb137eca638a39c27a71e1d8d (diff) | |
| parent | d7ccc16037550f5dc9ba2db00e47ea950c3732d2 (diff) | |
| download | tdebase-891da4b83e901780ca4becb9b6f7c9cf0fb70ffd.tar.gz tdebase-891da4b83e901780ca4becb9b6f7c9cf0fb70ffd.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kcontrol/displayconfig')
| -rw-r--r-- | kcontrol/displayconfig/displayconfig.cpp | 7 | ||||
| -rw-r--r-- | kcontrol/displayconfig/displayconfig.h | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp index db371fc42..835b2598b 100644 --- a/kcontrol/displayconfig/displayconfig.cpp +++ b/kcontrol/displayconfig/displayconfig.cpp @@ -57,6 +57,9 @@ #include "displayconfig.h" using namespace std; +#ifdef __OpenBSD__ +#define abs __gnu_cxx::abs +#endif /**** DLL Interface ****/ typedef KGenericFactory<KDisplayConfig, TQWidget> KDisplayCFactory; @@ -742,8 +745,10 @@ void KDisplayConfig::setRealResolutionSliderValue(int index) { KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStringList &) : TDECModule(KDisplayCFactory::instance(), parent, name), iccTab(0), numberOfProfiles(0), numberOfScreens(0), m_randrsimple(0), activeProfileName(""), m_gammaApplyTimer(0) { +#ifdef __TDE_HAVE_TDEHWLIB TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); +#endif m_randrsimple = new KRandrSimpleAPI(); @@ -859,6 +864,7 @@ KDisplayConfig::~KDisplayConfig() } void KDisplayConfig::deviceChanged (TDEGenericDevice* device) { +#ifdef __TDE_HAVE_TDEHWLIB if (device->type() == TDEGenericDeviceType::Monitor) { if (base->rescanHardware->isEnabled()) { base->rescanHardware->setEnabled(false); @@ -866,6 +872,7 @@ void KDisplayConfig::deviceChanged (TDEGenericDevice* device) { base->rescanHardware->setEnabled(true); } } +#endif } void KDisplayConfig::updateExtendedMonitorInformation () { diff --git a/kcontrol/displayconfig/displayconfig.h b/kcontrol/displayconfig/displayconfig.h index a52ebb3fc..92fa1f421 100644 --- a/kcontrol/displayconfig/displayconfig.h +++ b/kcontrol/displayconfig/displayconfig.h @@ -35,7 +35,11 @@ #include <dcopobject.h> #include <libtderandr/libtderandr.h> +#ifdef __TDE_HAVE_TDEHWLIB #include <tdehardwaredevices.h> +#else +#define TDEGenericDevice void +#endif #include "monitorworkspace.h" #include "displayconfigbase.h" |