Make Manufacturer & Model modifiable properties of QWaylandOutput

This to make construction look nicer and make them modifyable from QML

Change-Id: I5f5ffffb34f664914cdb531736c42a6873bfe18c

13 files changed, 39 insertions, 47 deletions

diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp
index 526738e11..5ee27e71b 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandcompositor.cpp
@@ -457,11 +457,9 @@ uint QWaylandCompositor::currentTimeMsecs() const
 }
 
 QWaylandOutput *QWaylandCompositor::createOutput(QWaylandOutputSpace *outputSpace,
-                                                 QWindow *window,
-                                                 const QString &manufacturer,
-                                                 const QString &model)
+                                                 QWindow *window)
 {
-    return new QWaylandOutput(outputSpace, window, manufacturer, model);
+    return new QWaylandOutput(outputSpace, window);
 }
 
 QWaylandSurface *QWaylandCompositor::createSurface(QWaylandClient *client, quint32 id, int version)
diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h
index 4e65e95f4..0d967a290 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.h
+++ b/src/compositor/compositor_api/qwaylandcompositor.h
@@ -142,9 +142,7 @@ Q_SIGNALS:
 protected:
     virtual void retainedSelectionReceived(QMimeData *mimeData);
     virtual QWaylandOutput *createOutput(QWaylandOutputSpace *outputSpace,
-                                         QWindow *window,
-                                         const QString &manufacturer,
-                                         const QString &model);
+                                         QWindow *window);
     virtual QWaylandSurface *createSurface(QWaylandClient *client, quint32 id, int version);
     virtual QWaylandInputDevice *createInputDevice();
     virtual QWaylandPointer *createPointerDevice(QWaylandInputDevice *inputDevice);
diff --git a/src/compositor/compositor_api/qwaylandcompositor_p.h b/src/compositor/compositor_api/qwaylandcompositor_p.h
index b93422378..a73956d43 100644
--- a/src/compositor/compositor_api/qwaylandcompositor_p.h
+++ b/src/compositor/compositor_api/qwaylandcompositor_p.h
@@ -82,10 +82,8 @@ public:
     void feedRetainedSelectionData(QMimeData *data);
 
     QWaylandOutput *callCreateOutput(QWaylandOutputSpace *outputSpace,
-                                 QWindow *window,
-                                 const QString &manufacturer,
-                                 const QString &model)
-    { return q_func()->createOutput(outputSpace, window, manufacturer, model); }
+                                 QWindow *window)
+    { return q_func()->createOutput(outputSpace, window); }
     QWaylandPointer *callCreatePointerDevice(QWaylandInputDevice *inputDevice)
     { return q_func()->createPointerDevice(inputDevice); }
     QWaylandKeyboard *callCreateKeyboardDevice(QWaylandInputDevice *inputDevice)
diff --git a/src/compositor/compositor_api/qwaylandoutput.cpp b/src/compositor/compositor_api/qwaylandoutput.cpp
index b445b1372..6a40ad896 100644
--- a/src/compositor/compositor_api/qwaylandoutput.cpp
+++ b/src/compositor/compositor_api/qwaylandoutput.cpp
@@ -97,13 +97,11 @@ static QtWaylandServer::wl_output::transform toWlTransform(const QWaylandOutput:
     return QtWaylandServer::wl_output::transform_normal;
 }
 
-QWaylandOutputPrivate::QWaylandOutputPrivate(QWaylandCompositor *compositor, QWindow *window, const QString &manufacturer, const QString &model)
+QWaylandOutputPrivate::QWaylandOutputPrivate(QWaylandCompositor *compositor, QWindow *window)
     : QtWaylandServer::wl_output(compositor->display(), 2)
     , compositor(compositor)
     , outputSpace(Q_NULLPTR)
     , window(window)
-    , manufacturer(manufacturer)
-    , model(model)
     , subpixel(QWaylandOutput::SubpixelUnknown)
     , transform(QWaylandOutput::TransformNormal)
     , scaleFactor(1)
@@ -187,9 +185,8 @@ void QWaylandOutputPrivate::removeView(QWaylandView *view, QWaylandSurface *surf
     qWarning("%s Could not find view %p for surface %p to remove. Possible invalid state", Q_FUNC_INFO, view, surface);
 }
 
-QWaylandOutput::QWaylandOutput(QWaylandOutputSpace *outputSpace, QWindow *window,
-                               const QString &manufacturer, const QString &model)
-    : QObject(*new QWaylandOutputPrivate(outputSpace->compositor(), window, manufacturer, model))
+QWaylandOutput::QWaylandOutput(QWaylandOutputSpace *outputSpace, QWindow *window)
+    : QObject(*new QWaylandOutputPrivate(outputSpace->compositor(), window))
 {
     setOutputSpace(outputSpace);
     QObject::connect(window, &QWindow::widthChanged, this, &QWaylandOutput::setWidth);
@@ -259,11 +256,21 @@ QString QWaylandOutput::manufacturer() const
     return d_func()->manufacturer;
 }
 
+void QWaylandOutput::setManufacturer(const QString &manufacturer)
+{
+    d_func()->manufacturer = manufacturer;
+}
+
 QString QWaylandOutput::model() const
 {
     return d_func()->model;
 }
 
+void QWaylandOutput::setModel(const QString &model)
+{
+    d_func()->model = model;
+}
+
 QPoint QWaylandOutput::position() const
 {
     return d_func()->position;
diff --git a/src/compositor/compositor_api/qwaylandoutput.h b/src/compositor/compositor_api/qwaylandoutput.h
index 763bfa2ed..dcf06c02b 100644
--- a/src/compositor/compositor_api/qwaylandoutput.h
+++ b/src/compositor/compositor_api/qwaylandoutput.h
@@ -61,8 +61,8 @@ class Q_COMPOSITOR_EXPORT QWaylandOutput : public QObject, public QWaylandExtens
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QWaylandOutput)
-    Q_PROPERTY(QString manufacturer READ manufacturer CONSTANT)
-    Q_PROPERTY(QString model READ model CONSTANT)
+    Q_PROPERTY(QString manufacturer READ manufacturer WRITE setManufacturer NOTIFY manufacturerChanged)
+    Q_PROPERTY(QString model READ model WRITE setModel NOTIFY modelChanged)
     Q_PROPERTY(QPoint position READ position WRITE setPosition NOTIFY positionChanged)
     Q_PROPERTY(QWaylandOutput::Mode mode READ mode WRITE setMode NOTIFY modeChanged)
     Q_PROPERTY(QRect geometry READ geometry NOTIFY geometryChanged)
@@ -104,8 +104,7 @@ public:
         int refreshRate;
     };
 
-    QWaylandOutput(QWaylandOutputSpace *outputSpace, QWindow *window,
-                   const QString &manufacturer, const QString &model);
+    QWaylandOutput(QWaylandOutputSpace *outputSpace, QWindow *window);
     ~QWaylandOutput();
 
     static QWaylandOutput *fromResource(wl_resource *resource);
@@ -119,8 +118,10 @@ public:
 
 
     QString manufacturer() const;
+    void setManufacturer(const QString &manufacturer);
 
     QString model() const;
+    void setModel(const QString &model);
 
     QPoint position() const;
     void setPosition(const QPoint &pt);
@@ -179,6 +180,8 @@ Q_SIGNALS:
     void sizeFollowsWindowChanged();
     void physicalSizeFollowsSizeChanged();
     void outputSpaceChanged();
+    void manufacturerChanged();
+    void modelChanged();
 
 private Q_SLOTS:
     void windowDestroyed();
diff --git a/src/compositor/compositor_api/qwaylandoutput_p.h b/src/compositor/compositor_api/qwaylandoutput_p.h
index d952f48fc..990849e5e 100644
--- a/src/compositor/compositor_api/qwaylandoutput_p.h
+++ b/src/compositor/compositor_api/qwaylandoutput_p.h
@@ -85,7 +85,7 @@ struct QWaylandSurfaceViewMapper
 class Q_COMPOSITOR_EXPORT QWaylandOutputPrivate : public QObjectPrivate, public QtWaylandServer::wl_output
 {
 public:
-    QWaylandOutputPrivate(QWaylandCompositor *compositor, QWindow *window, const QString &manufacturer, const QString &model);
+    QWaylandOutputPrivate(QWaylandCompositor *compositor, QWindow *window);
 
     ~QWaylandOutputPrivate();
     static QWaylandOutputPrivate *get(QWaylandOutput *output) { return output->d_func(); }
diff --git a/src/compositor/compositor_api/qwaylandoutputspace.cpp b/src/compositor/compositor_api/qwaylandoutputspace.cpp
index 458d18d6d..0e9473ac7 100644
--- a/src/compositor/compositor_api/qwaylandoutputspace.cpp
+++ b/src/compositor/compositor_api/qwaylandoutputspace.cpp
@@ -84,20 +84,16 @@ QWaylandOutputSpace::GeometryConstraint QWaylandOutputSpace::geometryConstraint(
     return d->geometryConstraint;
 }
 
-QWaylandOutput *QWaylandOutputSpace::addOutputWindow(QWindow *outputWindow,
-                                                     const QString &manufacturer,
-                                                     const QString &model)
+QWaylandOutput *QWaylandOutputSpace::addOutputWindow(QWindow *outputWindow)
 {
     Q_D(QWaylandOutputSpace);
-    return d->createAndAddOutput(outputWindow, manufacturer, model, false);
+    return d->createAndAddOutput(outputWindow, false);
 }
 
-QWaylandOutput *QWaylandOutputSpace::addPrimaryOutputWindow(QWindow *outputWindow,
-                                                            const QString &manufacturer,
-                                                            const QString &model)
+QWaylandOutput *QWaylandOutputSpace::addPrimaryOutputWindow(QWindow *outputWindow)
 {
     Q_D(QWaylandOutputSpace);
-    return d->createAndAddOutput(outputWindow, manufacturer, model, true);
+    return d->createAndAddOutput(outputWindow, true);
 }
 
 void QWaylandOutputSpace::addOutput(QWaylandOutput *output)
diff --git a/src/compositor/compositor_api/qwaylandoutputspace.h b/src/compositor/compositor_api/qwaylandoutputspace.h
index 5282ccfe2..9b6767a5d 100644
--- a/src/compositor/compositor_api/qwaylandoutputspace.h
+++ b/src/compositor/compositor_api/qwaylandoutputspace.h
@@ -71,8 +71,8 @@ public:
     void setGeometryConstraint(GeometryConstraint geometryConstraint);
     GeometryConstraint geometryConstraint() const;
 
-    Q_INVOKABLE QWaylandOutput *addOutputWindow(QWindow *outputWindow, const QString &manufacturer, const QString &model);
-    Q_INVOKABLE QWaylandOutput *addPrimaryOutputWindow(QWindow *outputWindow, const QString &manufacturer, const QString &model);
+    Q_INVOKABLE QWaylandOutput *addOutputWindow(QWindow *outputWindow);
+    Q_INVOKABLE QWaylandOutput *addPrimaryOutputWindow(QWindow *outputWindow);
     Q_INVOKABLE void addOutput(QWaylandOutput *output);
     Q_INVOKABLE void addPrimaryOutput(QWaylandOutput *output);
     Q_INVOKABLE void removeOutput(QWaylandOutput *output);
diff --git a/src/compositor/compositor_api/qwaylandoutputspace_p.h b/src/compositor/compositor_api/qwaylandoutputspace_p.h
index 0f6fa58fc..ab7ef847f 100644
--- a/src/compositor/compositor_api/qwaylandoutputspace_p.h
+++ b/src/compositor/compositor_api/qwaylandoutputspace_p.h
@@ -77,12 +77,10 @@ public:
     }
 
     QWaylandOutput *createAndAddOutput(QWindow *window,
-                                       const QString &manufacturer,
-                                       const QString &model,
                                        bool primary)
     {
         Q_Q(QWaylandOutputSpace);
-        QWaylandOutput *output = QWaylandCompositorPrivate::get(compositor)->callCreateOutput(q, window, manufacturer, model);
+        QWaylandOutput *output = QWaylandCompositorPrivate::get(compositor)->callCreateOutput(q, window);
         addOutput(output, primary);
         return output;
     }
diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.cpp b/src/compositor/compositor_api/qwaylandquickcompositor.cpp
index 46ef9e928..7d9893a15 100644
--- a/src/compositor/compositor_api/qwaylandquickcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandquickcompositor.cpp
@@ -85,9 +85,7 @@ void QWaylandQuickCompositor::setInitializeLegazyQmlNames(bool init)
 }
 
 QWaylandOutput *QWaylandQuickCompositor::createOutput(QWaylandOutputSpace *outputSpace,
-                                                      QWindow *window,
-                                                      const QString &manufacturer,
-                                                      const QString &model)
+                                                      QWindow *window)
 {
     QQmlEngine::setObjectOwnership(window, QQmlEngine::CppOwnership);
 
@@ -95,7 +93,7 @@ QWaylandOutput *QWaylandQuickCompositor::createOutput(QWaylandOutputSpace *outpu
     if (!quickWindow)
         qFatal("%s: couldn't cast QWindow to QQuickWindow. All output windows must "
                "be QQuickWindow derivates when using QWaylandQuickCompositor", Q_FUNC_INFO);
-    QWaylandQuickOutput *output = new QWaylandQuickOutput(outputSpace, quickWindow, manufacturer, model);
+    QWaylandQuickOutput *output = new QWaylandQuickOutput(outputSpace, quickWindow);
     QQmlEngine::setObjectOwnership(output, QQmlEngine::CppOwnership);
     return output;
 }
diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.h b/src/compositor/compositor_api/qwaylandquickcompositor.h
index 60bf0de97..65c138a03 100644
--- a/src/compositor/compositor_api/qwaylandquickcompositor.h
+++ b/src/compositor/compositor_api/qwaylandquickcompositor.h
@@ -60,9 +60,7 @@ public:
     void setInitializeLegazyQmlNames(bool init);
 
     QWaylandOutput *createOutput(QWaylandOutputSpace *outputSpace,
-                                 QWindow *window,
-                                 const QString &manufacturer,
-                                 const QString &model) Q_DECL_OVERRIDE;
+                                 QWindow *window) Q_DECL_OVERRIDE;
     QWaylandSurface *createSurface(QWaylandClient *client, quint32 id, int version) Q_DECL_OVERRIDE;
 
 protected:
diff --git a/src/compositor/compositor_api/qwaylandquickoutput.cpp b/src/compositor/compositor_api/qwaylandquickoutput.cpp
index e51c8fd44..9a3842b07 100644
--- a/src/compositor/compositor_api/qwaylandquickoutput.cpp
+++ b/src/compositor/compositor_api/qwaylandquickoutput.cpp
@@ -40,9 +40,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QWaylandQuickOutput::QWaylandQuickOutput(QWaylandOutputSpace *outputSpace, QQuickWindow *window,
-                                         const QString &manufacturer, const QString &model)
-    : QWaylandOutput(outputSpace, window, manufacturer, model)
+QWaylandQuickOutput::QWaylandQuickOutput(QWaylandOutputSpace *outputSpace, QQuickWindow *window)
+    : QWaylandOutput(outputSpace, window)
     , m_updateScheduled(false)
     , m_automaticFrameCallbacks(false)
 {
diff --git a/src/compositor/compositor_api/qwaylandquickoutput.h b/src/compositor/compositor_api/qwaylandquickoutput.h
index 2de24f2f5..5065ad196 100644
--- a/src/compositor/compositor_api/qwaylandquickoutput.h
+++ b/src/compositor/compositor_api/qwaylandquickoutput.h
@@ -51,8 +51,7 @@ class Q_COMPOSITOR_EXPORT QWaylandQuickOutput : public QWaylandOutput
     Q_OBJECT
     Q_PROPERTY(bool automaticFrameCallbacks READ automaticFrameCallbacks WRITE setAutomaticFrameCallbacks)
 public:
-    QWaylandQuickOutput(QWaylandOutputSpace *outputSpace, QQuickWindow *window,
-                        const QString &manufacturer, const QString &model);
+    QWaylandQuickOutput(QWaylandOutputSpace *outputSpace, QQuickWindow *window);
 
     QQuickWindow *quickWindow() const;