Cleaned out usages of removed or to be removed APIs.

Change-Id: Iabbada23d010ac0fdf99f88af3f109f94814b5ea
Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>

6 files changed, 6 insertions, 23 deletions

diff --git a/src/plugins/platforms/wayland/qwaylanddecoration.cpp b/src/plugins/platforms/wayland/qwaylanddecoration.cpp
index 955a53ef3..9cd7a1e23 100644
--- a/src/plugins/platforms/wayland/qwaylanddecoration.cpp
+++ b/src/plugins/platforms/wayland/qwaylanddecoration.cpp
@@ -97,7 +97,7 @@ void QWaylandDecoration::paint(QPaintDevice *device)
     }
 
 
-    QString windowTitleText = window()->windowTitle();
+    QString windowTitleText = window()->title();
     if (!windowTitleText.isEmpty()) {
         if (m_windowTitle.text() != windowTitleText) {
             m_windowTitle.setText(windowTitleText);
diff --git a/src/plugins/platforms/wayland/qwaylandextendedsurface.cpp b/src/plugins/platforms/wayland/qwaylandextendedsurface.cpp
index 3a6d6efcd..0f30fcf26 100644
--- a/src/plugins/platforms/wayland/qwaylandextendedsurface.cpp
+++ b/src/plugins/platforms/wayland/qwaylandextendedsurface.cpp
@@ -110,11 +110,6 @@ static int32_t waylandRotationFromScreenOrientation(Qt::ScreenOrientation orient
     }
 }
 
-void QWaylandExtendedSurface::setWindowOrientation(Qt::ScreenOrientation orientation)
-{
-    wl_extended_surface_set_window_orientation(m_extended_surface, waylandRotationFromScreenOrientation(orientation));
-}
-
 void QWaylandExtendedSurface::setContentOrientation(Qt::ScreenOrientation orientation)
 {
     wl_extended_surface_set_content_orientation(m_extended_surface, waylandRotationFromScreenOrientation(orientation));
diff --git a/src/plugins/platforms/wayland/qwaylandextendedsurface.h b/src/plugins/platforms/wayland/qwaylandextendedsurface.h
index 67b51d30e..9588dfbba 100644
--- a/src/plugins/platforms/wayland/qwaylandextendedsurface.h
+++ b/src/plugins/platforms/wayland/qwaylandextendedsurface.h
@@ -66,7 +66,6 @@ class QWaylandExtendedSurface
 public:
     QWaylandExtendedSurface(QWaylandWindow *window, struct wl_extended_surface *extended_surface);
 
-    void setWindowOrientation(Qt::ScreenOrientation orientation);
     void setContentOrientation(Qt::ScreenOrientation orientation);
 
     void updateGenericProperty(const QString &name, const QVariant &value);
diff --git a/src/plugins/platforms/wayland/qwaylandshellsurface.cpp b/src/plugins/platforms/wayland/qwaylandshellsurface.cpp
index f9a3ee532..60176ef88 100644
--- a/src/plugins/platforms/wayland/qwaylandshellsurface.cpp
+++ b/src/plugins/platforms/wayland/qwaylandshellsurface.cpp
@@ -95,7 +95,7 @@ void QWaylandShellSurface::updateTransientParent(QWindow *parent)
     }
 
     uint32_t flags = 0;
-    Qt::WindowFlags wf = m_window->window()->windowFlags();
+    Qt::WindowFlags wf = m_window->window()->flags();
     if (wf.testFlag(Qt::ToolTip)
             || wf.testFlag(Qt::WindowTransparentForInput))
         flags |= WL_SHELL_SURFACE_TRANSIENT_INACTIVE;
diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp
index b41db4d17..8bb135675 100644
--- a/src/plugins/platforms/wayland/qwaylandwindow.cpp
+++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp
@@ -102,7 +102,7 @@ QWaylandWindow::QWaylandWindow(QWindow *window)
         mShellSurface->setTopLevel();
     }
 
-    setWindowFlags(window->windowFlags());
+    setWindowFlags(window->flags());
 }
 
 QWaylandWindow::~QWaylandWindow()
@@ -282,22 +282,12 @@ void QWaylandWindow::handleContentOrientationChange(Qt::ScreenOrientation orient
         mExtendedWindow->setContentOrientation(orientation);
 }
 
-Qt::ScreenOrientation QWaylandWindow::requestWindowOrientation(Qt::ScreenOrientation orientation)
-{
-    if (mExtendedWindow) {
-        mExtendedWindow->setWindowOrientation(orientation);
-        return orientation;
-    }
-
-    return Qt::PrimaryOrientation;
-}
-
 void QWaylandWindow::setWindowState(Qt::WindowState state)
 {
     if (state == Qt::WindowFullScreen || state == Qt::WindowMaximized) {
         QScreen *screen = window()->screen();
 
-        QRect geometry = screen->mapBetween(window()->windowOrientation(), screen->primaryOrientation(), screen->geometry());
+        QRect geometry = screen->geometry();
         setGeometry(geometry);
 
         QWindowSystemInterface::handleGeometryChange(window(), geometry);
@@ -313,7 +303,7 @@ void QWaylandWindow::setWindowFlags(Qt::WindowFlags flags)
 bool QWaylandWindow::createDecoration()
 {
     bool decoration = false;
-    switch (window()->windowType()) {
+    switch (window()->type()) {
         case Qt::Window:
         case Qt::Widget:
         case Qt::Dialog:
@@ -324,7 +314,7 @@ bool QWaylandWindow::createDecoration()
         default:
             break;
     }
-    if (window()->windowFlags() & Qt::FramelessWindowHint) {
+    if (window()->flags() & Qt::FramelessWindowHint) {
         decoration = false;
     }
 
diff --git a/src/plugins/platforms/wayland/qwaylandwindow.h b/src/plugins/platforms/wayland/qwaylandwindow.h
index cd1e860eb..3accd3ca8 100644
--- a/src/plugins/platforms/wayland/qwaylandwindow.h
+++ b/src/plugins/platforms/wayland/qwaylandwindow.h
@@ -94,7 +94,6 @@ public:
     QWaylandSubSurface *subSurfaceWindow() const;
 
     void handleContentOrientationChange(Qt::ScreenOrientation orientation);
-    Qt::ScreenOrientation requestWindowOrientation(Qt::ScreenOrientation orientation);
 
     void setWindowState(Qt::WindowState state);
     void setWindowFlags(Qt::WindowFlags flags);