API: Rename EnginioModel::engino property to client

[ChangeLog][API] Renamed EnginioModel::engino property to client

Change-Id: I56ee3dfeab0f051b92dddf88bc94fb15552572a5
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>

19 files changed, 96 insertions, 99 deletions

diff --git a/doc/snippets/models.qml b/doc/snippets/models.qml
index d14fea4..f801696 100644
--- a/doc/snippets/models.qml
+++ b/doc/snippets/models.qml
@@ -56,7 +56,7 @@ Rectangle {
     //! [model]
     EnginioModel {
         id: enginioModel
-        enginio: client
+        client: client
         query: { "objectType": "objects.city" }
     }
     //! [model]
diff --git a/examples/quick/image-gallery/image-gallery.qml b/examples/quick/image-gallery/image-gallery.qml
index 38b4c06..9c2425e 100644
--- a/examples/quick/image-gallery/image-gallery.qml
+++ b/examples/quick/image-gallery/image-gallery.qml
@@ -79,7 +79,7 @@ Rectangle {
     //! [model]
     EnginioModel {
         id: enginioModel
-        enginio: client
+        client: client
         query: { // query for all objects of type "objects.image" and include not null references to files
             "objectType": "objects.image",
                     "include": {"file": {}},
diff --git a/examples/quick/socialtodos/List.qml b/examples/quick/socialtodos/List.qml
index 7bdbffb..9a4d6ed 100644
--- a/examples/quick/socialtodos/List.qml
+++ b/examples/quick/socialtodos/List.qml
@@ -53,7 +53,7 @@ Rectangle {
 
     EnginioModel {
         id: enginioModel
-        enginio: enginioClient
+        client: enginioClient
         query: {"objectType": "objects.todos",
                 "query": { "todoList": { "id": listId, "objectType": "objects.todoLists" } }
         }
diff --git a/examples/quick/socialtodos/TodoLists.qml b/examples/quick/socialtodos/TodoLists.qml
index 9d22325..45e3f90 100644
--- a/examples/quick/socialtodos/TodoLists.qml
+++ b/examples/quick/socialtodos/TodoLists.qml
@@ -50,7 +50,7 @@ Rectangle {
 
     EnginioModel {
         id: enginioModel
-        enginio: enginioClient
+        client: enginioClient
         query: {
             "objectType" : "objects.todoLists",
                     "include": { "creator": {} }
diff --git a/examples/quick/todos/todo.qml b/examples/quick/todos/todo.qml
index 87d0f77..dfc2ef4 100644
--- a/examples/quick/todos/todo.qml
+++ b/examples/quick/todos/todo.qml
@@ -52,7 +52,7 @@ Rectangle {
     //![model]
     EnginioModel {
         id: enginioModel
-        enginio: Enginio {
+        client: Enginio {
             backendId: enginioBackendId
         }
         query: {"objectType": "objects.todos" }
diff --git a/examples/quick/users/Browse.qml b/examples/quick/users/Browse.qml
index a61028a..4e97eee 100644
--- a/examples/quick/users/Browse.qml
+++ b/examples/quick/users/Browse.qml
@@ -62,7 +62,7 @@ ColumnLayout {
         //![browse]
         model: EnginioModel {
             id: enginioModel
-            enginio: enginioClient
+            client: enginioClient
             operation: Enginio.UserOperation
             query: {"objectType": "users" }
         }
diff --git a/examples/widgets/cloudaddressbook/addressbookmodel.cpp b/examples/widgets/cloudaddressbook/addressbookmodel.cpp
index 40751da..a5da338 100644
--- a/examples/widgets/cloudaddressbook/addressbookmodel.cpp
+++ b/examples/widgets/cloudaddressbook/addressbookmodel.cpp
@@ -166,7 +166,7 @@ void AddressBookModel::newSearch(const QString &search)
     }
 
     //![callSearch]
-    _searchReply =  enginio()->fullTextSearch(query);
+    _searchReply =  client()->fullTextSearch(query);
     QObject::connect(_searchReply, &EnginioReply::finished, this, &AddressBookModel::searchResultsArrived);
     QObject::connect(_searchReply, &EnginioReply::finished, _searchReply, &EnginioReply::deleteLater);
     //![callSearch]
diff --git a/examples/widgets/cloudaddressbook/mainwindow.cpp b/examples/widgets/cloudaddressbook/mainwindow.cpp
index e55ce31..32352e7 100644
--- a/examples/widgets/cloudaddressbook/mainwindow.cpp
+++ b/examples/widgets/cloudaddressbook/mainwindow.cpp
@@ -75,7 +75,7 @@ MainWindow::MainWindow(QWidget *parent)
 
     //![model]
     model = new AddressBookModel(this);
-    model->setEnginio(client);
+    model->setClient(client);
 
     QJsonObject query;
     query["objectType"] = QString::fromUtf8("objects.addressbook");
diff --git a/examples/widgets/image-gallery-cpp/imagemodel.cpp b/examples/widgets/image-gallery-cpp/imagemodel.cpp
index a9a63ef..e31875a 100644
--- a/examples/widgets/image-gallery-cpp/imagemodel.cpp
+++ b/examples/widgets/image-gallery-cpp/imagemodel.cpp
@@ -70,7 +70,7 @@ void ImageModel::updateRows(const QModelIndex &, int start, int end)
         QString id = rowData.toObject().value("id").toString();
         if (id.isEmpty() || m_images.contains(id))
             continue;
-        ImageObject *image = new ImageObject(enginio());
+        ImageObject *image = new ImageObject(client());
         connect(image, SIGNAL(imageChanged(QString)), this, SLOT(imageChanged(QString)));
         m_images.insert(id, image);
         image->setObject(rowData.toObject());
diff --git a/examples/widgets/image-gallery-cpp/mainwindow.cpp b/examples/widgets/image-gallery-cpp/mainwindow.cpp
index 1508d23..18f2c49 100644
--- a/examples/widgets/image-gallery-cpp/mainwindow.cpp
+++ b/examples/widgets/image-gallery-cpp/mainwindow.cpp
@@ -69,7 +69,7 @@ MainWindow::MainWindow(QWidget *parent)
     m_client->setBackendId(backendId("image-gallery"));
 
     m_model = new ImageModel(this);
-    m_model->setEnginio(m_client);
+    m_model->setClient(m_client);
 
     m_view = new QListView;
     m_view->setModel(m_model);
diff --git a/examples/widgets/todos-cpp/mainwindow.cpp b/examples/widgets/todos-cpp/mainwindow.cpp
index 3da766e..6f48e29 100644
--- a/examples/widgets/todos-cpp/mainwindow.cpp
+++ b/examples/widgets/todos-cpp/mainwindow.cpp
@@ -75,7 +75,7 @@ MainWindow::MainWindow(QWidget *parent)
 
     //![model]
     m_model = new TodosModel(this);
-    m_model->setEnginio(m_client);
+    m_model->setClient(m_client);
 
     QJsonObject query;
     query["objectType"] = QString::fromUtf8("objects.todos");
diff --git a/src/enginio_client/enginiomodel.cpp b/src/enginio_client/enginiomodel.cpp
index 1687c36..ffd70d8 100644
--- a/src/enginio_client/enginiomodel.cpp
+++ b/src/enginio_client/enginiomodel.cpp
@@ -413,18 +413,18 @@ EnginioModelBase::~EnginioModelBase()
 
   \sa EnginioClient
 */
-EnginioClient *EnginioModel::enginio() const
+EnginioClient *EnginioModel::client() const
 {
     Q_D(const EnginioModel);
     return d->enginio();
 }
 
-void EnginioModel::setEnginio(const EnginioClient *enginio)
+void EnginioModel::setClient(const EnginioClient *client)
 {
     Q_D(EnginioModel);
-    if (enginio == d->enginio())
+    if (client == d->enginio())
         return;
-    d->setEnginio(enginio);
+    d->setClient(client);
 }
 
 /*!
diff --git a/src/enginio_client/enginiomodel.h b/src/enginio_client/enginiomodel.h
index d3a96c9..8adbd3a 100644
--- a/src/enginio_client/enginiomodel.h
+++ b/src/enginio_client/enginiomodel.h
@@ -54,17 +54,15 @@ class EnginioModelPrivate;
 class ENGINIOCLIENT_EXPORT EnginioModel : public EnginioModelBase
 {
     Q_OBJECT
-    Q_PROPERTY(EnginioClient *enginio READ enginio WRITE setEnginio NOTIFY enginioChanged)
+    Q_PROPERTY(EnginioClient *client READ client WRITE setClient NOTIFY clientChanged)
     Q_PROPERTY(QJsonObject query READ query WRITE setQuery NOTIFY queryChanged)
 
 public:
     explicit EnginioModel(QObject *parent = 0);
     ~EnginioModel();
 
-
-    // TODO: that is a pretty silly name
-    EnginioClient *enginio() const Q_REQUIRED_RESULT;
-    void setEnginio(const EnginioClient *enginio);
+    EnginioClient *client() const Q_REQUIRED_RESULT;
+    void setClient(const EnginioClient *client);
 
     QJsonObject query() Q_REQUIRED_RESULT;
     void setQuery(const QJsonObject &query);
@@ -75,7 +73,7 @@ public:
 
 Q_SIGNALS:
     void queryChanged(const QJsonObject &query);
-    void enginioChanged(EnginioClient *enginio);
+    void clientChanged(EnginioClient *client);
 
 private:
     Q_DISABLE_COPY(EnginioModel)
diff --git a/src/enginio_client/enginiomodelbase_p.h b/src/enginio_client/enginiomodelbase_p.h
index 65965bb..386a67e 100644
--- a/src/enginio_client/enginiomodelbase_p.h
+++ b/src/enginio_client/enginiomodelbase_p.h
@@ -930,7 +930,7 @@ struct EnginioModelPrivateT : public EnginioModelBasePrivate
         }
         void operator ()()
         {
-            model->setEnginio(0);
+            model->setClient(0);
         }
     };
 
@@ -942,7 +942,7 @@ struct EnginioModelPrivateT : public EnginioModelBasePrivate
     {
         Base::init();
         QObject::connect(q(), &Public::queryChanged, QueryChanged(this));
-        QObject::connect(q(), &Public::enginioChanged, QueryChanged(this));
+        QObject::connect(q(), &Public::clientChanged, QueryChanged(this));
     }
 
     Client *enginio() const Q_REQUIRED_RESULT
@@ -950,7 +950,7 @@ struct EnginioModelPrivateT : public EnginioModelBasePrivate
         return _enginio ? ClientPrivate::get(_enginio) : 0;
     }
 
-    void setEnginio(const EnginioClientBase *enginio)
+    void setClient(const EnginioClientBase *enginio)
     {
         if (_enginio) {
             foreach (const QMetaObject::Connection &connection, _clientConnections)
@@ -965,7 +965,7 @@ struct EnginioModelPrivateT : public EnginioModelBasePrivate
             _enginio = 0;
         }
 
-        q()->enginioChanged(static_cast<Client*>(const_cast<EnginioClientBase*>(enginio)));
+        q()->clientChanged(static_cast<Client*>(const_cast<EnginioClientBase*>(enginio)));
     }
 
     Data query() Q_REQUIRED_RESULT
diff --git a/src/enginio_plugin/enginioqmlmodel.cpp b/src/enginio_plugin/enginioqmlmodel.cpp
index 1dc577a..6d9d7c8 100644
--- a/src/enginio_plugin/enginioqmlmodel.cpp
+++ b/src/enginio_plugin/enginioqmlmodel.cpp
@@ -252,19 +252,19 @@ EnginioQmlReply *EnginioQmlModel::setProperty(int row, const QString &role, cons
     return d->setValue(row, role, value);
 }
 
-EnginioQmlClient *EnginioQmlModel::enginio() const
+EnginioQmlClient *EnginioQmlModel::client() const
 {
     Q_D(const EnginioQmlModel);
     return d->enginio();
 }
 
-void EnginioQmlModel::setEnginio(const EnginioQmlClient *enginio)
+void EnginioQmlModel::setClient(const EnginioQmlClient *enginio)
 {
     Q_D(EnginioQmlModel);
     if (enginio == d->enginio())
         return;
 
-    d->setEnginio(enginio);
+    d->setClient(enginio);
 }
 
 QJSValue EnginioQmlModel::query()
diff --git a/src/enginio_plugin/enginioqmlmodel.h b/src/enginio_plugin/enginioqmlmodel.h
index 9ec6f68..f4d9bc9 100644
--- a/src/enginio_plugin/enginioqmlmodel.h
+++ b/src/enginio_plugin/enginioqmlmodel.h
@@ -58,13 +58,12 @@ public:
     EnginioQmlModel(QObject *parent = 0);
     ~EnginioQmlModel();
 
-    Q_PROPERTY(EnginioQmlClient *enginio READ enginio WRITE setEnginio NOTIFY enginioChanged)
+    Q_PROPERTY(EnginioQmlClient *client READ client WRITE setClient NOTIFY clientChanged)
     Q_PROPERTY(QJSValue query READ query WRITE setQuery NOTIFY queryChanged)
     Q_PROPERTY(int rowCount READ rowCount NOTIFY rowCountChanged)
 
-    // TODO: that is a pretty silly name
-    EnginioQmlClient *enginio() const Q_REQUIRED_RESULT;
-    void setEnginio(const EnginioQmlClient *enginio);
+    EnginioQmlClient *client() const Q_REQUIRED_RESULT;
+    void setClient(const EnginioQmlClient *client);
 
     QJSValue query() Q_REQUIRED_RESULT;
     void setQuery(const QJSValue &query);
@@ -75,7 +74,7 @@ public:
 
 Q_SIGNALS:
     void queryChanged(const QJSValue &query);
-    void enginioChanged(EnginioQmlClient *enginio);
+    void clientChanged(EnginioQmlClient *client);
     void rowCountChanged();
 private:
     Q_DECLARE_PRIVATE(EnginioQmlModel)
diff --git a/src/enginio_plugin/plugins.qmltypes b/src/enginio_plugin/plugins.qmltypes
index 7364b52..cb7101f 100644
--- a/src/enginio_plugin/plugins.qmltypes
+++ b/src/enginio_plugin/plugins.qmltypes
@@ -276,7 +276,7 @@ Module {
             Parameter { name: "query"; type: "QJSValue" }
         }
         Signal {
-            name: "enginioChanged"
+            name: "clientChanged"
             Parameter { name: "enginio"; type: "EnginioQmlClient"; isPointer: true }
         }
         Method {
diff --git a/tests/auto/enginiomodel/tst_enginiomodel.cpp b/tests/auto/enginiomodel/tst_enginiomodel.cpp
index 1200052..a7f1051 100644
--- a/tests/auto/enginiomodel/tst_enginiomodel.cpp
+++ b/tests/auto/enginiomodel/tst_enginiomodel.cpp
@@ -145,7 +145,7 @@ void tst_EnginioModel::ctor()
         QObject::connect(&client, SIGNAL(error(EnginioReply *)), this, SLOT(error(EnginioReply *)));
         client.setBackendId(_backendId);
         client.setServiceUrl(EnginioTests::TESTAPP_URL);
-        model.setEnginio(&client);
+        model.setClient(&client);
     }
     {   // check if destructor of a fully initilized EnginioClient detach fully initilized model
         EnginioClient client;
@@ -155,7 +155,7 @@ void tst_EnginioModel::ctor()
         model.setQuery(query);
         client.setBackendId(_backendId);
         client.setServiceUrl(EnginioTests::TESTAPP_URL);
-        model.setEnginio(&client);
+        model.setClient(&client);
     }
 }
 
@@ -166,25 +166,25 @@ void tst_EnginioModel::enginio_property()
         QObject::connect(&client, SIGNAL(error(EnginioReply *)), this, SLOT(error(EnginioReply *)));
         EnginioModel model;
         // No initial value
-        QCOMPARE(model.enginio(), static_cast<EnginioClient*>(0));
+        QCOMPARE(model.client(), static_cast<EnginioClient*>(0));
 
-        QSignalSpy spy(&model, SIGNAL(enginioChanged(EnginioClient*)));
-        model.setEnginio(&client);
-        QCOMPARE(model.enginio(), &client);
+        QSignalSpy spy(&model, SIGNAL(clientChanged(EnginioClient*)));
+        model.setClient(&client);
+        QCOMPARE(model.client(), &client);
         QTRY_COMPARE(spy.count(), 1);
     }
     {
         EnginioModel model;
-        QSignalSpy spy(&model, SIGNAL(enginioChanged(EnginioClient*)));
+        QSignalSpy spy(&model, SIGNAL(clientChanged(EnginioClient*)));
         {
             EnginioClient client;
             QObject::connect(&client, SIGNAL(error(EnginioReply *)), this, SLOT(error(EnginioReply *)));
-            model.setEnginio(&client);
-            QCOMPARE(model.enginio(), &client);
+            model.setClient(&client);
+            QCOMPARE(model.client(), &client);
             QTRY_COMPARE(spy.count(), 1);
             QCOMPARE(spy[0][0].value<EnginioClient*>(), &client);
         }
-        QCOMPARE(model.enginio(), static_cast<EnginioClient*>(0));
+        QCOMPARE(model.client(), static_cast<EnginioClient*>(0));
         QTRY_COMPARE(spy.count(), 2);
         QCOMPARE(spy[1][0].value<EnginioClient*>(), static_cast<EnginioClient*>(0));
     }
@@ -210,7 +210,7 @@ void tst_EnginioModel::enginio_property()
         query.insert("limit", 1);
         model.setQuery(query);
         model.setOperation(EnginioClient::UserOperation);
-        model.setEnginio(&client);
+        model.setClient(&client);
 
         QTRY_COMPARE(spyAboutToReset.count(), 1);
         QTRY_COMPARE(spyReset.count(), 1);
@@ -224,7 +224,7 @@ void tst_EnginioModel::enginio_property()
         EnginioModel model;
         QSignalSpy spyAboutToReset(&model, SIGNAL(modelAboutToBeReset()));
         QSignalSpy spyReset(&model, SIGNAL(modelReset()));
-        model.setEnginio(&client);
+        model.setClient(&client);
         QJsonObject query;
         query.insert("limit", 1);
         query.insert("objectTypes", "objects." + EnginioTests::CUSTOM_OBJECT1);
@@ -238,15 +238,15 @@ void tst_EnginioModel::enginio_property()
         EnginioClient client;
         EnginioModel model;
 
-        QSignalSpy clientSpy(&model, SIGNAL(enginioChanged(EnginioClient*)));
-        QCOMPARE(model.enginio(), (EnginioClient *)0);
+        QSignalSpy clientSpy(&model, SIGNAL(clientChanged(EnginioClient*)));
+        QCOMPARE(model.client(), (EnginioClient *)0);
 
-        model.setEnginio(&client);
+        model.setClient(&client);
         QCOMPARE(clientSpy.count(), 1);
         QCOMPARE(clientSpy[0][0].value<EnginioClient*>(), &client);
-        QCOMPARE(model.enginio(), &client);
+        QCOMPARE(model.client(), &client);
 
-        model.setEnginio(&client);
+        model.setClient(&client);
         QCOMPARE(clientSpy.count(), 1);
     }
 }
@@ -284,7 +284,7 @@ void tst_EnginioModel::query_property()
         client.setBackendId(_backendId);
         client.setServiceUrl(EnginioTests::TESTAPP_URL);
 
-        model.setEnginio(&client);
+        model.setClient(&client);
         model.setQuery(query);
         QTRY_VERIFY(model.rowCount() > 0);
 
@@ -330,9 +330,9 @@ void tst_EnginioModel::roleNames()
     QObject::connect(&client, SIGNAL(error(EnginioReply *)), this, SLOT(error(EnginioReply *)));
     client.setBackendId(_backendId);
     client.setServiceUrl(EnginioTests::TESTAPP_URL);
-    model.setEnginio(&client);
+    model.setClient(&client);
 
-    QVERIFY(model.enginio() == &client);
+    QVERIFY(model.client() == &client);
 
     model.setOperation(EnginioClient::UserOperation);
     QJsonObject query = QJsonDocument::fromJson("{\"limit\":5}").object();
@@ -359,7 +359,7 @@ void tst_EnginioModel::listView()
     QObject::connect(&client, SIGNAL(error(EnginioReply *)), this, SLOT(error(EnginioReply *)));
     client.setBackendId(_backendId);
     client.setServiceUrl(EnginioTests::TESTAPP_URL);
-    model.setEnginio(&client);
+    model.setClient(&client);
 
     QListView view;
     view.setModel(&model);
@@ -413,7 +413,7 @@ void tst_EnginioModel::invalidRemove()
     client.setServiceUrl(EnginioTests::TESTAPP_URL);
 
     EnginioModel model;
-    model.setEnginio(&client);
+    model.setClient(&client);
 
     int counter = 0;
     InvalidRemoveErrorChecker replyCounter(&counter);
@@ -449,7 +449,7 @@ void tst_EnginioModel::invalidSetProperty()
     client.setServiceUrl(EnginioTests::TESTAPP_URL);
 
     EnginioModel model;
-    model.setEnginio(&client);
+    model.setClient(&client);
     QJsonObject query = QJsonDocument::fromJson("{\"limit\":2}").object();
     model.setOperation(EnginioClient::UserOperation);
     model.setQuery(query);
@@ -523,16 +523,16 @@ void tst_EnginioModel::multpleConnections()
 
         EnginioModelConnectionSpy model;
         for (int i = 0; i < 20; ++i) {
-            model.setEnginio(&client1);
-            model.setEnginio(&client2);
-            model.setEnginio(0);
+            model.setClient(&client1);
+            model.setClient(&client2);
+            model.setClient(0);
         }
 
         // The values here are not strict. Use qDebug() << model.counter; to see what
         // makes sense. Just to be sure 2097150 or 20 doesn't.
         QCOMPARE(model.counter["operationChanged"], 0);
         QCOMPARE(model.counter["queryChanged"], 0);
-        QCOMPARE(model.counter["enginioChanged"], 0);
+        QCOMPARE(model.counter["clientChanged"], 0);
         QCOMPARE(client1.counter["finished"], 0);
         QCOMPARE(client2.counter["finished"], 0);
 
@@ -549,7 +549,7 @@ void tst_EnginioModel::multpleConnections()
         client.setServiceUrl(EnginioTests::TESTAPP_URL);
 
         EnginioModelConnectionSpy model;
-        model.setEnginio(&client);
+        model.setClient(&client);
         QJsonObject query1, query2;
         query1.insert("objectType", QString("objects.todos"));
         query2.insert("objectType", QString("objects.blah"));
@@ -563,7 +563,7 @@ void tst_EnginioModel::multpleConnections()
         // makes sense. Just to be sure 2097150 or 20 doesn't.
         QCOMPARE(model.counter["operationChanged"], 0);
         QCOMPARE(model.counter["queryChanged"], 0);
-        QCOMPARE(model.counter["enginioChanged"], 0);
+        QCOMPARE(model.counter["clientChanged"], 0);
     }
     {
         EnginioClientConnectionSpy client;
@@ -571,7 +571,7 @@ void tst_EnginioModel::multpleConnections()
         client.setServiceUrl(EnginioTests::TESTAPP_URL);
 
         EnginioModelConnectionSpy model;
-        model.setEnginio(&client);
+        model.setClient(&client);
         QJsonObject query;
         query.insert("objectType", QString("objects.todos"));
         model.setQuery(query);
@@ -585,7 +585,7 @@ void tst_EnginioModel::multpleConnections()
         // makes sense. Just to be sure 2097150 or 20 doesn't.
         QCOMPARE(model.counter["operationChanged"], 0);
         QCOMPARE(model.counter["queryChanged"], 0);
-        QCOMPARE(model.counter["enginioChanged"], 0);
+        QCOMPARE(model.counter["clientChanged"], 0);
     }
 }
 
@@ -614,7 +614,7 @@ void tst_EnginioModel::deletionReordered()
     QObject::connect(&client, SIGNAL(error(EnginioReply *)), this, SLOT(error(EnginioReply *)));
     client.setBackendId(_backendId);
     client.setServiceUrl(EnginioTests::TESTAPP_URL);
-    model.setEnginio(&client);
+    model.setClient(&client);
 
     QTRY_COMPARE(model.rowCount(), int(query["limit"].toDouble()));
     QVERIFY(model.rowCount() >= 2);
@@ -651,7 +651,7 @@ void tst_EnginioModel::deleteTwiceTheSame()
     EnginioClient client;
     client.setBackendId(_backendId);
     client.setServiceUrl(EnginioTests::TESTAPP_URL);
-    model.setEnginio(&client);
+    model.setClient(&client);
 
     QTRY_COMPARE(model.rowCount(), int(query["limit"].toDouble()));
 
@@ -693,7 +693,7 @@ void tst_EnginioModel::updateAndDeleteReordered()
     EnginioClient client;
     client.setBackendId(_backendId);
     client.setServiceUrl(EnginioTests::TESTAPP_URL);
-    model.setEnginio(&client);
+    model.setClient(&client);
 
     QTRY_COMPARE(model.rowCount(), int(query["limit"].toDouble()));
 
@@ -734,7 +734,7 @@ void tst_EnginioModel::updateReordered()
     EnginioClient client;
     client.setBackendId(_backendId);
     client.setServiceUrl(EnginioTests::TESTAPP_URL);
-    model.setEnginio(&client);
+    model.setClient(&client);
 
     QTRY_COMPARE(model.rowCount(), int(query["limit"].toDouble()));
 
@@ -785,7 +785,7 @@ void tst_EnginioModel::append()
 
     {   // init the model
         QSignalSpy spy(&model, SIGNAL(modelReset()));
-        model.setEnginio(&client);
+        model.setClient(&client);
 
         QTRY_VERIFY(spy.count() > 0);
     }
@@ -911,7 +911,7 @@ void tst_EnginioModel::externallyRemovedImpl()
 
     {   // init the model
         QSignalSpy spy(&model, SIGNAL(modelReset()));
-        model.setEnginio(&client);
+        model.setClient(&client);
 
         QTRY_VERIFY(spy.count() > 0);
         QVERIFY(model.rowCount());
@@ -992,7 +992,7 @@ void tst_EnginioModel::createAndModify()
     model.setQuery(query);
     {   // init the model
         QSignalSpy spy(&model, SIGNAL(modelReset()));
-        model.setEnginio(&client);
+        model.setClient(&client);
         QTRY_VERIFY(spy.count() > 0);
     }
 
@@ -1077,7 +1077,7 @@ void tst_EnginioModel::externalNotification()
     model.setQuery(query);
     {   // init the model
         QSignalSpy spy(&model, SIGNAL(modelReset()));
-        model.setEnginio(&client);
+        model.setClient(&client);
         QTRY_VERIFY(spy.count() > 0);
     }
 
@@ -1148,7 +1148,7 @@ void tst_EnginioModel::createUpdateRemoveWithNotification()
     model.setQuery(query);
     {   // init the model
         QSignalSpy spy(&model, SIGNAL(modelReset()));
-        model.setEnginio(&client);
+        model.setClient(&client);
         QTRY_VERIFY(spy.count() > 0);
     }
 
@@ -1232,7 +1232,7 @@ void tst_EnginioModel::appendBeforeInitialModelReset()
         EnginioModel model;
         QSignalSpy resetSpy(&model, SIGNAL(modelReset()));
         model.setQuery(query);
-        model.setEnginio(&client);
+        model.setClient(&client);
 
         query.insert("title", QString::fromUtf8("appendAndRemoveModel"));
         EnginioReply *reply = model.append(query);
@@ -1262,7 +1262,7 @@ void tst_EnginioModel::delayedRequestBeforeInitialModelReset()
         EnginioModel model;
         QSignalSpy resetSpy(&model, SIGNAL(modelReset()));
         model.setQuery(query);
-        model.setEnginio(&client);
+        model.setClient(&client);
 
         query.insert("title", QString::fromUtf8("appendAndRemoveModel"));
         EnginioReply *append1 = model.append(query);
@@ -1292,7 +1292,7 @@ void tst_EnginioModel::appendAndChangeQueryBeforeItIsFinished()
     EnginioModel model;
     QSignalSpy resetSpy(&model, SIGNAL(modelReset()));
     model.setQuery(query);
-    model.setEnginio(&client);
+    model.setClient(&client);
     QTRY_COMPARE(resetSpy.count(), 1);
 
     query.insert("title", QString::fromUtf8("appendAndChangeQueryBeforeItIsFinished"));
@@ -1331,7 +1331,7 @@ void tst_EnginioModel::deleteModelDurringRequests()
         query.insert("objectType", objectType);
         EnginioModel model;
         model.setQuery(query);
-        model.setEnginio(&client);
+        model.setClient(&client);
         query.insert("title", QString::fromUtf8("deleteModelDurringRequests"));
         replies.append(model.append(query));
         replies.append(model.append(query));
@@ -1406,7 +1406,7 @@ void tst_EnginioModel::updatingRoles()
     QCOMPARE(model.roleNames()[CustomModel::InvalidRole], invalid);
 
     model.setQuery(query);
-    model.setEnginio(&client);
+    model.setClient(&client);
 
     QCOMPARE(model.roleNames()[CustomModel::FooRole], foo);
     QCOMPARE(model.roleNames()[CustomModel::BarRole], bar);
@@ -1457,7 +1457,7 @@ void tst_EnginioModel::setData()
 
     {   // init the model
         QSignalSpy spy(&model, SIGNAL(modelReset()));
-        model.setEnginio(&client);
+        model.setClient(&client);
 
         QTRY_VERIFY(spy.count() > 0);
     }
@@ -1518,7 +1518,7 @@ void tst_EnginioModel::deleteReply()
     model.disableNotifications();
     model.setOperation(EnginioClient::UserOperation);
     model.setQuery(query);
-    model.setEnginio(&client);
+    model.setClient(&client);
 
     QJsonObject newUser;
     newUser.insert("username", QString::fromUtf8("fool"));
diff --git a/tests/auto/qmltests/tst_model.qml b/tests/auto/qmltests/tst_model.qml
index de4ccb1..0262300 100644
--- a/tests/auto/qmltests/tst_model.qml
+++ b/tests/auto/qmltests/tst_model.qml
@@ -87,7 +87,7 @@ Item {
 
         EnginioModel {
             id: modelInvalidRow
-            enginio: Enginio {
+            client: Enginio {
                 serviceUrl: AppConfig.backendData.serviceUrl
                 backendId: AppConfig.backendData.id
             }
@@ -139,7 +139,7 @@ Item {
         SignalSpy {
             id: modelCreateEnginioChanged
             target: modelCreate
-            signalName: "enginioChanged"
+            signalName: "clientChanged"
         }
 
         SignalSpy {
@@ -155,25 +155,25 @@ Item {
         }
 
         function init() {
-            modelCreate.enginio = null
+            modelCreate.client = null
         }
 
         function cleanupTestCase() {
-            modelCreate.enginio = null
+            modelCreate.client = null
         }
 
         function test_assignClient() {
             var signalCount = modelCreateEnginioChanged.count
-            modelCreate.enginio = enginioClientCreate
-            verify(modelCreate.enginio == enginioClientCreate)
+            modelCreate.client = enginioClientCreate
+            verify(modelCreate.client == enginioClientCreate)
             tryCompare(modelCreateEnginioChanged, "count", ++signalCount)
 
-            modelCreate.enginio = null
-            verify(modelCreate.enginio === null)
+            modelCreate.client = null
+            verify(modelCreate.client === null)
             tryCompare(modelCreateEnginioChanged, "count", ++signalCount)
 
-            modelCreate.enginio = enginioClientCreate
-            verify(modelCreate.enginio == enginioClientCreate)
+            modelCreate.client = enginioClientCreate
+            verify(modelCreate.client == enginioClientCreate)
             tryCompare(modelCreateEnginioChanged, "count", ++signalCount)
         }
 
@@ -208,7 +208,7 @@ Item {
 
         EnginioModel {
             id: modelQuery
-            enginio: Enginio {
+            client: Enginio {
                 id: enginioClientQuery
                 serviceUrl: AppConfig.backendData.serviceUrl
 
@@ -225,14 +225,14 @@ Item {
         }
 
         function _query(query, operation) {
-            var enginioClient = modelQuery.enginio
-            modelQuery.enginio = null
+            var enginioClient = modelQuery.client
+            modelQuery.client = null
             var count = modelQuery.resetCount
             modelQuery.operation = operation
             modelQuery.query = query
             // re-assigning the same object should not trigger the property change
             modelQuery.query = query
-            modelQuery.enginio = enginioClient
+            modelQuery.client = enginioClient
             tryCompare(modelQuery, "resetCount", ++count, 10000)
         }
 
@@ -270,7 +270,7 @@ Item {
 
         EnginioModel {
             id: modelModify
-            enginio: Enginio {
+            client: Enginio {
                 id: enginioClientModify
                 serviceUrl: AppConfig.backendData.serviceUrl
 
@@ -331,7 +331,7 @@ Item {
 
         EnginioModel {
             id: modelModifyUndblocked
-            enginio: Enginio {
+            client: Enginio {
                 id: enginioClientModifyUndblocked
                 serviceUrl: AppConfig.backendData.serviceUrl
 
@@ -391,7 +391,7 @@ Item {
 
         EnginioModel {
             id: modelModifyChaos
-            enginio: Enginio {
+            client: Enginio {
                 id: enginioClientModifyChaos
                 serviceUrl: AppConfig.backendData.serviceUrl
 
@@ -452,7 +452,7 @@ Item {
 
         EnginioModel {
             id: modelRowCount
-            enginio: Enginio {
+            client: Enginio {
                 serviceUrl: AppConfig.backendData.serviceUrl
 
                 property int errorCount: 0