Use namespace KWayland::Server instead of KWin::WaylandServer

It's no longer part of KWin.

src/wayland/autotests/client/test_wayland_connection_thread.cpp

@@ -40,7 +40,7 @@ private Q_SLOTS:
     void testConnectionThread();
 
 private:
-    KWin::WaylandServer::Display *m_display;
+    KWayland::Server::Display *m_display;
 };
 
 static const QString s_socketName = QStringLiteral("kwin-test-wayland-connection-0");
@@ -53,7 +53,7 @@ TestWaylandConnectionThread::TestWaylandConnectionThread(QObject *parent)
 
 void TestWaylandConnectionThread::init()
 {
-    using namespace KWin::WaylandServer;
+    using namespace KWayland::Server;
     delete m_display;
     m_display = new Display(this);
     QSignalSpy displayRunning(m_display, SIGNAL(runningChanged(bool)));

src/wayland/autotests/client/test_wayland_output.cpp

@@ -48,8 +48,8 @@ private Q_SLOTS:
     void testTransform();
 
 private:
-    KWin::WaylandServer::Display *m_display;
-    KWin::WaylandServer::OutputInterface *m_serverOutput;
+    KWayland::Server::Display *m_display;
+    KWayland::Server::OutputInterface *m_serverOutput;
     KWin::Wayland::ConnectionThread *m_connection;
     QThread *m_thread;
 };
@@ -67,7 +67,7 @@ TestWaylandOutput::TestWaylandOutput(QObject *parent)
 
 void TestWaylandOutput::init()
 {
-    using namespace KWin::WaylandServer;
+    using namespace KWayland::Server;
     delete m_display;
     m_display = new Display(this);
     m_display->setSocketName(s_socketName);
@@ -225,9 +225,9 @@ void TestWaylandOutput::testScaleChange()
 void TestWaylandOutput::testSubPixel_data()
 {
     using namespace KWin::Wayland;
-    using namespace KWin::WaylandServer;
+    using namespace KWayland::Server;
     QTest::addColumn<KWin::Wayland::Output::SubPixel>("expected");
-    QTest::addColumn<KWin::WaylandServer::OutputInterface::SubPixel>("actual");
+    QTest::addColumn<KWayland::Server::OutputInterface::SubPixel>("actual");
 
     QTest::newRow("none") << Output::SubPixel::None << OutputInterface::SubPixel::None;
     QTest::newRow("horizontal/rgb") << Output::SubPixel::HorizontalRGB << OutputInterface::SubPixel::HorizontalRGB;
@@ -239,7 +239,7 @@ void TestWaylandOutput::testSubPixel_data()
 void TestWaylandOutput::testSubPixel()
 {
     using namespace KWin::Wayland;
-    using namespace KWin::WaylandServer;
+    using namespace KWayland::Server;
     QFETCH(OutputInterface::SubPixel, actual);
     m_serverOutput->setSubPixel(actual);
 
@@ -274,9 +274,9 @@ void TestWaylandOutput::testSubPixel()
 void TestWaylandOutput::testTransform_data()
 {
     using namespace KWin::Wayland;
-    using namespace KWin::WaylandServer;
+    using namespace KWayland::Server;
     QTest::addColumn<KWin::Wayland::Output::Transform>("expected");
-    QTest::addColumn<KWin::WaylandServer::OutputInterface::Transform>("actual");
+    QTest::addColumn<KWayland::Server::OutputInterface::Transform>("actual");
 
     QTest::newRow("90")          << Output::Transform::Rotated90  << OutputInterface::Transform::Rotated90;
     QTest::newRow("180")         << Output::Transform::Rotated180 << OutputInterface::Transform::Rotated180;
@@ -290,7 +290,7 @@ void TestWaylandOutput::testTransform_data()
 void TestWaylandOutput::testTransform()
 {
     using namespace KWin::Wayland;
-    using namespace KWin::WaylandServer;
+    using namespace KWayland::Server;
     QFETCH(OutputInterface::Transform, actual);
     m_serverOutput->setTransform(actual);
 

src/wayland/autotests/client/test_wayland_registry.cpp

@@ -48,11 +48,11 @@ private Q_SLOTS:
     void testRemoval();
 
 private:
-    KWin::WaylandServer::Display *m_display;
-    KWin::WaylandServer::CompositorInterface *m_compositor;
-    KWin::WaylandServer::OutputInterface *m_output;
-    KWin::WaylandServer::SeatInterface *m_seat;
-    KWin::WaylandServer::ShellInterface *m_shell;
+    KWayland::Server::Display *m_display;
+    KWayland::Server::CompositorInterface *m_compositor;
+    KWayland::Server::OutputInterface *m_output;
+    KWayland::Server::SeatInterface *m_seat;
+    KWayland::Server::ShellInterface *m_shell;
 };
 
 static const QString s_socketName = QStringLiteral("kwin-test-wayland-registry-0");
@@ -69,7 +69,7 @@ TestWaylandRegistry::TestWaylandRegistry(QObject *parent)
 
 void TestWaylandRegistry::init()
 {
-    m_display = new KWin::WaylandServer::Display();
+    m_display = new KWayland::Server::Display();
     m_display->setSocketName(s_socketName);
     m_display->start();
     m_display->createShm();

src/wayland/autotests/client/test_wayland_seat.cpp

@@ -55,9 +55,9 @@ private Q_SLOTS:
     // TODO: add test for keymap
 
 private:
-    KWin::WaylandServer::Display *m_display;
-    KWin::WaylandServer::CompositorInterface *m_compositorInterface;
-    KWin::WaylandServer::SeatInterface *m_seatInterface;
+    KWayland::Server::Display *m_display;
+    KWayland::Server::CompositorInterface *m_compositorInterface;
+    KWayland::Server::SeatInterface *m_seatInterface;
     KWin::Wayland::ConnectionThread *m_connection;
     KWin::Wayland::Compositor *m_compositor;
     KWin::Wayland::Seat *m_seat;
@@ -80,7 +80,7 @@ TestWaylandSeat::TestWaylandSeat(QObject *parent)
 
 void TestWaylandSeat::init()
 {
-    using namespace KWin::WaylandServer;
+    using namespace KWayland::Server;
     delete m_display;
     m_display = new Display(this);
     m_display->setSocketName(s_socketName);
@@ -259,18 +259,18 @@ void TestWaylandSeat::testCapabilities()
 void TestWaylandSeat::testPointer()
 {
     using namespace KWin::Wayland;
-    using namespace KWin::WaylandServer;
+    using namespace KWayland::Server;
 
     QSignalSpy pointerSpy(m_seat, SIGNAL(hasPointerChanged(bool)));
     QVERIFY(pointerSpy.isValid());
     m_seatInterface->setHasPointer(true);
     QVERIFY(pointerSpy.wait());
 
-    QSignalSpy surfaceCreatedSpy(m_compositorInterface, SIGNAL(surfaceCreated(KWin::WaylandServer::SurfaceInterface*)));
+    QSignalSpy surfaceCreatedSpy(m_compositorInterface, SIGNAL(surfaceCreated(KWayland::Server::SurfaceInterface*)));
     QVERIFY(surfaceCreatedSpy.isValid());
     Surface *s = m_compositor->createSurface(m_compositor);
     QVERIFY(surfaceCreatedSpy.wait());
-    SurfaceInterface *serverSurface = surfaceCreatedSpy.first().first().value<KWin::WaylandServer::SurfaceInterface*>();
+    SurfaceInterface *serverSurface = surfaceCreatedSpy.first().first().value<KWayland::Server::SurfaceInterface*>();
     QVERIFY(serverSurface);
 
     PointerInterface *serverPointer = m_seatInterface->pointer();
@@ -388,7 +388,7 @@ void TestWaylandSeat::testPointer()
 void TestWaylandSeat::testKeyboard()
 {
     using namespace KWin::Wayland;
-    using namespace KWin::WaylandServer;
+    using namespace KWayland::Server;
 
     QSignalSpy keyboardSpy(m_seat, SIGNAL(hasKeyboardChanged(bool)));
     QVERIFY(keyboardSpy.isValid());
@@ -396,11 +396,11 @@ void TestWaylandSeat::testKeyboard()
     QVERIFY(keyboardSpy.wait());
 
     // create the surface
-    QSignalSpy surfaceCreatedSpy(m_compositorInterface, SIGNAL(surfaceCreated(KWin::WaylandServer::SurfaceInterface*)));
+    QSignalSpy surfaceCreatedSpy(m_compositorInterface, SIGNAL(surfaceCreated(KWayland::Server::SurfaceInterface*)));
     QVERIFY(surfaceCreatedSpy.isValid());
     Surface *s = m_compositor->createSurface(m_compositor);
     QVERIFY(surfaceCreatedSpy.wait());
-    SurfaceInterface *serverSurface = surfaceCreatedSpy.first().first().value<KWin::WaylandServer::SurfaceInterface*>();
+    SurfaceInterface *serverSurface = surfaceCreatedSpy.first().first().value<KWayland::Server::SurfaceInterface*>();
     QVERIFY(serverSurface);
 
     KeyboardInterface *serverKeyboard = m_seatInterface->keyboard();

src/wayland/autotests/client/test_wayland_shell.cpp

@@ -48,9 +48,9 @@ private Q_SLOTS:
     void testWindowClass();
 
 private:
-    KWin::WaylandServer::Display *m_display;
-    KWin::WaylandServer::CompositorInterface *m_compositorInterface;
-    KWin::WaylandServer::ShellInterface *m_shellInterface;
+    KWayland::Server::Display *m_display;
+    KWayland::Server::CompositorInterface *m_compositorInterface;
+    KWayland::Server::ShellInterface *m_shellInterface;
     KWin::Wayland::ConnectionThread *m_connection;
     KWin::Wayland::Compositor *m_compositor;
     KWin::Wayland::Shell *m_shell;
@@ -73,7 +73,7 @@ TestWaylandShell::TestWaylandShell(QObject *parent)
 
 void TestWaylandShell::init()
 {
-    using namespace KWin::WaylandServer;
+    using namespace KWayland::Server;
     delete m_display;
     m_display = new Display(this);
     m_display->setSocketName(s_socketName);
@@ -170,7 +170,7 @@ void TestWaylandShell::cleanup()
 
 void TestWaylandShell::testFullscreen()
 {
-    using namespace KWin::WaylandServer;
+    using namespace KWayland::Server;
     QScopedPointer<KWin::Wayland::Surface> s(m_compositor->createSurface());
     QVERIFY(!s.isNull());
     QVERIFY(s->isValid());
@@ -179,7 +179,7 @@ void TestWaylandShell::testFullscreen()
     QVERIFY(sizeSpy.isValid());
     QCOMPARE(surface->size(), QSize());
 
-    QSignalSpy serverSurfaceSpy(m_shellInterface, SIGNAL(surfaceCreated(KWin::WaylandServer::ShellSurfaceInterface*)));
+    QSignalSpy serverSurfaceSpy(m_shellInterface, SIGNAL(surfaceCreated(KWayland::Server::ShellSurfaceInterface*)));
     QVERIFY(serverSurfaceSpy.isValid());
     QVERIFY(serverSurfaceSpy.wait());
     ShellSurfaceInterface *serverSurface = serverSurfaceSpy.first().first().value<ShellSurfaceInterface*>();
@@ -209,14 +209,14 @@ void TestWaylandShell::testFullscreen()
 
 void TestWaylandShell::testPing()
 {
-    using namespace KWin::WaylandServer;
+    using namespace KWayland::Server;
     QScopedPointer<KWin::Wayland::Surface> s(m_compositor->createSurface());
     QVERIFY(!s.isNull());
     QVERIFY(s->isValid());
     KWin::Wayland::ShellSurface *surface = m_shell->createSurface(s.data(), m_shell);
     QSignalSpy pingSpy(surface, SIGNAL(pinged()));
 
-    QSignalSpy serverSurfaceSpy(m_shellInterface, SIGNAL(surfaceCreated(KWin::WaylandServer::ShellSurfaceInterface*)));
+    QSignalSpy serverSurfaceSpy(m_shellInterface, SIGNAL(surfaceCreated(KWayland::Server::ShellSurfaceInterface*)));
     QVERIFY(serverSurfaceSpy.isValid());
     QVERIFY(serverSurfaceSpy.wait());
     ShellSurfaceInterface *serverSurface = serverSurfaceSpy.first().first().value<ShellSurfaceInterface*>();
@@ -252,13 +252,13 @@ void TestWaylandShell::testPing()
 
 void TestWaylandShell::testTitle()
 {
-    using namespace KWin::WaylandServer;
+    using namespace KWayland::Server;
     QScopedPointer<KWin::Wayland::Surface> s(m_compositor->createSurface());
     QVERIFY(!s.isNull());
     QVERIFY(s->isValid());
     KWin::Wayland::ShellSurface *surface = m_shell->createSurface(s.data(), m_shell);
 
-    QSignalSpy serverSurfaceSpy(m_shellInterface, SIGNAL(surfaceCreated(KWin::WaylandServer::ShellSurfaceInterface*)));
+    QSignalSpy serverSurfaceSpy(m_shellInterface, SIGNAL(surfaceCreated(KWayland::Server::ShellSurfaceInterface*)));
     QVERIFY(serverSurfaceSpy.isValid());
     QVERIFY(serverSurfaceSpy.wait());
     ShellSurfaceInterface *serverSurface = serverSurfaceSpy.first().first().value<ShellSurfaceInterface*>();
@@ -277,13 +277,13 @@ void TestWaylandShell::testTitle()
 
 void TestWaylandShell::testWindowClass()
 {
-    using namespace KWin::WaylandServer;
+    using namespace KWayland::Server;
     QScopedPointer<KWin::Wayland::Surface> s(m_compositor->createSurface());
     QVERIFY(!s.isNull());
     QVERIFY(s->isValid());
     KWin::Wayland::ShellSurface *surface = m_shell->createSurface(s.data(), m_shell);
 
-    QSignalSpy serverSurfaceSpy(m_shellInterface, SIGNAL(surfaceCreated(KWin::WaylandServer::ShellSurfaceInterface*)));
+    QSignalSpy serverSurfaceSpy(m_shellInterface, SIGNAL(surfaceCreated(KWayland::Server::ShellSurfaceInterface*)));
     QVERIFY(serverSurfaceSpy.isValid());
     QVERIFY(serverSurfaceSpy.wait());
     ShellSurfaceInterface *serverSurface = serverSurfaceSpy.first().first().value<ShellSurfaceInterface*>();

src/wayland/autotests/client/test_wayland_surface.cpp

@@ -48,8 +48,8 @@ private Q_SLOTS:
     void testAttachBuffer();
 
 private:
-    KWin::WaylandServer::Display *m_display;
-    KWin::WaylandServer::CompositorInterface *m_compositorInterface;
+    KWayland::Server::Display *m_display;
+    KWayland::Server::CompositorInterface *m_compositorInterface;
     KWin::Wayland::ConnectionThread *m_connection;
     KWin::Wayland::Compositor *m_compositor;
     QThread *m_thread;
@@ -69,7 +69,7 @@ TestWaylandSurface::TestWaylandSurface(QObject *parent)
 
 void TestWaylandSurface::init()
 {
-    using namespace KWin::WaylandServer;
+    using namespace KWayland::Server;
     delete m_display;
     m_display = new Display(this);
     m_display->setSocketName(s_socketName);
@@ -137,7 +137,7 @@ void TestWaylandSurface::cleanup()
 
 void TestWaylandSurface::testStaticAccessor()
 {
-    QSignalSpy serverSurfaceCreated(m_compositorInterface, SIGNAL(surfaceCreated(KWin::WaylandServer::SurfaceInterface*)));
+    QSignalSpy serverSurfaceCreated(m_compositorInterface, SIGNAL(surfaceCreated(KWayland::Server::SurfaceInterface*)));
     QVERIFY(serverSurfaceCreated.isValid());
 
     QVERIFY(KWin::Wayland::Surface::all().isEmpty());
@@ -182,11 +182,11 @@ void TestWaylandSurface::testStaticAccessor()
 
 void TestWaylandSurface::testDamage()
 {
-    QSignalSpy serverSurfaceCreated(m_compositorInterface, SIGNAL(surfaceCreated(KWin::WaylandServer::SurfaceInterface*)));
+    QSignalSpy serverSurfaceCreated(m_compositorInterface, SIGNAL(surfaceCreated(KWayland::Server::SurfaceInterface*)));
     QVERIFY(serverSurfaceCreated.isValid());
     KWin::Wayland::Surface *s = m_compositor->createSurface();
     QVERIFY(serverSurfaceCreated.wait());
-    KWin::WaylandServer::SurfaceInterface *serverSurface = serverSurfaceCreated.first().first().value<KWin::WaylandServer::SurfaceInterface*>();
+    KWayland::Server::SurfaceInterface *serverSurface = serverSurfaceCreated.first().first().value<KWayland::Server::SurfaceInterface*>();
     QVERIFY(serverSurface);
     QCOMPARE(serverSurface->damage(), QRegion());
 
@@ -213,11 +213,11 @@ void TestWaylandSurface::testDamage()
 
 void TestWaylandSurface::testFrameCallback()
 {
-    QSignalSpy serverSurfaceCreated(m_compositorInterface, SIGNAL(surfaceCreated(KWin::WaylandServer::SurfaceInterface*)));
+    QSignalSpy serverSurfaceCreated(m_compositorInterface, SIGNAL(surfaceCreated(KWayland::Server::SurfaceInterface*)));
     QVERIFY(serverSurfaceCreated.isValid());
     KWin::Wayland::Surface *s = m_compositor->createSurface();
     QVERIFY(serverSurfaceCreated.wait());
-    KWin::WaylandServer::SurfaceInterface *serverSurface = serverSurfaceCreated.first().first().value<KWin::WaylandServer::SurfaceInterface*>();
+    KWayland::Server::SurfaceInterface *serverSurface = serverSurfaceCreated.first().first().value<KWayland::Server::SurfaceInterface*>();
     QVERIFY(serverSurface);
 
     QSignalSpy damageSpy(serverSurface, SIGNAL(damaged(QRegion)));
@@ -251,11 +251,11 @@ void TestWaylandSurface::testAttachBuffer()
     QVERIFY(pool.isValid());
 
     // create the surface
-    QSignalSpy serverSurfaceCreated(m_compositorInterface, SIGNAL(surfaceCreated(KWin::WaylandServer::SurfaceInterface*)));
+    QSignalSpy serverSurfaceCreated(m_compositorInterface, SIGNAL(surfaceCreated(KWayland::Server::SurfaceInterface*)));
     QVERIFY(serverSurfaceCreated.isValid());
     KWin::Wayland::Surface *s = m_compositor->createSurface();
     QVERIFY(serverSurfaceCreated.wait());
-    KWin::WaylandServer::SurfaceInterface *serverSurface = serverSurfaceCreated.first().first().value<KWin::WaylandServer::SurfaceInterface*>();
+    KWayland::Server::SurfaceInterface *serverSurface = serverSurfaceCreated.first().first().value<KWayland::Server::SurfaceInterface*>();
     QVERIFY(serverSurface);
 
     // create two images
@@ -277,7 +277,7 @@ void TestWaylandSurface::testAttachBuffer()
     QVERIFY(damageSpy.wait());
 
     // now the ServerSurface should have the black image attached as a buffer
-    KWin::WaylandServer::BufferInterface *buffer = serverSurface->buffer();
+    KWayland::Server::BufferInterface *buffer = serverSurface->buffer();
     buffer->ref();
     QVERIFY(buffer->shmBuffer());
     QCOMPARE(buffer->data(), black);
@@ -288,7 +288,7 @@ void TestWaylandSurface::testAttachBuffer()
     s->commit(KWin::Wayland::Surface::CommitFlag::None);
     damageSpy.clear();
     QVERIFY(damageSpy.wait());
-    KWin::WaylandServer::BufferInterface *buffer2 = serverSurface->buffer();
+    KWayland::Server::BufferInterface *buffer2 = serverSurface->buffer();
     buffer2->ref();
     QVERIFY(buffer2->shmBuffer());
     QCOMPARE(buffer2->data(), red);

src/wayland/autotests/server/test_display.cpp

@@ -23,7 +23,7 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include "../../src/server/display.h"
 #include "../../src/server/output_interface.h"
 
-using namespace KWin::WaylandServer;
+using namespace KWayland::Server;
 
 class TestWaylandServerDisplay : public QObject
 {

src/wayland/autotests/server/test_seat.cpp

@@ -23,7 +23,7 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include "../../src/server/display.h"
 #include "../../src/server/seat_interface.h"
 
-using namespace KWin::WaylandServer;
+using namespace KWayland::Server;
 
 
 class TestWaylandServerSeat : public QObject

src/wayland/compositor_interface.cpp

@@ -21,9 +21,9 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include "display.h"
 #include "surface_interface.h"
 
-namespace KWin
+namespace KWayland
 {
-namespace WaylandServer
+namespace Server
 {
 
 static const quint32 s_version = 3;

src/wayland/compositor_interface.h

@@ -28,9 +28,9 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwaylandserver_export.h>
 
-namespace KWin
+namespace KWayland
 {
-namespace WaylandServer
+namespace Server
 {
 
 class Display;
@@ -49,7 +49,7 @@ public:
     }
 
 Q_SIGNALS:
-    void surfaceCreated(KWin::WaylandServer::SurfaceInterface*);
+    void surfaceCreated(KWayland::Server::SurfaceInterface*);
 
 private:
     explicit CompositorInterface(Display *display, QObject *parent = nullptr);

src/wayland/display.cpp

@@ -30,9 +30,9 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <wayland-server.h>
 
-namespace KWin
+namespace KWayland
 {
-namespace WaylandServer
+namespace Server
 {
 
 Display::Display(QObject *parent)

src/wayland/display.h

@@ -28,9 +28,9 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 struct wl_display;
 struct wl_event_loop;
 
-namespace KWin
+namespace KWayland
 {
-namespace WaylandServer
+namespace Server
 {
 
 class CompositorInterface;

src/wayland/output_interface.cpp

@@ -22,9 +22,9 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <wayland-server.h>
 
-namespace KWin
+namespace KWayland
 {
-namespace WaylandServer
+namespace Server
 {
 
 static const quint32 s_version = 2;

src/wayland/output_interface.h

@@ -30,9 +30,9 @@ struct wl_global;
 struct wl_client;
 struct wl_resource;
 
-namespace KWin
+namespace KWayland
 {
-namespace WaylandServer
+namespace Server
 {
 
 class Display;
@@ -174,8 +174,8 @@ private:
 }
 }
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(KWin::WaylandServer::OutputInterface::ModeFlags)
-Q_DECLARE_METATYPE(KWin::WaylandServer::OutputInterface::SubPixel)
-Q_DECLARE_METATYPE(KWin::WaylandServer::OutputInterface::Transform)
+Q_DECLARE_OPERATORS_FOR_FLAGS(KWayland::Server::OutputInterface::ModeFlags)
+Q_DECLARE_METATYPE(KWayland::Server::OutputInterface::SubPixel)
+Q_DECLARE_METATYPE(KWayland::Server::OutputInterface::Transform)
 
 #endif

src/wayland/seat_interface.cpp

@@ -28,10 +28,10 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #define WL_SEAT_NAME_SINCE_VERSION 2
 #endif
 
-namespace KWin
+namespace KWayland
 {
 
-namespace WaylandServer
+namespace Server
 {
 
 static const quint32 s_version = 3;

src/wayland/seat_interface.h

@@ -28,9 +28,9 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwaylandserver_export.h>
 
-namespace KWin
+namespace KWayland
 {
-namespace WaylandServer
+namespace Server
 {
 
 class Display;

src/wayland/server/buffer_interface.cpp

@@ -20,9 +20,9 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include "buffer_interface.h"
 #include "surface_interface.h"
 
-namespace KWin
+namespace KWayland
 {
-namespace WaylandServer
+namespace Server
 {
 
 BufferInterface::BufferInterface(wl_resource *resource, SurfaceInterface *parent)

src/wayland/server/buffer_interface.h

@@ -28,9 +28,9 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 struct wl_resource;
 struct wl_shm_buffer;
 
-namespace KWin
+namespace KWayland
 {
-namespace WaylandServer
+namespace Server
 {
 class SurfaceInterface;
 

src/wayland/server/shell_interface.cpp

@@ -23,9 +23,9 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QTimer>
 
-namespace KWin
+namespace KWayland
 {
-namespace WaylandServer
+namespace Server
 {
 
 static const quint32 s_version = 1;

src/wayland/server/shell_interface.h

@@ -30,9 +30,9 @@ class QSize;
 class QTimer;
 struct wl_global;
 
-namespace KWin
+namespace KWayland
 {
-namespace WaylandServer
+namespace Server
 {
 
 class Display;
@@ -57,7 +57,7 @@ public:
     }
 
 Q_SIGNALS:
-    void surfaceCreated(KWin::WaylandServer::ShellSurfaceInterface*);
+    void surfaceCreated(KWayland::Server::ShellSurfaceInterface*);
 
 private:
     friend class Display;

src/wayland/surface_interface.cpp

@@ -21,9 +21,9 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include "buffer_interface.h"
 #include "compositor_interface.h"
 
-namespace KWin
+namespace KWayland
 {
-namespace WaylandServer
+namespace Server
 {
 
 const struct wl_surface_interface SurfaceInterface::s_interface = {

src/wayland/surface_interface.h

@@ -29,9 +29,9 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwaylandserver_export.h>
 
-namespace KWin
+namespace KWayland
 {
-namespace WaylandServer
+namespace Server
 {
 class BufferInterface;
 class CompositorInterface;
@@ -43,7 +43,7 @@ class KWAYLANDSERVER_EXPORT SurfaceInterface : public QObject
     Q_PROPERTY(QRegion opaque READ opaque NOTIFY opaqueChanged)
     Q_PROPERTY(QRegion input READ input NOTIFY inputChanged)
     Q_PROPERTY(qint32 scale READ scale NOTIFY scaleChanged)
-    Q_PROPERTY(KWin::WaylandServer::OutputInterface::Transform transform READ transform NOTIFY transformChanged)
+    Q_PROPERTY(KWayland::Server::OutputInterface::Transform transform READ transform NOTIFY transformChanged)
 public:
     virtual ~SurfaceInterface();
 
@@ -85,7 +85,7 @@ Q_SIGNALS:
     void opaqueChanged(const QRegion&);
     void inputChanged(const QRegion&);
     void scaleChanged(qint32);
-    void transformChanged(KWin::WaylandServer::OutputInterface::Transform);
+    void transformChanged(KWayland::Server::OutputInterface::Transform);
 
 private:
     struct State {