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

Change-Id: I0bbe6dd6bd8e9f6972cc88b832029ac98aa2af49

11 files changed, 34 insertions, 38 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) {
diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp
index 77e7ddce3..b9be85335 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandcompositor.cpp
@@ -426,19 +426,19 @@ QWaylandOutput *QWaylandCompositor::output(QWindow *window) const
     return Q_NULLPTR;
 }
 
-QWaylandOutput *QWaylandCompositor::primaryOutput() const
+QWaylandOutput *QWaylandCompositor::defaultOutput() const
 {
     Q_D(const QWaylandCompositor);
-    return d->primaryOutput();
+    return d->defaultOutput();
 }
 
-QWaylandOutputSpace *QWaylandCompositor::primaryOutputSpace() const
+QWaylandOutputSpace *QWaylandCompositor::defaultOutputSpace() const
 {
     Q_D(const QWaylandCompositor);
-    return d->primaryOutputSpace();
+    return d->defaultOutputSpace();
 }
 
-void QWaylandCompositor::setPrimaryOutputSpace(QWaylandOutputSpace *outputSpace)
+void QWaylandCompositor::setDefaultOutputSpace(QWaylandOutputSpace *outputSpace)
 {
     Q_D(QWaylandCompositor);
 
@@ -447,7 +447,7 @@ void QWaylandCompositor::setPrimaryOutputSpace(QWaylandOutputSpace *outputSpace)
         return;
     if (d->outputSpaces.removeOne(outputSpace)) {
         d->outputSpaces.prepend(outputSpace);
-        primaryOutputSpaceChanged();
+        defaultOutputSpaceChanged();
     }
 }
 
diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h
index 45e4a7fac..d9098ee37 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.h
+++ b/src/compositor/compositor_api/qwaylandcompositor.h
@@ -72,8 +72,8 @@ class Q_COMPOSITOR_EXPORT QWaylandCompositor : public QObject, public QWaylandEx
     Q_DECLARE_PRIVATE(QWaylandCompositor)
     Q_PROPERTY(QByteArray socketName READ socketName WRITE setSocketName)
     Q_PROPERTY(bool retainedSelection READ retainedSelectionEnabled WRITE setRetainedSelectionEnabled)
-    Q_PROPERTY(QWaylandOutputSpace *primaryOutputSpace READ primaryOutputSpace WRITE setPrimaryOutputSpace NOTIFY primaryOutputSpaceChanged)
-    Q_PROPERTY(QWaylandOutput *primaryOutput READ primaryOutput NOTIFY primaryOutputChanged)
+    Q_PROPERTY(QWaylandOutputSpace *defaultOutputSpace READ defaultOutputSpace WRITE setDefaultOutputSpace NOTIFY defaultOutputSpaceChanged)
+    Q_PROPERTY(QWaylandOutput *defaultOutput READ defaultOutput NOTIFY defaultOutputChanged)
     Q_PROPERTY(bool useHardwareIntegrationExtension READ useHardwareIntegrationExtension WRITE setUseHardwareIntegrationExtension NOTIFY useHardwareIntegrationExtensionChanged)
     Q_PROPERTY(QWaylandInputDevice *defaultInputDevice READ defaultInputDevice CONSTANT)
 
@@ -99,9 +99,10 @@ public:
 
     Q_INVOKABLE QWaylandOutput *output(QWindow *window) const;
 
-    QWaylandOutput *primaryOutput() const;
-    QWaylandOutputSpace *primaryOutputSpace() const;
-    void setPrimaryOutputSpace(QWaylandOutputSpace *outputSpace);
+    QWaylandOutput *defaultOutput() const;
+
+    QWaylandOutputSpace *defaultOutputSpace() const;
+    void setDefaultOutputSpace(QWaylandOutputSpace *outputSpace);
     void addOutputSpace(QWaylandOutputSpace *outputSpace);
     void removeOutputSpace(QWaylandOutputSpace *outputSpace);
 
@@ -134,8 +135,8 @@ Q_SIGNALS:
     void surfaceCreated(QWaylandSurface *surface);
     void surfaceAboutToBeDestroyed(QWaylandSurface *surface);
 
-    void primaryOutputSpaceChanged();
-    void primaryOutputChanged();
+    void defaultOutputSpaceChanged();
+    void defaultOutputChanged();
     void outputSpacesChanged();
 
     void useHardwareIntegrationExtensionChanged();
diff --git a/src/compositor/compositor_api/qwaylandcompositor_p.h b/src/compositor/compositor_api/qwaylandcompositor_p.h
index 6fa06c112..e6e3f584a 100644
--- a/src/compositor/compositor_api/qwaylandcompositor_p.h
+++ b/src/compositor/compositor_api/qwaylandcompositor_p.h
@@ -72,8 +72,8 @@ public:
     void destroySurface(QWaylandSurface *surface);
     void unregisterSurface(QWaylandSurface *surface);
 
-    QWaylandOutput *primaryOutput() const { return primaryOutputSpace()->primaryOutput(); }
-    QWaylandOutputSpace *primaryOutputSpace() const { return outputSpaces.first(); }
+    QWaylandOutput *defaultOutput() const { return defaultOutputSpace()->defaultOutput(); }
+    QWaylandOutputSpace *defaultOutputSpace() const { return outputSpaces.first(); }
 
     inline QtWayland::ClientBufferIntegration *clientBufferIntegration() const;
     inline QtWayland::ServerBufferIntegration *serverBufferIntegration() const;
diff --git a/src/compositor/compositor_api/qwaylandinput.cpp b/src/compositor/compositor_api/qwaylandinput.cpp
index a562db748..7a0fb6ee5 100644
--- a/src/compositor/compositor_api/qwaylandinput.cpp
+++ b/src/compositor/compositor_api/qwaylandinput.cpp
@@ -54,7 +54,7 @@ QWaylandInputDevicePrivate::QWaylandInputDevicePrivate(QWaylandInputDevice *inpu
     : QObjectPrivate()
     , QtWaylandServer::wl_seat(compositor->display(), 3)
     , compositor(compositor)
-    , outputSpace(compositor->primaryOutputSpace())
+    , outputSpace(compositor->defaultOutputSpace())
     , mouseFocus(Q_NULLPTR)
     , capabilities()
     , data_device()
diff --git a/src/compositor/compositor_api/qwaylandoutputspace.cpp b/src/compositor/compositor_api/qwaylandoutputspace.cpp
index 46e09f97a..29c91ac03 100644
--- a/src/compositor/compositor_api/qwaylandoutputspace.cpp
+++ b/src/compositor/compositor_api/qwaylandoutputspace.cpp
@@ -94,7 +94,7 @@ QWaylandOutput *QWaylandOutputSpace::output(QWindow *window) const
     return Q_NULLPTR;
 }
 
-void QWaylandOutputSpace::setPrimaryOutput(QWaylandOutput *output)
+void QWaylandOutputSpace::setDefaultOutput(QWaylandOutput *output)
 {
     Q_D(QWaylandOutputSpace);
     if (d->outputs.isEmpty() || d->outputs.first() == output)
@@ -102,11 +102,11 @@ void QWaylandOutputSpace::setPrimaryOutput(QWaylandOutput *output)
 
     if (d->outputs.removeOne(output)) {
         d->outputs.prepend(output);
-        primaryOutputChanged();
+        defaultOutputChanged();
     }
 }
 
-QWaylandOutput *QWaylandOutputSpace::primaryOutput() const
+QWaylandOutput *QWaylandOutputSpace::defaultOutput() const
 {
     Q_D(const QWaylandOutputSpace);
     if (d->outputs.isEmpty())
diff --git a/src/compositor/compositor_api/qwaylandoutputspace.h b/src/compositor/compositor_api/qwaylandoutputspace.h
index b123274f3..9b45f7dbc 100644
--- a/src/compositor/compositor_api/qwaylandoutputspace.h
+++ b/src/compositor/compositor_api/qwaylandoutputspace.h
@@ -54,7 +54,7 @@ class Q_COMPOSITOR_EXPORT QWaylandOutputSpace : public QObject
 
     Q_PROPERTY(GeometryConstraint geometryConstraint READ geometryConstraint WRITE setGeometryConstraint NOTIFY geometryConstraintChanged)
     Q_PROPERTY(QRect geometry READ geometry WRITE setGeometry NOTIFY geometryChanged)
-    Q_PROPERTY(QWaylandOutput *primaryOutput READ primaryOutput WRITE setPrimaryOutput NOTIFY primaryOutputChanged)
+    Q_PROPERTY(QWaylandOutput *defaultOutput READ defaultOutput WRITE setDefaultOutput NOTIFY defaultOutputChanged)
     Q_PROPERTY(QList<QWaylandOutput *> outputs READ outputs NOTIFY outputsChanged)
 public:
     enum GeometryConstraint {
@@ -74,8 +74,8 @@ public:
 
     Q_INVOKABLE QWaylandOutput *output(QWindow *window) const;
 
-    QWaylandOutput *primaryOutput() const;
-    void setPrimaryOutput(QWaylandOutput *output);
+    QWaylandOutput *defaultOutput() const;
+    void setDefaultOutput(QWaylandOutput *output);
 
     Q_INVOKABLE QList<QWaylandOutput *>outputs() const;
     Q_INVOKABLE QList<QWaylandOutput *>outputs(const QPoint &point) const;
@@ -89,7 +89,7 @@ Q_SIGNALS:
     void geometryChanged();
 
     void outputsChanged();
-    void primaryOutputChanged();
+    void defaultOutputChanged();
 
 private:
     Q_DISABLE_COPY(QWaylandOutputSpace)
diff --git a/src/compositor/extensions/qwaylandshell.cpp b/src/compositor/extensions/qwaylandshell.cpp
index 29069287e..d726d301b 100644
--- a/src/compositor/extensions/qwaylandshell.cpp
+++ b/src/compositor/extensions/qwaylandshell.cpp
@@ -226,7 +226,7 @@ void QWaylandShellSurfacePrivate::shell_surface_set_fullscreen(Resource *resourc
             : Q_NULLPTR;
     if (!output) {
         // Look for an output that can contain this surface
-        Q_FOREACH (QWaylandOutput *curOutput, m_surface->compositor()->primaryOutputSpace()->outputs()) {
+        Q_FOREACH (QWaylandOutput *curOutput, m_surface->compositor()->defaultOutputSpace()->outputs()) {
             if (curOutput->geometry().size().width() >= m_surface->size().width() &&
                     curOutput->geometry().size().height() >= m_surface->size().height()) {
                 output = curOutput;
@@ -273,7 +273,7 @@ void QWaylandShellSurfacePrivate::shell_surface_set_maximized(Resource *resource
             : Q_NULLPTR;
     if (!output) {
         // Look for an output that can contain this surface
-        Q_FOREACH (QWaylandOutput *curOutput, m_surface->compositor()->primaryOutputSpace()->outputs()) {
+        Q_FOREACH (QWaylandOutput *curOutput, m_surface->compositor()->defaultOutputSpace()->outputs()) {
             if (curOutput->geometry().size().width() >= m_surface->size().width() &&
                     curOutput->geometry().size().height() >= m_surface->size().height()) {
                 output = curOutput;