Rename EnginoModelBase to EnginioBaseModel

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

7 files changed, 70 insertions, 70 deletions

diff --git a/src/enginio_client/enginio_client.pro b/src/enginio_client/enginio_client.pro
index 433863b..039c591 100644
--- a/src/enginio_client/enginio_client.pro
+++ b/src/enginio_client/enginio_client.pro
@@ -21,6 +21,8 @@ HEADERS += \
     chunkdevice_p.h \
     enginio.h \
     enginiobackendconnection_p.h \
+    enginiobasemodel.h \
+    enginiobasemodel_p.h \
     enginioclient.h\
     enginioclient_global.h \
     enginioclient_p.h \
@@ -33,8 +35,6 @@ HEADERS += \
     enginiodummyreply_p.h \
     enginiostring_p.h \
     enginioclientconnection.h \
-    enginiomodelbase.h \
-    enginiomodelbase_p.h \
     enginiooauth2authentication.h \
     enginioreplystate.h
 
diff --git a/src/enginio_client/enginiomodelbase.h b/src/enginio_client/enginiobasemodel.h
index 336f7dd..a74ecf5 100644
--- a/src/enginio_client/enginiomodelbase.h
+++ b/src/enginio_client/enginiobasemodel.h
@@ -49,15 +49,15 @@
 
 QT_BEGIN_NAMESPACE
 
-class EnginioModelBasePrivate;
-class ENGINIOCLIENT_EXPORT EnginioModelBase : public QAbstractListModel
+class EnginioBaseModelPrivate;
+class ENGINIOCLIENT_EXPORT EnginioBaseModel : public QAbstractListModel
 {
     Q_OBJECT
 
 protected:
-    explicit EnginioModelBase(EnginioModelBasePrivate &dd, QObject *parent);
+    explicit EnginioBaseModel(EnginioBaseModelPrivate &dd, QObject *parent);
 public:
-    ~EnginioModelBase();
+    ~EnginioBaseModel();
 
     virtual Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE;
     virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
@@ -72,8 +72,8 @@ public:
     void disableNotifications();
 
 private:
-    Q_DISABLE_COPY(EnginioModelBase)
-    Q_DECLARE_PRIVATE(EnginioModelBase)
+    Q_DISABLE_COPY(EnginioBaseModel)
+    Q_DECLARE_PRIVATE(EnginioBaseModel)
     friend class EnginioModelPrivate;
 };
 
diff --git a/src/enginio_client/enginiomodelbase_p.h b/src/enginio_client/enginiobasemodel_p.h
index b881c9f..9e7417d 100644
--- a/src/enginio_client/enginiomodelbase_p.h
+++ b/src/enginio_client/enginiobasemodel_p.h
@@ -50,8 +50,8 @@
 #include <Enginio/private/enginiodummyreply_p.h>
 #include <Enginio/enginioreplystate.h>
 #include <Enginio/private/enginiobackendconnection_p.h>
-#include <Enginio/enginiomodelbase.h>
-#include <Enginio/private/enginiomodelbase_p.h>
+#include <Enginio/enginiobasemodel.h>
+#include <Enginio/private/enginiobasemodel_p.h>
 
 #include <QtCore/qdatetime.h>
 #include <QtCore/qdebug.h>
@@ -255,11 +255,11 @@ public:
 };
 
 
-class ENGINIOCLIENT_EXPORT EnginioModelBasePrivate : public QAbstractItemModelPrivate {
+class ENGINIOCLIENT_EXPORT EnginioBaseModelPrivate : public QAbstractItemModelPrivate {
 protected:
     EnginioClientConnectionPrivate *_enginio;
     Enginio::Operation _operation;
-    EnginioModelBase *q;
+    EnginioBaseModel *q;
     QVector<QMetaObject::Connection> _clientConnections;
     QObject *_replyConnectionConntext;
 
@@ -283,7 +283,7 @@ protected:
 
         struct NotificationReceived
         {
-            EnginioModelBasePrivate *model;
+            EnginioBaseModelPrivate *model;
 
             void operator ()(QJsonObject data)
             {
@@ -319,7 +319,7 @@ protected:
             _connection = (EnginioBackendConnection*)-1;
         }
 
-        void connectToBackend(EnginioModelBasePrivate *model, EnginioClientConnectionPrivate *enginio, const QJsonObject &filter)
+        void connectToBackend(EnginioBaseModelPrivate *model, EnginioClientConnectionPrivate *enginio, const QJsonObject &filter)
         {
             if (qintptr(_connection) == -1)
                 return;
@@ -336,7 +336,7 @@ protected:
 
     struct FinishedRemoveRequest
     {
-        EnginioModelBasePrivate *model;
+        EnginioBaseModelPrivate *model;
         const QString id;
         EnginioReplyState *reply;
         void operator ()()
@@ -347,7 +347,7 @@ protected:
 
     struct FinishedUpdateRequest
     {
-        EnginioModelBasePrivate *model;
+        EnginioBaseModelPrivate *model;
         const QString id;
         const QJsonObject oldValue;
         EnginioReplyState *reply;
@@ -359,7 +359,7 @@ protected:
 
     struct FinishedCreateRequest
     {
-        EnginioModelBasePrivate *model;
+        EnginioBaseModelPrivate *model;
         const QString tmpId;
         EnginioReplyState *reply;
         void operator ()()
@@ -370,7 +370,7 @@ protected:
 
     struct FinishedFullQueryRequest
     {
-        EnginioModelBasePrivate *model;
+        EnginioBaseModelPrivate *model;
         EnginioReplyState *reply;
         void operator ()()
         {
@@ -380,7 +380,7 @@ protected:
 
     struct FinishedIncrementalUpdateRequest
     {
-        EnginioModelBasePrivate *model;
+        EnginioBaseModelPrivate *model;
         const QJsonObject query;
         EnginioReplyState *reply;
         void operator ()()
@@ -391,9 +391,9 @@ protected:
 
     class QueryChanged
     {
-        EnginioModelBasePrivate *model;
+        EnginioBaseModelPrivate *model;
     public:
-        QueryChanged(EnginioModelBasePrivate *m)
+        QueryChanged(EnginioBaseModelPrivate *m)
             : model(m)
         {
             Q_ASSERT(m);
@@ -406,7 +406,7 @@ protected:
     };
 
 public:
-    EnginioModelBasePrivate(EnginioModelBase *q_ptr)
+    EnginioBaseModelPrivate(EnginioBaseModel *q_ptr)
         : _enginio(0)
         , _operation()
         , q(q_ptr)
@@ -417,7 +417,7 @@ public:
     {
     }
 
-    virtual ~EnginioModelBasePrivate();
+    virtual ~EnginioBaseModelPrivate();
 
     void disableNotifications()
     {
@@ -463,10 +463,10 @@ public:
     struct SwapNetworkReplyBase
     {
         EnginioReplyState *_reply;
-        EnginioModelBasePrivate *_model;
+        EnginioBaseModelPrivate *_model;
         QJsonObject _object;
         QString _tmpId;
-        QPointer<EnginioModelBase> _modelGuard;
+        QPointer<EnginioBaseModel> _modelGuard;
 
         void markAsError(QByteArray msg)
         {
@@ -903,9 +903,9 @@ public:
 
 
 template<typename Derived, typename Types>
-struct EnginioModelPrivateT : public EnginioModelBasePrivate
+struct EnginioModelPrivateT : public EnginioBaseModelPrivate
 {
-    typedef EnginioModelBasePrivate Base;
+    typedef EnginioBaseModelPrivate Base;
     typedef typename Types::Reply Reply;
     typedef typename Types::Public Public;
     typedef typename Types::Client Client;
@@ -931,7 +931,7 @@ struct EnginioModelPrivateT : public EnginioModelBasePrivate
         }
     };
 
-    EnginioModelPrivateT(EnginioModelBase *pub)
+    EnginioModelPrivateT(EnginioBaseModel *pub)
         : Base(pub)
     {}
 
diff --git a/src/enginio_client/enginiomodel.cpp b/src/enginio_client/enginiomodel.cpp
index e1c2543..eb3facb 100644
--- a/src/enginio_client/enginiomodel.cpp
+++ b/src/enginio_client/enginiomodel.cpp
@@ -45,8 +45,8 @@
 #include <Enginio/private/enginiofakereply_p.h>
 #include <Enginio/private/enginiodummyreply_p.h>
 #include <Enginio/private/enginiobackendconnection_p.h>
-#include <Enginio/enginiomodelbase.h>
-#include <Enginio/private/enginiomodelbase_p.h>
+#include <Enginio/enginiobasemodel.h>
+#include <Enginio/private/enginiobasemodel_p.h>
 
 #include <QtCore/qobject.h>
 #include <QtCore/qvector.h>
@@ -55,7 +55,7 @@
 
 QT_BEGIN_NAMESPACE
 
-const int EnginioModelBasePrivate::IncrementalModelUpdate = -2;
+const int EnginioBaseModelPrivate::IncrementalModelUpdate = -2;
 
 /*!
   \class EnginioModel
@@ -154,7 +154,7 @@ const int EnginioModelBasePrivate::IncrementalModelUpdate = -2;
   For the QML version of this class see \l {Enginio1::EnginioModel}{EnginioModel (QML)}
 */
 
-EnginioModelBasePrivate::~EnginioModelBasePrivate()
+EnginioBaseModelPrivate::~EnginioBaseModelPrivate()
 {
     foreach (const QMetaObject::Connection &connection, _clientConnections)
         QObject::disconnect(connection);
@@ -162,7 +162,7 @@ EnginioModelBasePrivate::~EnginioModelBasePrivate()
     delete _replyConnectionConntext;
 }
 
-void EnginioModelBasePrivate::receivedNotification(QJsonObject data)
+void EnginioBaseModelPrivate::receivedNotification(QJsonObject data)
 {
     const QJsonObject origin = data[EnginioString::origin].toObject();
     const QString requestId = origin[EnginioString::apiRequestId].toString();
@@ -184,7 +184,7 @@ void EnginioModelBasePrivate::receivedNotification(QJsonObject data)
     }
 }
 
-void EnginioModelBasePrivate::receivedRemoveNotification(const QJsonObject &object, int rowHint)
+void EnginioBaseModelPrivate::receivedRemoveNotification(const QJsonObject &object, int rowHint)
 {
     int row = rowHint;
     if (rowHint == NoHintRow) {
@@ -205,7 +205,7 @@ void EnginioModelBasePrivate::receivedRemoveNotification(const QJsonObject &obje
     q->endRemoveRows();
 }
 
-void EnginioModelBasePrivate::receivedUpdateNotification(const QJsonObject &object, const QString &idHint, int row)
+void EnginioBaseModelPrivate::receivedUpdateNotification(const QJsonObject &object, const QString &idHint, int row)
 {
     // update an existing object
     if (row == NoHintRow) {
@@ -247,7 +247,7 @@ void EnginioModelBasePrivate::receivedUpdateNotification(const QJsonObject &obje
     }
 }
 
-void EnginioModelBasePrivate::fullQueryReset(const QJsonArray &data)
+void EnginioBaseModelPrivate::fullQueryReset(const QJsonArray &data)
 {
     delete _replyConnectionConntext;
     _replyConnectionConntext = new QObject();
@@ -259,7 +259,7 @@ void EnginioModelBasePrivate::fullQueryReset(const QJsonArray &data)
     q->endResetModel();
 }
 
-void EnginioModelBasePrivate::receivedCreateNotification(const QJsonObject &object)
+void EnginioBaseModelPrivate::receivedCreateNotification(const QJsonObject &object)
 {
     // create a new object
     QString id = object[EnginioString::id].toString();
@@ -273,7 +273,7 @@ void EnginioModelBasePrivate::receivedCreateNotification(const QJsonObject &obje
     q->endInsertRows();
 }
 
-void EnginioModelBasePrivate::syncRoles()
+void EnginioBaseModelPrivate::syncRoles()
 {
     QJsonObject firstObject(_data.first().toObject());
 
@@ -331,7 +331,7 @@ class EnginioModelPrivate: public EnginioModelPrivateT<EnginioModelPrivate, Type
 public:
     typedef EnginioModelPrivateT<EnginioModelPrivate, Types> Base;
 
-    EnginioModelPrivate(EnginioModelBase *pub)
+    EnginioModelPrivate(EnginioBaseModel *pub)
         : Base(pub)
     {}
 
@@ -355,7 +355,7 @@ public:
     Constructs a new model with \a parent as QObject parent.
 */
 EnginioModel::EnginioModel(QObject *parent)
-    : EnginioModelBase(*new EnginioModelPrivate(this), parent)
+    : EnginioBaseModel(*new EnginioModelPrivate(this), parent)
 {
     Q_D(EnginioModel);
     d->init();
@@ -371,14 +371,14 @@ EnginioModel::~EnginioModel()
     \internal
     Constructs a new model with \a parent as QObject parent.
 */
-EnginioModelBase::EnginioModelBase(EnginioModelBasePrivate &dd, QObject *parent)
+EnginioBaseModel::EnginioBaseModel(EnginioBaseModelPrivate &dd, QObject *parent)
     : QAbstractListModel(dd, parent)
 {}
 
 /*!
     Destroys the model.
 */
-EnginioModelBase::~EnginioModelBase()
+EnginioBaseModel::~EnginioBaseModel()
 {}
 
 /*!
@@ -402,7 +402,7 @@ EnginioModelBase::~EnginioModelBase()
   \note Some objects may not contain value for a static role, it may happen
   for example when an item is not in sync with the backend.
 
-  \sa EnginioModelBase::roleNames()
+  \sa EnginioBaseModel::roleNames()
 */
 
 /*!
@@ -540,7 +540,7 @@ EnginioReply *EnginioModel::setData(int row, const QVariant &value, const QStrin
     \overload
     \internal
 */
-Qt::ItemFlags EnginioModelBase::flags(const QModelIndex &index) const
+Qt::ItemFlags EnginioBaseModel::flags(const QModelIndex &index) const
 {
     return QAbstractListModel::flags(index) | Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable;
 }
@@ -551,9 +551,9 @@ Qt::ItemFlags EnginioModelBase::flags(const QModelIndex &index) const
     With the \l roleNames() function the mapping of JSON property names to data roles used as \a role is available.
     The data returned will be JSON (for example a string for simple objects, or a JSON Object).
 */
-QVariant EnginioModelBase::data(const QModelIndex &index, int role) const
+QVariant EnginioBaseModel::data(const QModelIndex &index, int role) const
 {
-    Q_D(const EnginioModelBase);
+    Q_D(const EnginioBaseModel);
     if (!index.isValid() || index.row() < 0 || index.row() >= d->rowCount())
         return QVariant();
 
@@ -564,9 +564,9 @@ QVariant EnginioModelBase::data(const QModelIndex &index, int role) const
     \overload
     \internal
 */
-int EnginioModelBase::rowCount(const QModelIndex &parent) const
+int EnginioBaseModel::rowCount(const QModelIndex &parent) const
 {
-    Q_D(const EnginioModelBase);
+    Q_D(const EnginioBaseModel);
     Q_UNUSED(parent);
     return d->rowCount();
 }
@@ -575,9 +575,9 @@ int EnginioModelBase::rowCount(const QModelIndex &parent) const
     \overload
     \internal
 */
-bool EnginioModelBase::setData(const QModelIndex &index, const QVariant &value, int role)
+bool EnginioBaseModel::setData(const QModelIndex &index, const QVariant &value, int role)
 {
-    Q_D(EnginioModelBase);
+    Q_D(EnginioBaseModel);
     if (unsigned(index.row()) >= unsigned(d->rowCount()))
         return false;
 
@@ -601,9 +601,9 @@ bool EnginioModelBase::setData(const QModelIndex &index, const QVariant &value,
     take the result into account as shown in the {todos-cpp}{Todos Example}
     \note custom role indexes have to be greater then or equal to \l Enginio::LastRole
 */
-QHash<int, QByteArray> EnginioModelBase::roleNames() const
+QHash<int, QByteArray> EnginioBaseModel::roleNames() const
 {
-    Q_D(const EnginioModelBase);
+    Q_D(const EnginioBaseModel);
     return d->roleNames();
 }
 
@@ -611,9 +611,9 @@ QHash<int, QByteArray> EnginioModelBase::roleNames() const
     \internal
     Allows to disable notifications for autotests.
 */
-void EnginioModelBase::disableNotifications()
+void EnginioBaseModel::disableNotifications()
 {
-    Q_D(EnginioModelBase);
+    Q_D(EnginioBaseModel);
     d->disableNotifications();
 }
 
@@ -621,9 +621,9 @@ void EnginioModelBase::disableNotifications()
     \overload
     \internal
 */
-void EnginioModelBase::fetchMore(const QModelIndex &parent)
+void EnginioBaseModel::fetchMore(const QModelIndex &parent)
 {
-    Q_D(EnginioModelBase);
+    Q_D(EnginioBaseModel);
     d->fetchMore(parent.row());
 }
 
@@ -631,10 +631,10 @@ void EnginioModelBase::fetchMore(const QModelIndex &parent)
     \overload
     \internal
 */
-bool EnginioModelBase::canFetchMore(const QModelIndex &parent) const
+bool EnginioBaseModel::canFetchMore(const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
-    Q_D(const EnginioModelBase);
+    Q_D(const EnginioBaseModel);
     return d->canFetchMore();
 }
 
diff --git a/src/enginio_client/enginiomodel.h b/src/enginio_client/enginiomodel.h
index fb65fa7..81c7eeb 100644
--- a/src/enginio_client/enginiomodel.h
+++ b/src/enginio_client/enginiomodel.h
@@ -46,7 +46,7 @@
 #include <QtCore/qscopedpointer.h>
 
 #include <Enginio/enginioclient.h>
-#include <Enginio/enginiomodelbase.h>
+#include <Enginio/enginiobasemodel.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -55,7 +55,7 @@ class ENGINIOCLIENT_EXPORT EnginioModel
 #ifdef Q_QDOC
         : public QAbstractListModel
 #else
-        : public EnginioModelBase
+        : public EnginioBaseModel
 #endif
 {
     Q_OBJECT
@@ -80,7 +80,7 @@ public:
     Q_INVOKABLE EnginioReply *append(const QJsonObject &value);
     Q_INVOKABLE EnginioReply *remove(int row);
     Q_INVOKABLE EnginioReply *setData(int row, const QVariant &value, const QString &role);
-    using EnginioModelBase::setData;
+    using EnginioBaseModel::setData;
 
 Q_SIGNALS:
     void queryChanged(const QJsonObject &query);
@@ -90,7 +90,7 @@ Q_SIGNALS:
 private:
     Q_DISABLE_COPY(EnginioModel)
     Q_DECLARE_PRIVATE(EnginioModel)
-    friend class EnginioModelBasePrivate;
+    friend class EnginioBaseModelPrivate;
 };
 
 QT_END_NAMESPACE
diff --git a/src/enginio_plugin/enginioqmlmodel.cpp b/src/enginio_plugin/enginioqmlmodel.cpp
index e5bcd49..ede569a 100644
--- a/src/enginio_plugin/enginioqmlmodel.cpp
+++ b/src/enginio_plugin/enginioqmlmodel.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "enginioqmlmodel.h"
-#include <Enginio/private/enginiomodelbase_p.h>
+#include <Enginio/private/enginiobasemodel_p.h>
 #include <QtCore/qjsondocument.h>
 #include "enginioqmlclient_p.h"
 #include "enginioqmlreply.h"
@@ -155,7 +155,7 @@ public:
         return QJsonDocument::fromJson(buffer).object();
     }
 
-    EnginioQmlModelPrivate(EnginioModelBase *pub)
+    EnginioQmlModelPrivate(EnginioBaseModel *pub)
         : Base(pub)
     {}
 
@@ -191,13 +191,13 @@ public:
 };
 
 EnginioQmlModel::EnginioQmlModel(QObject *parent)
-    : EnginioModelBase(*new EnginioQmlModelPrivate(this), parent)
+    : EnginioBaseModel(*new EnginioQmlModelPrivate(this), parent)
 {
     Q_D(EnginioQmlModel);
     d->init();
-    QObject::connect(this, &EnginioModelBase::rowsRemoved, this, &EnginioQmlModel::rowCountChanged);
-    QObject::connect(this, &EnginioModelBase::rowsInserted, this, &EnginioQmlModel::rowCountChanged);
-    QObject::connect(this, &EnginioModelBase::modelReset, this, &EnginioQmlModel::rowCountChanged);
+    QObject::connect(this, &EnginioBaseModel::rowsRemoved, this, &EnginioQmlModel::rowCountChanged);
+    QObject::connect(this, &EnginioBaseModel::rowsInserted, this, &EnginioQmlModel::rowCountChanged);
+    QObject::connect(this, &EnginioBaseModel::modelReset, this, &EnginioQmlModel::rowCountChanged);
 }
 
 EnginioQmlModel::~EnginioQmlModel()
diff --git a/src/enginio_plugin/enginioqmlmodel.h b/src/enginio_plugin/enginioqmlmodel.h
index 9f19593..8fe9ea2 100644
--- a/src/enginio_plugin/enginioqmlmodel.h
+++ b/src/enginio_plugin/enginioqmlmodel.h
@@ -42,7 +42,7 @@
 #ifndef ENGINIOQMLMODEL_H
 #define ENGINIOQMLMODEL_H
 
-#include <Enginio/enginiomodelbase.h>
+#include <Enginio/enginiobasemodel.h>
 #include <QtQml/qjsvalue.h>
 
 QT_BEGIN_NAMESPACE
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 class EnginioQmlReply;
 class EnginioQmlClient;
 class EnginioQmlModelPrivate;
-class EnginioQmlModel : public EnginioModelBase
+class EnginioQmlModel : public EnginioBaseModel
 {
     Q_OBJECT
     Q_DISABLE_COPY(EnginioQmlModel)