From 05eb5da1c80411242947a604fa41eaab7a0bd48f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Thu, 1 Mar 2012 13:11:01 +0100
Subject: [PATCH] Get rid of warnings in compositor source.
Change-Id: I8977e370e1036bf1722b5e88fc6cc3ade9a2d9a9
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
---
.../wayland_egl/waylandeglintegration.cpp | 2 ++
src/compositor/wayland_wrapper/wlcompositor.cpp | 2 --
src/compositor/wayland_wrapper/wldatadevice.cpp | 16 ++++++++++++++--
.../wayland_wrapper/wldatadevicemanager.cpp | 5 +++++
src/compositor/wayland_wrapper/wldataoffer.cpp | 5 ++++-
src/compositor/wayland_wrapper/wldatasource.cpp | 1 +
.../wayland_wrapper/wlextendedoutput.cpp | 1 +
.../wayland_wrapper/wlextendedsurface.cpp | 2 ++
src/compositor/wayland_wrapper/wlsubsurface.cpp | 10 ++++++++++
9 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/src/compositor/hardware_integration/wayland_egl/waylandeglintegration.cpp b/src/compositor/hardware_integration/wayland_egl/waylandeglintegration.cpp
index f8dfa398..c9bbbe14 100644
--- a/src/compositor/hardware_integration/wayland_egl/waylandeglintegration.cpp
+++ b/src/compositor/hardware_integration/wayland_egl/waylandeglintegration.cpp
@@ -215,6 +215,8 @@ bool WaylandEglIntegration::setDirectRenderSurface(WaylandSurface *surface)
if (client)
eglRequestClientBufferFormatWL(d->egl_display, client, buffer_format);
d->directRenderSurface = surface;
+#else
+ Q_UNUSED(surface);
#endif
return flipper;
}
diff --git a/src/compositor/wayland_wrapper/wlcompositor.cpp b/src/compositor/wayland_wrapper/wlcompositor.cpp
index 49694b5a..46bb1138 100644
--- a/src/compositor/wayland_wrapper/wlcompositor.cpp
+++ b/src/compositor/wayland_wrapper/wlcompositor.cpp
@@ -197,7 +197,6 @@ void Compositor::frameFinished(Surface *surface)
void Compositor::createSurface(struct wl_client *client, uint32_t id)
{
Surface *surface = new Surface(client,id, this);
- printf("Compositor::createSurface: %p %d\n", client, id);
m_surfaces << surface;
@@ -225,7 +224,6 @@ Surface *Compositor::getSurfaceFromWinId(uint winId) const
QImage Compositor::image(uint winId) const
{
- printf("Compositor::image(%x)\n", winId);
foreach (Surface *surface, m_surfaces) {
if (surface->id() == winId) {
return surface->image();
diff --git a/src/compositor/wayland_wrapper/wldatadevice.cpp b/src/compositor/wayland_wrapper/wldatadevice.cpp
index 99127efe..06c036ec 100644
--- a/src/compositor/wayland_wrapper/wldatadevice.cpp
+++ b/src/compositor/wayland_wrapper/wldatadevice.cpp
@@ -56,10 +56,15 @@ void DataDevice::start_drag(struct wl_client *client,
struct wl_resource *surface,
uint32_t time)
{
+ Q_UNUSED(client);
+ Q_UNUSED(surface);
+ Q_UNUSED(time);
+
DataDevice *data_device = static_cast<DataDevice *>(resource->data);
DataSource *data_source = static_cast<DataSource *>(source->data);
-
+ Q_UNUSED(data_device);
+ Q_UNUSED(data_source);
}
void DataDevice::attach(struct wl_client *client,
@@ -69,7 +74,12 @@ void DataDevice::attach(struct wl_client *client,
int32_t x,
int32_t y)
{
-
+ Q_UNUSED(client);
+ Q_UNUSED(resource);
+ Q_UNUSED(time);
+ Q_UNUSED(buffer);
+ Q_UNUSED(x);
+ Q_UNUSED(y);
}
void DataDevice::set_selection(struct wl_client *client,
@@ -77,6 +87,8 @@ void DataDevice::set_selection(struct wl_client *client,
struct wl_resource *source,
uint32_t time)
{
+ Q_UNUSED(client);
+ Q_UNUSED(time);
DataDevice *data_device = static_cast<DataDevice *>(data_device_resource->data);
DataSource *data_source = static_cast<DataSource *>(source->data);
diff --git a/src/compositor/wayland_wrapper/wldatadevicemanager.cpp b/src/compositor/wayland_wrapper/wldatadevicemanager.cpp
index 427dec25..b8c41719 100644
--- a/src/compositor/wayland_wrapper/wldatadevicemanager.cpp
+++ b/src/compositor/wayland_wrapper/wldatadevicemanager.cpp
@@ -186,11 +186,16 @@ struct wl_display *DataDeviceManager::display() const
void DataDeviceManager::bind_func_drag(struct wl_client *client, void *data, uint32_t version, uint32_t id)
{
+ Q_UNUSED(version);
wl_client_add_object(client,&wl_data_device_manager_interface,&drag_interface,id,data);
}
void DataDeviceManager::bind_func_data(struct wl_client *client, void *data, uint32_t version, uint32_t id)
{
+ Q_UNUSED(client);
+ Q_UNUSED(data);
+ Q_UNUSED(version);
+ Q_UNUSED(id);
}
void DataDeviceManager::get_data_device(struct wl_client *client,
diff --git a/src/compositor/wayland_wrapper/wldataoffer.cpp b/src/compositor/wayland_wrapper/wldataoffer.cpp
index 7523b489..e8fc1c7f 100644
--- a/src/compositor/wayland_wrapper/wldataoffer.cpp
+++ b/src/compositor/wayland_wrapper/wldataoffer.cpp
@@ -87,7 +87,10 @@ const struct wl_data_offer_interface DataOffer::data_interface = {
void DataOffer::accept(wl_client *client, wl_resource *resource, uint32_t time, const char *type)
{
-
+ Q_UNUSED(client);
+ Q_UNUSED(resource);
+ Q_UNUSED(time);
+ Q_UNUSED(type);
}
void DataOffer::receive(wl_client *client, wl_resource *resource, const char *mime_type, int32_t fd)
diff --git a/src/compositor/wayland_wrapper/wldatasource.cpp b/src/compositor/wayland_wrapper/wldatasource.cpp
index 96dd1970..8c82a618 100644
--- a/src/compositor/wayland_wrapper/wldatasource.cpp
+++ b/src/compositor/wayland_wrapper/wldatasource.cpp
@@ -99,6 +99,7 @@ void DataSource::offer(struct wl_client *client,
void DataSource::destroy(struct wl_client *client,
struct wl_resource *resource)
{
+ Q_UNUSED(client);
DataSource *self = static_cast<DataSource *>(resource->data);
delete self;
}
diff --git a/src/compositor/wayland_wrapper/wlextendedoutput.cpp b/src/compositor/wayland_wrapper/wlextendedoutput.cpp
index 64229157..a610da24 100644
--- a/src/compositor/wayland_wrapper/wlextendedoutput.cpp
+++ b/src/compositor/wayland_wrapper/wlextendedoutput.cpp
@@ -56,6 +56,7 @@ OutputExtensionGlobal::OutputExtensionGlobal(Compositor *compositor)
void OutputExtensionGlobal::bind_func(wl_client *client, void *data, uint32_t version, uint32_t id)
{
+ Q_UNUSED(version);
wl_client_add_object(client,&wl_output_extension_interface,&output_extension_interface,id,data);
}
diff --git a/src/compositor/wayland_wrapper/wlextendedsurface.cpp b/src/compositor/wayland_wrapper/wlextendedsurface.cpp
index 1baa6e9f..fe4e487a 100644
--- a/src/compositor/wayland_wrapper/wlextendedsurface.cpp
+++ b/src/compositor/wayland_wrapper/wlextendedsurface.cpp
@@ -195,6 +195,7 @@ QVariant ExtendedSurface::windowProperty(const QString &propertyName) const
void ExtendedSurface::setWindowProperty(const QString &name, const QVariant &value, bool writeUpdateToClient)
{
+ Q_UNUSED(writeUpdateToClient);
m_windowProperties.insert(name, value);
m_surface->waylandSurface()->windowPropertyChanged(name,value);
sendGenericProperty(name, value);
@@ -202,6 +203,7 @@ void ExtendedSurface::setWindowProperty(const QString &name, const QVariant &val
void ExtendedSurface::set_window_flags(wl_client *client, wl_resource *resource, int32_t flags)
{
+ Q_UNUSED(client);
ExtendedSurface *extended_surface = static_cast<ExtendedSurface *>(resource->data);
extended_surface->setWindowFlags(WaylandSurface::WindowFlags(flags));
}
diff --git a/src/compositor/wayland_wrapper/wlsubsurface.cpp b/src/compositor/wayland_wrapper/wlsubsurface.cpp
index d60d5cc4..ed3c0a9b 100644
--- a/src/compositor/wayland_wrapper/wlsubsurface.cpp
+++ b/src/compositor/wayland_wrapper/wlsubsurface.cpp
@@ -144,16 +144,26 @@ void SubSurface::attach_sub_surface(wl_client *client, wl_resource *sub_surface_
void SubSurface::move_sub_surface(wl_client *client, wl_resource *sub_surface_parent_resource, wl_resource *sub_surface_child_resource, int32_t x, int32_t y)
{
Q_UNUSED(client);
+ Q_UNUSED(x);
+ Q_UNUSED(y);
SubSurface *parent_sub_surface = static_cast<SubSurface *>(sub_surface_parent_resource->data);
SubSurface *child_sub_surface = static_cast<SubSurface *>(sub_surface_child_resource->data);
+ Q_UNUSED(parent_sub_surface);
+ Q_UNUSED(child_sub_surface);
}
void SubSurface::raise(wl_client *client, wl_resource *sub_surface_parent_resource, wl_resource *sub_surface_child_resource)
{
+ Q_UNUSED(client);
+ Q_UNUSED(sub_surface_parent_resource);
+ Q_UNUSED(sub_surface_child_resource);
}
void SubSurface::lower(wl_client *client, wl_resource *sub_surface_parent_resource, wl_resource *sub_surface_child_resource)
{
+ Q_UNUSED(client);
+ Q_UNUSED(sub_surface_parent_resource);
+ Q_UNUSED(sub_surface_child_resource);
}
const struct wl_sub_surface_interface SubSurface::sub_surface_interface = {
--
GitLab