[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/libkopete/ui
From:       Patrick Spendrin <ps_ml () gmx ! de>
Date:       2009-10-15 12:59:19
Message-ID: 1255611559.765316.8428.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1035594 by sengels:

remove avdevice dependencies on windows

 M  +4 -0      avatarselectorwidget.cpp  
 M  +10 -0     avatarwebcamdialog.cpp  


--- trunk/KDE/kdenetwork/kopete/libkopete/ui/avatarselectorwidget.cpp #1035593:1035594
@@ -34,9 +34,11 @@
 #include <kpixmapregionselectordialog.h>
 
 #include "ui_avatarselectorwidget.h"
+#ifndef Q_OS_WIN
 #include "avdevice/videodevicepool.h"
 
 using namespace Kopete::AV;
+#endif
 
 namespace Kopete
 {
@@ -133,10 +135,12 @@
 	connect(d->mainWidget.buttonFromWebcam, SIGNAL(clicked()), this, SLOT(buttonFromWebcamClicked()));
 	connect(d->mainWidget.listUserAvatar, SIGNAL(itemClicked(QListWidgetItem*)),
 	        this, SLOT(listSelectionChanged(QListWidgetItem*)));
+#ifndef Q_OS_WIN
 	connect(Kopete::AvatarManager::self(), SIGNAL(avatarAdded(Kopete::AvatarManager::AvatarEntry)),
 	        this, SLOT(avatarAdded(Kopete::AvatarManager::AvatarEntry)));
 	connect(Kopete::AvatarManager::self(), SIGNAL(avatarRemoved(Kopete::AvatarManager::AvatarEntry)),
 	        this, SLOT(avatarRemoved(Kopete::AvatarManager::AvatarEntry)));
+#endif
 
 	// Add a "No Avatar" option
 	Kopete::AvatarManager::AvatarEntry empty;
--- trunk/KDE/kdenetwork/kopete/libkopete/ui/avatarwebcamdialog.cpp #1035593:1035594
@@ -24,7 +24,9 @@
 #include <klocale.h>
 
 // Kopete includes
+#ifndef Q_OS_WIN
 #include "avdevice/videodevicepool.h"
+#endif
 
 namespace Kopete
 {
@@ -44,7 +46,9 @@
 
 	Kopete::WebcamWidget *mainWidget;
 	QTimer *m_timer;
+#ifndef Q_OS_WIN
 	Kopete::AV::VideoDevicePool *m_devicePool;
+#endif
 	QPixmap lastPixmap;
 	QString selectedPath;
 	QString currentPath;
@@ -57,11 +61,13 @@
 	setCaption(i18n("Take a photo"));
 	setButtons(KDialog::Ok | KDialog::Cancel);
 
+#ifndef Q_OS_WIN
 	d->m_devicePool = Kopete::AV::VideoDevicePool::self();
 	d->m_devicePool->loadConfig();
 	d->m_devicePool->open();
 	d->m_devicePool->setSize(640, 480);
 	d->m_devicePool->startCapturing();
+#endif
 
 	d->m_timer = new QTimer( this );
 	connect( d->m_timer, SIGNAL(timeout()), this, SLOT(updateImage()));
@@ -75,8 +81,10 @@
 void AvatarWebcamDialog::updateImage()
 {
 	QImage image = QImage();
+#ifndef Q_OS_WIN
 	d->m_devicePool->getFrame();
 	d->m_devicePool->getImage(&image);
+#endif
 	d->lastPixmap = QPixmap::fromImage(image.mirrored(false,false));//There is a better way of do this?
 	d->mainWidget->updatePixmap(d->lastPixmap);
 }
@@ -88,7 +96,9 @@
 
 void AvatarWebcamDialog::slotButtonClicked(int button)
 {
+#ifndef Q_OS_WIN
 	d->m_devicePool->close();
+#endif
 	KDialog::slotButtonClicked(button);
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]