diff options
| author |  Fabio Bas | 2010-07-07 16:33:39 +0000 |
|---|---|---|
| committer | Fabio Bas | 2010-07-07 16:33:39 +0000 |
| commit | 5aed49f36f1eaf049985d9b2aa8d2a8beb2a2c83 (patch) | |
| tree | 2c2711fde5bca3fc6256e055baeef5dbad1a2c44 /src/kvilib/ext/avdevice/videodevicepool.cpp | |
| parent | fixed smart nick color propagation, thanks again to DarthGandalf (diff) | |
| download | KVIrc-5aed49f36f1eaf049985d9b2aa8d2a8beb2a2c83.tar.gz KVIrc-5aed49f36f1eaf049985d9b2aa8d2a8beb2a2c83.tar.bz2 KVIrc-5aed49f36f1eaf049985d9b2aa8d2a8beb2a2c83.zip | |
fix for #839
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4632 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/kvilib/ext/avdevice/videodevicepool.cpp')
| -rw-r--r-- | src/kvilib/ext/avdevice/videodevicepool.cpp | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/src/kvilib/ext/avdevice/videodevicepool.cpp b/src/kvilib/ext/avdevice/videodevicepool.cpp index afc5ddb83..bc1b3d17a 100644 --- a/src/kvilib/ext/avdevice/videodevicepool.cpp +++ b/src/kvilib/ext/avdevice/videodevicepool.cpp @@ -23,21 +23,22 @@ #include <cerrno> #include <cstring> -#include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> -#include <kconfig.h> -#include <kconfiggroup.h> -#include <qdir.h> -#include <solid/device.h> -#include <solid/devicenotifier.h> -#include <solid/deviceinterface.h> -#include <solid/video.h> - +#include <QDir> +#include <QDebug> #include "videodevice.h" #include "videodevicepool.h" +#ifdef COMPILE_KDE_SUPPORT + #include <klocale.h> + #include <kglobal.h> + #include <kconfig.h> + #include <kconfiggroup.h> + #include <solid/devicenotifier.h> + #include <solid/deviceinterface.h> + #include <solid/video.h> +#endif + #define CLEAR(x) memset (&(x), 0, sizeof (x)) namespace Kopete { @@ -594,6 +595,7 @@ int VideoDevicePool::inputs() */ int VideoDevicePool::getSavedDevice() { +#ifdef COMPILE_KDE_SUPPORT qDebug() << "called"; if (m_videodevices.size()) { @@ -618,6 +620,7 @@ int VideoDevicePool::getSavedDevice() else qDebug() << "No device saved."; } +#endif return -1; } @@ -629,6 +632,7 @@ int VideoDevicePool::getSavedDevice() */ void VideoDevicePool::loadDeviceConfig() { +#ifdef COMPILE_KDE_SUPPORT qDebug() << "called"; if ((m_current_device >= 0) && (m_current_device < m_videodevices.size())) { @@ -671,6 +675,7 @@ void VideoDevicePool::loadDeviceConfig() } } /* TODO: load and apply signal standard */ +#endif } /*! @@ -681,6 +686,7 @@ void VideoDevicePool::loadDeviceConfig() */ void VideoDevicePool::saveCurrentDeviceConfig() { +#ifdef COMPILE_KDE_SUPPORT qDebug() << "called"; if ((m_current_device >= 0) && (m_current_device < m_videodevices.size())) { @@ -763,6 +769,7 @@ void VideoDevicePool::saveCurrentDeviceConfig() config.sync(); } /* TODO: save signal standard */ +#endif } void VideoDevicePool::deviceAdded( const QString & udi ) |