yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix signal DataDeviceManager::dataSourceCreated

Browse source
This commit is contained in:
Martin Gräßlin 2014-11-06 10:07:58 +01:00
parent 421cfaafc3
commit ea7c4d36e4
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/wayland/autotests/client/test_datadevice.cpp
View file

@ -208,7 +208,7 @@ void TestDataDevice::testDrag()
auto deviceInterface = dataDeviceCreatedSpy.first().first().value<DataDeviceInterface*>(); auto deviceInterface = dataDeviceCreatedSpy.first().first().value<DataDeviceInterface*>();
QVERIFY(deviceInterface); QVERIFY(deviceInterface);
QSignalSpy dataSourceCreatedSpy(m_dataDeviceManagerInterface, SIGNAL(dataSourceCreated(DataSourceInterface*))); QSignalSpy dataSourceCreatedSpy(m_dataDeviceManagerInterface, SIGNAL(dataSourceCreated(KWayland::Server::DataSourceInterface*)));
QVERIFY(dataDeviceCreatedSpy.isValid()); QVERIFY(dataDeviceCreatedSpy.isValid());
QScopedPointer<DataSource> dataSource(m_dataDeviceManager->createDataSource()); QScopedPointer<DataSource> dataSource(m_dataDeviceManager->createDataSource());
@ -316,7 +316,7 @@ void TestDataDevice::testSetSelection()
auto deviceInterface = dataDeviceCreatedSpy.first().first().value<DataDeviceInterface*>(); auto deviceInterface = dataDeviceCreatedSpy.first().first().value<DataDeviceInterface*>();
QVERIFY(deviceInterface); QVERIFY(deviceInterface);
QSignalSpy dataSourceCreatedSpy(m_dataDeviceManagerInterface, SIGNAL(dataSourceCreated(DataSourceInterface*))); QSignalSpy dataSourceCreatedSpy(m_dataDeviceManagerInterface, SIGNAL(dataSourceCreated(KWayland::Server::DataSourceInterface*)));
QVERIFY(dataDeviceCreatedSpy.isValid()); QVERIFY(dataDeviceCreatedSpy.isValid());
QScopedPointer<DataSource> dataSource(m_dataDeviceManager->createDataSource()); QScopedPointer<DataSource> dataSource(m_dataDeviceManager->createDataSource());

10
src/wayland/autotests/client/test_datasource.cpp
View file

@ -131,7 +131,7 @@ void TestDataSource::testOffer()
using namespace KWayland::Client; using namespace KWayland::Client;
using namespace KWayland::Server; using namespace KWayland::Server;
QSignalSpy dataSourceCreatedSpy(m_dataDeviceManagerInterface, SIGNAL(dataSourceCreated(DataSourceInterface*))); QSignalSpy dataSourceCreatedSpy(m_dataDeviceManagerInterface, SIGNAL(dataSourceCreated(KWayland::Server::DataSourceInterface*)));
QVERIFY(dataSourceCreatedSpy.isValid()); QVERIFY(dataSourceCreatedSpy.isValid());
QScopedPointer<DataSource> dataSource(m_dataDeviceManager->createDataSource()); QScopedPointer<DataSource> dataSource(m_dataDeviceManager->createDataSource());
@ -193,7 +193,7 @@ void TestDataSource::testTargetAccepts()
using namespace KWayland::Client; using namespace KWayland::Client;
using namespace KWayland::Server; using namespace KWayland::Server;
QSignalSpy dataSourceCreatedSpy(m_dataDeviceManagerInterface, SIGNAL(dataSourceCreated(DataSourceInterface*))); QSignalSpy dataSourceCreatedSpy(m_dataDeviceManagerInterface, SIGNAL(dataSourceCreated(KWayland::Server::DataSourceInterface*)));
QVERIFY(dataSourceCreatedSpy.isValid()); QVERIFY(dataSourceCreatedSpy.isValid());
QScopedPointer<DataSource> dataSource(m_dataDeviceManager->createDataSource()); QScopedPointer<DataSource> dataSource(m_dataDeviceManager->createDataSource());
@ -218,7 +218,7 @@ void TestDataSource::testRequestSend()
using namespace KWayland::Client; using namespace KWayland::Client;
using namespace KWayland::Server; using namespace KWayland::Server;
QSignalSpy dataSourceCreatedSpy(m_dataDeviceManagerInterface, SIGNAL(dataSourceCreated(DataSourceInterface*))); QSignalSpy dataSourceCreatedSpy(m_dataDeviceManagerInterface, SIGNAL(dataSourceCreated(KWayland::Server::DataSourceInterface*)));
QVERIFY(dataSourceCreatedSpy.isValid()); QVERIFY(dataSourceCreatedSpy.isValid());
QScopedPointer<DataSource> dataSource(m_dataDeviceManager->createDataSource()); QScopedPointer<DataSource> dataSource(m_dataDeviceManager->createDataSource());
@ -250,7 +250,7 @@ void TestDataSource::testCancel()
using namespace KWayland::Client; using namespace KWayland::Client;
using namespace KWayland::Server; using namespace KWayland::Server;
QSignalSpy dataSourceCreatedSpy(m_dataDeviceManagerInterface, SIGNAL(dataSourceCreated(DataSourceInterface*))); QSignalSpy dataSourceCreatedSpy(m_dataDeviceManagerInterface, SIGNAL(dataSourceCreated(KWayland::Server::DataSourceInterface*)));
QVERIFY(dataSourceCreatedSpy.isValid()); QVERIFY(dataSourceCreatedSpy.isValid());
QScopedPointer<DataSource> dataSource(m_dataDeviceManager->createDataSource()); QScopedPointer<DataSource> dataSource(m_dataDeviceManager->createDataSource());
@ -272,7 +272,7 @@ void TestDataSource::testServerGet()
using namespace KWayland::Client; using namespace KWayland::Client;
using namespace KWayland::Server; using namespace KWayland::Server;
QSignalSpy dataSourceCreatedSpy(m_dataDeviceManagerInterface, SIGNAL(dataSourceCreated(DataSourceInterface*))); QSignalSpy dataSourceCreatedSpy(m_dataDeviceManagerInterface, SIGNAL(dataSourceCreated(KWayland::Server::DataSourceInterface*)));
QVERIFY(dataSourceCreatedSpy.isValid()); QVERIFY(dataSourceCreatedSpy.isValid());
QScopedPointer<DataSource> dataSource(m_dataDeviceManager->createDataSource()); QScopedPointer<DataSource> dataSource(m_dataDeviceManager->createDataSource());

2
src/wayland/datadevicemanager_interface.h
View file

@ -44,7 +44,7 @@ public:
bool isValid() const; bool isValid() const;
Q_SIGNALS: Q_SIGNALS:
void dataSourceCreated(DataSourceInterface*); void dataSourceCreated(KWayland::Server::DataSourceInterface*);
void dataDeviceCreated(KWayland::Server::DataDeviceInterface*); void dataDeviceCreated(KWayland::Server::DataDeviceInterface*);
private: private: