diff --git a/src/compositor/wayland_wrapper/qwldataoffer.cpp b/src/compositor/wayland_wrapper/qwldataoffer.cpp
index 7099a171f3689f9ed91b2e3faee03a0a0557423d..312e53858282acd7d2914002834fdd31f48b204d 100644
--- a/src/compositor/wayland_wrapper/qwldataoffer.cpp
+++ b/src/compositor/wayland_wrapper/qwldataoffer.cpp
@@ -55,7 +55,7 @@ DataOffer::DataOffer(DataSource *dataSource, QtWaylandServer::wl_data_device::Re
, m_dataSource(dataSource)
{
// FIXME: connect to dataSource and reset m_dataSource on destroy
- target->data_device->send_data_offer(target->handle, resource()->handle);
+ target->data_device_object->send_data_offer(target->handle, resource()->handle);
Q_FOREACH (const QString &mimeType, dataSource->mimeTypes()) {
send_offer(mimeType);
}
diff --git a/src/compositor/wayland_wrapper/qwldatasource.cpp b/src/compositor/wayland_wrapper/qwldatasource.cpp
index c0791d417da02a9e288b8633314dcc8ef22a995b..679693c32f448700e8fdaa48390fd0e0cc164bae 100644
--- a/src/compositor/wayland_wrapper/qwldatasource.cpp
+++ b/src/compositor/wayland_wrapper/qwldatasource.cpp
@@ -105,7 +105,7 @@ void DataSource::setDevice(DataDevice *device)
DataSource *DataSource::fromResource(struct ::wl_resource *resource)
{
- return static_cast<DataSource *>(Resource::fromResource(resource)->data_source);
+ return static_cast<DataSource *>(Resource::fromResource(resource)->data_source_object);
}
void DataSource::data_source_offer(Resource *, const QString &mime_type)
diff --git a/src/compositor/wayland_wrapper/qwlextendedoutput.cpp b/src/compositor/wayland_wrapper/qwlextendedoutput.cpp
index e376e0b48258d40faeb877d13d830a27f0e8e9c1..eb2de318a8d4bf049357fe5d6055ff3373ce6a33 100644
--- a/src/compositor/wayland_wrapper/qwlextendedoutput.cpp
+++ b/src/compositor/wayland_wrapper/qwlextendedoutput.cpp
@@ -115,7 +115,7 @@ void ExtendedOutput::sendOutputOrientation(Qt::ScreenOrientation orientation)
sendOperation = QT_EXTENDED_OUTPUT_ROTATION_PORTRAITORIENTATION;
}
- extended_output->send_set_screen_rotation(handle, sendOperation);
+ extended_output_object->send_set_screen_rotation(handle, sendOperation);
}
}
diff --git a/src/compositor/wayland_wrapper/qwlinputdevice_p.h b/src/compositor/wayland_wrapper/qwlinputdevice_p.h
index f98a4392766b08e6c2910b65aca1dd255c429fe3..35a2224b9d1d34a3eaa7d4a66982b8db2434c7f4 100644
--- a/src/compositor/wayland_wrapper/qwlinputdevice_p.h
+++ b/src/compositor/wayland_wrapper/qwlinputdevice_p.h
@@ -120,7 +120,7 @@ public:
static InputDevice *fromSeatResource(struct ::wl_resource *resource)
{
- return static_cast<InputDevice *>(wl_seat::Resource::fromResource(resource)->seat);
+ return static_cast<InputDevice *>(wl_seat::Resource::fromResource(resource)->seat_object);
}
QWaylandInputDevice::CapabilityFlags capabilities() { return m_capabilities; }
diff --git a/src/compositor/wayland_wrapper/qwlregion.cpp b/src/compositor/wayland_wrapper/qwlregion.cpp
index 69f382404664ad8eb192fa2e86dea5437d7692dd..fdbc5390d6aaa9e864d41fc2df7674799902bb8e 100644
--- a/src/compositor/wayland_wrapper/qwlregion.cpp
+++ b/src/compositor/wayland_wrapper/qwlregion.cpp
@@ -57,7 +57,7 @@ Region::~Region()
Region *Region::fromResource(struct ::wl_resource *resource)
{
- return static_cast<Region *>(Resource::fromResource(resource)->region);
+ return static_cast<Region *>(Resource::fromResource(resource)->region_object);
}
void Region::region_destroy_resource(Resource *)
diff --git a/src/compositor/wayland_wrapper/qwlsurface.cpp b/src/compositor/wayland_wrapper/qwlsurface.cpp
index 437789adbebe7ffa41f7e3488c0640eadef79e33..919e517dc36bf52a951035f736f6fc63762f6cf8 100644
--- a/src/compositor/wayland_wrapper/qwlsurface.cpp
+++ b/src/compositor/wayland_wrapper/qwlsurface.cpp
@@ -151,7 +151,7 @@ void Surface::releaseSurfaces()
Surface *Surface::fromResource(struct ::wl_resource *resource)
{
- return static_cast<Surface *>(Resource::fromResource(resource)->surface);
+ return static_cast<Surface *>(Resource::fromResource(resource)->surface_object);
}
QWaylandSurface::Type Surface::type() const
diff --git a/src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h b/src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h
index 20cf399b6e46f521334facfab2e14a06f789b8b9..a50c69009e3967cf4e91ac8aa4cdbfb7aaf55091 100644
--- a/src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h
+++ b/src/hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h
@@ -68,7 +68,7 @@ public:
QSize size() const { return mSize; }
- static XCompositeBuffer *fromResource(struct ::wl_resource *resource) { return static_cast<XCompositeBuffer*>(Resource::fromResource(resource)->buffer); }
+ static XCompositeBuffer *fromResource(struct ::wl_resource *resource) { return static_cast<XCompositeBuffer*>(Resource::fromResource(resource)->buffer_object); }
protected:
void buffer_destroy_resource(Resource *) Q_DECL_OVERRIDE;
diff --git a/src/qtwaylandscanner/qtwaylandscanner.cpp b/src/qtwaylandscanner/qtwaylandscanner.cpp
index 097813f3cde091d6e8e6b9e117af16671c610710..5ffb52f4ef6303a8033d454a5137b50502ec46a8 100644
--- a/src/qtwaylandscanner/qtwaylandscanner.cpp
+++ b/src/qtwaylandscanner/qtwaylandscanner.cpp
@@ -425,10 +425,10 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
printf(" class Resource\n");
printf(" {\n");
printf(" public:\n");
- printf(" Resource() : %s(0), handle(0) {}\n", interfaceNameStripped);
+ printf(" Resource() : %s_object(0), handle(0) {}\n", interfaceNameStripped);
printf(" virtual ~Resource() {}\n");
printf("\n");
- printf(" %s *%s;\n", interfaceName, interfaceNameStripped);
+ printf(" %s *%s_object;\n", interfaceName, interfaceNameStripped);
printf(" struct ::wl_resource *handle;\n");
printf("\n");
printf(" struct ::wl_client *client() const { return handle->client; }\n");
@@ -636,7 +636,7 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
printf(" void %s::destroy_func(struct ::wl_resource *client_resource)\n", interfaceName);
printf(" {\n");
printf(" Resource *resource = Resource::fromResource(client_resource);\n");
- printf(" %s *that = resource->%s;\n", interfaceName, interfaceNameStripped);
+ printf(" %s *that = resource->%s_object;\n", interfaceName, interfaceNameStripped);
printf(" that->m_resource_map.remove(resource->client(), resource);\n");
printf(" that->%s_destroy_resource(resource);\n", interfaceNameStripped);
printf(" delete resource;\n");
@@ -655,7 +655,7 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
printf(" %s::Resource *%s::bind(struct ::wl_client *client, uint32_t id)\n", interfaceName, interfaceName);
printf(" {\n");
printf(" Resource *resource = %s_allocate();\n", interfaceNameStripped);
- printf(" resource->%s = this;\n", interfaceNameStripped);
+ printf(" resource->%s_object = this;\n", interfaceNameStripped);
printf("\n");
printf(" struct ::wl_resource *handle = wl_resource_create(client, &::%s_interface, ::%s_interface.version, id);\n", interfaceName, interfaceName);
printf(" wl_resource_set_implementation(handle, %s, resource, destroy_func);", interfaceMember.constData());
@@ -699,7 +699,7 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
printf(" {\n");
printf(" Q_UNUSED(client);\n");
printf(" Resource *r = Resource::fromResource(resource);\n");
- printf(" static_cast<%s *>(r->%s)->%s_%s(\n", interfaceName, interfaceNameStripped, interfaceNameStripped, e.name.constData());
+ printf(" static_cast<%s *>(r->%s_object)->%s_%s(\n", interfaceName, interfaceNameStripped, interfaceNameStripped, e.name.constData());
printf(" r");
for (int i = 0; i < e.arguments.size(); ++i) {
printf(",\n");