summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <olivier.blin@softathome.com>2014-11-25 18:00:41 +0100
committerOlivier Blin <qt@blino.org>2015-03-31 11:35:01 +0000
commita14699030735159f036930069af4df3a61abb163 (patch)
treeb4afe05f84d4795fb017e9f44bda80496b622f88
parent6b4db848c9898676074ea4bc601ac04196105ab1 (diff)
examples: remove unused windowDestroyed signal
Unused since commit fc439e40e37f9c0b3108225f951fb19bb3abee80 Rework the way buffers are used and rendered Also remove associated slots that are now empty in server-buffer. Change-Id: I33be0bc6a5e175553d28e9ead54fefd2f0c07ce0 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
-rw-r--r--examples/wayland/qml-compositor/main.cpp3
-rw-r--r--examples/wayland/server-buffer/compositor/main.cpp12
2 files changed, 0 insertions, 15 deletions
diff --git a/examples/wayland/qml-compositor/main.cpp b/examples/wayland/qml-compositor/main.cpp
index 9dcb95b09..fcfec30b2 100644
--- a/examples/wayland/qml-compositor/main.cpp
+++ b/examples/wayland/qml-compositor/main.cpp
@@ -84,7 +84,6 @@ public:
signals:
void windowAdded(QVariant window);
- void windowDestroyed(QVariant window);
void windowResized(QVariant window);
void fullscreenSurfaceChanged();
@@ -109,14 +108,12 @@ private slots:
QWaylandQuickSurface *surface = qobject_cast<QWaylandQuickSurface *>(sender());
if (surface == m_fullscreenSurface)
m_fullscreenSurface = 0;
- emit windowDestroyed(QVariant::fromValue(surface));
}
void surfaceDestroyed() {
QWaylandQuickSurface *surface = static_cast<QWaylandQuickSurface *>(sender());
if (surface == m_fullscreenSurface)
m_fullscreenSurface = 0;
- emit windowDestroyed(QVariant::fromValue(surface));
}
void sendCallbacks() {
diff --git a/examples/wayland/server-buffer/compositor/main.cpp b/examples/wayland/server-buffer/compositor/main.cpp
index 9f0108fa1..6d408b1b7 100644
--- a/examples/wayland/server-buffer/compositor/main.cpp
+++ b/examples/wayland/server-buffer/compositor/main.cpp
@@ -97,7 +97,6 @@ public:
signals:
void windowAdded(QVariant window);
- void windowDestroyed(QVariant window);
void windowResized(QVariant window);
void serverBufferItemCreated(QVariant);
void serverBuffersCreated();
@@ -115,16 +114,6 @@ private slots:
emit windowAdded(QVariant::fromValue(surface));
}
- void surfaceUnmapped() {
- QWaylandSurface *surface = qobject_cast<QWaylandSurface *>(sender());
- emit windowDestroyed(QVariant::fromValue(surface));
- }
-
- void surfaceDestroyed(QObject *object) {
- QWaylandSurface *surface = static_cast<QWaylandSurface *>(object);
- emit windowDestroyed(QVariant::fromValue(surface));
- }
-
void sendCallbacks() {
sendFrameCallbacks(surfaces());
}
@@ -213,7 +202,6 @@ protected:
void surfaceCreated(QWaylandSurface *surface) {
connect(surface, SIGNAL(mapped()), this, SLOT(surfaceMapped()));
- connect(surface,SIGNAL(unmapped()), this,SLOT(surfaceUnmapped()));
}
void share_buffer_bind_resource(Resource *resource) Q_DECL_OVERRIDE