Rename primary(Output|OutputSpace) to default(Output|OutputSpace)

Change-Id: I0bbe6dd6bd8e9f6972cc88b832029ac98aa2af49

4 files changed, 8 insertions, 13 deletions

diff --git a/examples/wayland/pure-qml/qml/main.qml b/examples/wayland/pure-qml/qml/main.qml
index 61b88574d..0fe92668a 100644
--- a/examples/wayland/pure-qml/qml/main.qml
+++ b/examples/wayland/pure-qml/qml/main.qml
@@ -66,7 +66,7 @@ WaylandCompositor {
             }
 
             onCreateShellSurface: {
-                var item = chromeComponent.createObject(primaryOutput.surfaceArea, { "surface": surface } );
+                var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "surface": surface } );
                 var shellSurface = shellSurfaceComponent.createObject();
                 shellSurface.initialize(defaultShell, surface, item.view, client, id);
             }
@@ -77,12 +77,7 @@ WaylandCompositor {
         }
     ]
 
-    function addScreen() {
-        var screen = screenComponent.createObject(0, { "outputSpace" : primaryOutputSpace } );
-    }
-
     Component.onCompleted: {
-        addScreen(WaylandOutput.PrimaryOutput);
+        screenComponent.createObject(0, { "outputSpace" : defaultOutputSpace } );
     }
-
 }
diff --git a/examples/wayland/qml-compositor/main.cpp b/examples/wayland/qml-compositor/main.cpp
index a3bd6671f..a01183bb0 100644
--- a/examples/wayland/qml-compositor/main.cpp
+++ b/examples/wayland/qml-compositor/main.cpp
@@ -72,7 +72,7 @@ public:
         setResizeMode(QQuickView::SizeRootObjectToView);
         setColor(Qt::black);
         winId();
-        m_output = new QWaylandQuickOutput(m_compositor.primaryOutputSpace(), this);
+        m_output = new QWaylandQuickOutput(m_compositor.defaultOutputSpace(), this);
 
         connect(this, SIGNAL(afterRendering()), this, SLOT(sendCallbacks()));
         connect(&m_compositor, &QWaylandCompositor::surfaceCreated, this, &QmlCompositor::onSurfaceCreated);
diff --git a/examples/wayland/qwindow-compositor/qwindowcompositor.cpp b/examples/wayland/qwindow-compositor/qwindowcompositor.cpp
index 7522e3cdb..e89ec3aec 100644
--- a/examples/wayland/qwindow-compositor/qwindowcompositor.cpp
+++ b/examples/wayland/qwindow-compositor/qwindowcompositor.cpp
@@ -147,7 +147,7 @@ void QWindowCompositor::create()
 {
     QWaylandCompositor::create();
 
-    new QWaylandOutput(primaryOutputSpace(), m_window);
+    new QWaylandOutput(defaultOutputSpace(), m_window);
 
     m_renderScheduler.setSingleShot(true);
     connect(&m_renderScheduler, &QTimer::timeout, this, &QWindowCompositor::render);
@@ -343,7 +343,7 @@ QWaylandView *QWindowCompositor::viewAt(const QPointF &point, QPointF *local)
 void QWindowCompositor::render()
 {
     m_window->makeCurrent();
-    primaryOutput()->frameStarted();
+    defaultOutput()->frameStarted();
 
     cleanupGraphicsResources();
 
@@ -364,7 +364,7 @@ void QWindowCompositor::render()
     }
 
     m_textureBlitter->release();
-    primaryOutput()->sendFrameCallbacks();
+    defaultOutput()->sendFrameCallbacks();
 
     // N.B. Never call glFinish() here as the busylooping with vsync 'feature' of the nvidia binary driver is not desirable.
     m_window->swapBuffers();
diff --git a/examples/wayland/server-buffer/compositor/main.cpp b/examples/wayland/server-buffer/compositor/main.cpp
index 36a9ca9c9..ecec5c8ca 100644
--- a/examples/wayland/server-buffer/compositor/main.cpp
+++ b/examples/wayland/server-buffer/compositor/main.cpp
@@ -86,7 +86,7 @@ public:
         m_view.setResizeMode(QQuickView::SizeRootObjectToView);
         m_view.setColor(Qt::black);
         m_view.create();
-        m_output = new QWaylandQuickOutput(primaryOutputSpace(), &m_view);
+        m_output = new QWaylandQuickOutput(defaultOutputSpace(), &m_view);
 
         connect(&m_view, &QQuickView::afterRendering, this, &QmlCompositor::sendCallbacks);
 
@@ -214,7 +214,7 @@ private slots:
 protected:
     void sizeAdjusted()
     {
-        primaryOutputSpace()->primaryOutput()->setGeometry(QRect(QPoint(0, 0), m_view.size()));
+        defaultOutput()->setGeometry(QRect(QPoint(0, 0), m_view.size()));
     }
 
     void onSurfaceCreated(QWaylandSurface *surface) {