Rename the QIviSearchAndBrowseModelItem to QIviStandardItem

The QIviStandardItem should be used as a base for all autogenerated
structs and also within the QIviPagingModel and all derived class.
The previous name was too specific for this usecase.

Forward headers for the old name and a typedef are created to make the
transition as smooth as possible.

Task-number: AUTOSUITE-584
Change-Id: I71b6cccc1c4f4317c6c9ea327c7672698f7dbe55
Reviewed-by: Antti Hölttä <ahoelttae@luxoft.com>

23 files changed, 159 insertions, 155 deletions

diff --git a/src/ivicore/ivicore.pro b/src/ivicore/ivicore.pro
index 9c12f3f..55ca600 100644
--- a/src/ivicore/ivicore.pro
+++ b/src/ivicore/ivicore.pro
@@ -49,7 +49,7 @@ HEADERS += \
     qivisearchandbrowsemodel_p.h \
     qivisearchandbrowsemodelinterface.h \
     qivisearchandbrowsemodelinterface_p.h \
-    qivisearchandbrowsemodelitem.h \
+    qivistandarditem.h \
     qivifeatureinterface.h \
     qividefaultpropertyoverrider_p.h \
     qivipendingreply.h \
@@ -72,7 +72,7 @@ SOURCES += \
     qivipagingmodelinterface.cpp \
     qivisearchandbrowsemodel.cpp \
     qivisearchandbrowsemodelinterface.cpp \
-    qivisearchandbrowsemodelitem.cpp \
+    qivistandarditem.cpp \
     qivifeatureinterface.cpp \
     qividefaultpropertyoverrider.cpp \
     qiviqmlconversion_helper.cpp \
diff --git a/src/ivicore/qivipagingmodel.cpp b/src/ivicore/qivipagingmodel.cpp
index d5eb162..ece835d 100644
--- a/src/ivicore/qivipagingmodel.cpp
+++ b/src/ivicore/qivipagingmodel.cpp
@@ -62,7 +62,8 @@ QIviPagingModelPrivate::QIviPagingModelPrivate(const QString &interface, QIviPag
     , m_loadingType(QIviPagingModel::FetchMore)
 {
     qRegisterMetaType<QIviPagingModel::LoadingType>();
-    qRegisterMetaType<QIviSearchAndBrowseModelItem>();
+    qRegisterMetaType<QIviStandardItem>();
+    qRegisterMetaType<QIviStandardItem>("QIviSearchAndBrowseModelItem");
 }
 
 QIviPagingModelPrivate::~QIviPagingModelPrivate()
@@ -239,13 +240,13 @@ void QIviPagingModelPrivate::clearToDefaults()
     m_itemList.clear();
 }
 
-const QIviSearchAndBrowseModelItem *QIviPagingModelPrivate::itemAt(int i) const
+const QIviStandardItem *QIviPagingModelPrivate::itemAt(int i) const
 {
     const QVariant &var = m_itemList.at(i);
     if (!var.isValid())
         return nullptr;
 
-    return qtivi_gadgetFromVariant<QIviSearchAndBrowseModelItem>(q_ptr, var);
+    return qtivi_gadgetFromVariant<QIviStandardItem>(q_ptr, var);
 }
 
 QIviPagingModelInterface *QIviPagingModelPrivate::backend() const
@@ -333,7 +334,7 @@ QIviPagingModelInterface *QIviPagingModelPrivate::backend() const
     The model only fetches the data it really needs and can it can be configured how this can be done using
     the loadingType property.
 
-    All rows in the model need to be subclassed from SearchAndBrowseModelItem.
+    All rows in the model need to be subclassed from StandardItem.
 
     The following roles are available in this model:
 
@@ -615,7 +616,7 @@ QVariant QIviPagingModel::data(const QModelIndex &index, int role) const
     if (row >= d->m_fetchedDataCount - d->m_fetchMoreThreshold && canFetchMore(QModelIndex()))
         emit fetchMoreThresholdReached();
 
-    const QIviSearchAndBrowseModelItem *item = d->itemAt(row);
+    const QIviStandardItem *item = d->itemAt(row);
     if (!item) {
         //qWarning() << "Cache miss: Waiting for fetched Data";
         return QVariant();
diff --git a/src/ivicore/qivipagingmodel_p.h b/src/ivicore/qivipagingmodel_p.h
index 4429b00..fe3c572 100644
--- a/src/ivicore/qivipagingmodel_p.h
+++ b/src/ivicore/qivipagingmodel_p.h
@@ -58,7 +58,7 @@
 
 #include "qivipagingmodel.h"
 #include "qivipagingmodelinterface.h"
-#include "qivisearchandbrowsemodelitem.h"
+#include "qivistandarditem.h"
 
 #include <QBitArray>
 #include <QUuid>
@@ -79,7 +79,7 @@ public:
     void onFetchMoreThresholdReached();
     virtual void resetModel();
     virtual void clearToDefaults();
-    const QIviSearchAndBrowseModelItem *itemAt(int i) const;
+    const QIviStandardItem *itemAt(int i) const;
     void fetchData(int startIndex);
 
     QIviPagingModelInterface *backend() const;
diff --git a/src/ivicore/qivisearchandbrowsemodel.cpp b/src/ivicore/qivisearchandbrowsemodel.cpp
index a4ddf9b..3b6d2a1 100644
--- a/src/ivicore/qivisearchandbrowsemodel.cpp
+++ b/src/ivicore/qivisearchandbrowsemodel.cpp
@@ -319,7 +319,7 @@ void QIviSearchAndBrowseModelPrivate::updateContentType(const QString &contentTy
     they are created instead of retrieving everything and sort or filter it locally. In addition the SearchAndBrowseModel
     only fetches the data it really needs and can it can be configured how this can be done.
 
-    All rows in the model need to be subclassed from SearchAndBrowseModelItem.
+    All rows in the model need to be subclassed from StandardItem.
 
     The following roles are available in this model:
 
@@ -647,7 +647,7 @@ bool QIviSearchAndBrowseModel::canGoForward(int i) const
         return false;
     }
 
-    const QIviSearchAndBrowseModelItem *item = d->itemAt(i);
+    const QIviStandardItem *item = d->itemAt(i);
     if (!item)
         return false;
 
@@ -696,7 +696,7 @@ QIviSearchAndBrowseModel *QIviSearchAndBrowseModel::goForward(int i, NavigationT
         return nullptr;
     }
 
-    const QIviSearchAndBrowseModelItem *item = d->itemAt(i);
+    const QIviStandardItem *item = d->itemAt(i);
     if (!item)
         return nullptr;
 
@@ -723,7 +723,7 @@ QIviSearchAndBrowseModel *QIviSearchAndBrowseModel::goForward(int i, NavigationT
 }
 
 /*!
-    \qmlmethod SearchAndBrowseModel::insert(int index, SearchAndBrowseModelItem item)
+    \qmlmethod SearchAndBrowseModel::insert(int index, StandardItem item)
 
     Insert the \a item at the position \a index.
 
@@ -744,7 +744,7 @@ QIviSearchAndBrowseModel *QIviSearchAndBrowseModel::goForward(int i, NavigationT
 QIviPendingReply<void> QIviSearchAndBrowseModel::insert(int index, const QVariant &variant)
 {
     Q_D(QIviSearchAndBrowseModel);
-    const auto item = qtivi_gadgetFromVariant<QIviSearchAndBrowseModelItem>(this, variant);
+    const auto item = qtivi_gadgetFromVariant<QIviStandardItem>(this, variant);
     if (!item)
         return QIviPendingReply<void>::createFailedReply();
 
@@ -827,7 +827,7 @@ QIviPendingReply<void> QIviSearchAndBrowseModel::move(int cur_index, int new_ind
 }
 
 /*!
-    \qmlmethod SearchAndBrowseModel::indexOf(SearchAndBrowseModelItem item)
+    \qmlmethod SearchAndBrowseModel::indexOf(StandardItem item)
 
     Determines the index of \a item in this model.
 
@@ -844,7 +844,7 @@ QIviPendingReply<void> QIviSearchAndBrowseModel::move(int cur_index, int new_ind
 QIviPendingReply<int> QIviSearchAndBrowseModel::indexOf(const QVariant &variant)
 {
     Q_D(QIviSearchAndBrowseModel);
-    const auto *item = qtivi_gadgetFromVariant<QIviSearchAndBrowseModelItem>(this, variant);
+    const auto *item = qtivi_gadgetFromVariant<QIviStandardItem>(this, variant);
     if (!item)
         return QIviPendingReply<int>::createFailedReply();
 
diff --git a/src/ivicore/qivisearchandbrowsemodel_p.h b/src/ivicore/qivisearchandbrowsemodel_p.h
index 6975ba5..118ab66 100644
--- a/src/ivicore/qivisearchandbrowsemodel_p.h
+++ b/src/ivicore/qivisearchandbrowsemodel_p.h
@@ -59,7 +59,7 @@
 #include "qiviqueryterm.h"
 #include "qivisearchandbrowsemodel.h"
 #include "qivisearchandbrowsemodelinterface.h"
-#include "qivisearchandbrowsemodelitem.h"
+#include "qivistandarditem.h"
 
 #include <QBitArray>
 #include <QUuid>
diff --git a/src/ivicore/qivisearchandbrowsemodelinterface.cpp b/src/ivicore/qivisearchandbrowsemodelinterface.cpp
index caeee4a..829e2a4 100644
--- a/src/ivicore/qivisearchandbrowsemodelinterface.cpp
+++ b/src/ivicore/qivisearchandbrowsemodelinterface.cpp
@@ -184,7 +184,7 @@ void QIviSearchAndBrowseModelInterface::registerContentType(const QMetaObject &o
 */
 
 /*!
-    \fn QIviSearchAndBrowseModelInterface::insert(const QUuid &identifier, const QString &type, int index, const QIviSearchAndBrowseModelItem *item)
+    \fn QIviSearchAndBrowseModelInterface::insert(const QUuid &identifier, const QString &type, int index, const QIviStandardItem *item)
 
     Adds the browsable \a item into the current dataset of the QIviSearchAndBrowseModel instance identified by \a identifier and the current content type \a type at \a index.
     The provided item could be owned by another model or QML, because of that it's expected that the backend stores its internal representation.
@@ -209,7 +209,7 @@ void QIviSearchAndBrowseModelInterface::registerContentType(const QMetaObject &o
 */
 
 /*!
-    \fn QIviSearchAndBrowseModelInterface::indexOf(const QUuid &identifier, const QString &type, const QIviSearchAndBrowseModelItem *item)
+    \fn QIviSearchAndBrowseModelInterface::indexOf(const QUuid &identifier, const QString &type, const QIviStandardItem *item)
 
     Determines the index of \a item in the model identified by \a identifier and \a type.
 */
diff --git a/src/ivicore/qivisearchandbrowsemodelinterface.h b/src/ivicore/qivisearchandbrowsemodelinterface.h
index fad4902..c87da8e 100644
--- a/src/ivicore/qivisearchandbrowsemodelinterface.h
+++ b/src/ivicore/qivisearchandbrowsemodelinterface.h
@@ -51,7 +51,7 @@
 #include <QtIviCore/QtIviCoreModule>
 #include <QtIviCore/QIviPagingModelInterface>
 #include <QtIviCore/QIviSearchAndBrowseModel>
-#include <QtIviCore/QIviSearchAndBrowseModelItem>
+#include <QtIviCore/QIviStandardItem>
 
 QT_BEGIN_NAMESPACE
 
@@ -76,10 +76,10 @@ public:
     virtual bool canGoForward(const QUuid &identifier, const QString &type, const QString &itemId) = 0; //Every Item has a id property which is filled by the backend implementation.
     virtual QString goForward(const QUuid &identifier, const QString &type, const QString &itemId) = 0; //Returns the new type identifier used for the next level. The identifier will stay the same for the following calls but the type might differ.
 
-    virtual QIviPendingReply<void> insert(const QUuid &identifier, const QString &type, int index, const QIviSearchAndBrowseModelItem *item) = 0;
+    virtual QIviPendingReply<void> insert(const QUuid &identifier, const QString &type, int index, const QIviStandardItem *item) = 0;
     virtual QIviPendingReply<void> remove(const QUuid &identifier, const QString &type, int index) = 0;
     virtual QIviPendingReply<void> move(const QUuid &identifier, const QString &type, int currentIndex, int newIndex) = 0;
-    virtual QIviPendingReply<int> indexOf(const QUuid &identifier, const QString &type, const QIviSearchAndBrowseModelItem *item) = 0;
+    virtual QIviPendingReply<int> indexOf(const QUuid &identifier, const QString &type, const QIviStandardItem *item) = 0;
 
 protected:
     template <typename T>
diff --git a/src/ivicore/qivisearchandbrowsemodelitem.cpp b/src/ivicore/qivistandarditem.cpp
index 6ba054c..82626b7 100644
--- a/src/ivicore/qivisearchandbrowsemodelitem.cpp
+++ b/src/ivicore/qivistandarditem.cpp
@@ -39,72 +39,72 @@
 **
 ****************************************************************************/
 
-#include "qivisearchandbrowsemodelitem.h"
+#include "qivistandarditem.h"
 
 QT_BEGIN_NAMESPACE
 
-class QIviSearchAndBrowseModelItemPrivate : public QSharedData
+class QIviStandardItemPrivate : public QSharedData
 {
 public:
-    QIviSearchAndBrowseModelItemPrivate() = default;
-    QIviSearchAndBrowseModelItemPrivate(const QIviSearchAndBrowseModelItemPrivate &other) = default;
+    QIviStandardItemPrivate() = default;
+    QIviStandardItemPrivate(const QIviStandardItemPrivate &other) = default;
 
     QString m_id;
     QVariantMap m_data;
 };
 
 /*!
-    \class QIviSearchAndBrowseModelItem
+    \class QIviStandardItem
     \inmodule QtIviCore
-    \brief The QIviSearchAndBrowseModelItem is the base class of a row in the QIviSearchAndBrowseModel model.
+    \brief The QIviStandardItem is the base class of a row in the QIviSearchAndBrowseModel model.
 */
 
 /*!
-    \qmltype SearchAndBrowseModelItem
+    \qmltype StandardItem
     \qmlabstract
-    \instantiates QIviSearchAndBrowseModelItem
+    \instantiates QIviStandardItem
     \inqmlmodule QtIvi
-    \brief The SearchAndBrowseModelItem is the base class of a row in the SearchAndBrowseModel model.
+    \brief The StandardItem is the base class of a row in the SearchAndBrowseModel model.
 
     \note This item is not creatable from QML.
 */
 
 /*!
-    \qmlproperty string SearchAndBrowseModelItem::id
+    \qmlproperty string StandardItem::id
     A unique identifier, which can be used to identify this item.
 
     This is mainly used by the backend to implement filtering or browsing.
 */
 
 /*!
-    \property QIviSearchAndBrowseModelItem::id
+    \property QIviStandardItem::id
     A unique identifier, which can be used to identify this item.
 
     This is mainly used by the backend to implement filtering or browsing.
 */
 
 /*!
-    \qmlproperty string SearchAndBrowseModelItem::name
+    \qmlproperty string StandardItem::name
     The name of the item. E.g. The name of a contact in a addressbook, or the artist-name in a list of artists.
 */
 
 /*!
-    \property QIviSearchAndBrowseModelItem::name
+    \property QIviStandardItem::name
     The name of the item. E.g. The name of a contact in a addressbook, or the artist-name in a list of artists.
 */
 
 /*!
-    \qmlproperty string SearchAndBrowseModelItem::type
+    \qmlproperty string StandardItem::type
     The type of the item. E.g. "artist", "track", "contact".
 */
 
 /*!
-    \property QIviSearchAndBrowseModelItem::type
+    \property QIviStandardItem::type
     The type of the item. E.g. "artist", "track", "contact".
 */
 
 /*!
-    \qmlproperty object SearchAndBrowseModelItem::data
+    \qmlproperty object StandardItem::data
     A generic data field which can hold any data.
 
     This can be moved for storing additional data which is not part of the base class.
@@ -112,23 +112,23 @@ public:
 */
 
 /*!
-    \property QIviSearchAndBrowseModelItem::data
+    \property QIviStandardItem::data
     A generic data field which can hold any data.
 
     This can be moved for storing additional data which is not part of the base class.
     E.g. the "composer" of an audio track.
 */
 
-QIviSearchAndBrowseModelItem::QIviSearchAndBrowseModelItem()
-    : d(new QIviSearchAndBrowseModelItemPrivate)
+QIviStandardItem::QIviStandardItem()
+    : d(new QIviStandardItemPrivate)
 {
 
 }
 
 //defined here as a inline default copy constructor leads to compilation errors
-QIviSearchAndBrowseModelItem::QIviSearchAndBrowseModelItem(const QIviSearchAndBrowseModelItem &rhs) = default;
+QIviStandardItem::QIviStandardItem(const QIviStandardItem &rhs) = default;
 
-QIviSearchAndBrowseModelItem &QIviSearchAndBrowseModelItem::operator=(const QIviSearchAndBrowseModelItem &rhs)
+QIviStandardItem &QIviStandardItem::operator=(const QIviStandardItem &rhs)
 {
     if (this != &rhs)
         d.operator=(rhs.d);
@@ -136,34 +136,34 @@ QIviSearchAndBrowseModelItem &QIviSearchAndBrowseModelItem::operator=(const QIvi
 }
 
 //defined here as a inline default destructor leads to compilation errors
-QIviSearchAndBrowseModelItem::~QIviSearchAndBrowseModelItem() = default;
+QIviStandardItem::~QIviStandardItem() = default;
 
-QString QIviSearchAndBrowseModelItem::id() const
+QString QIviStandardItem::id() const
 {
     return d->m_id;
 }
 
-void QIviSearchAndBrowseModelItem::setId(const QString &id)
+void QIviStandardItem::setId(const QString &id)
 {
     d->m_id = id;
 }
 
-QString QIviSearchAndBrowseModelItem::name() const
+QString QIviStandardItem::name() const
 {
     return QString();
 }
 
-QString QIviSearchAndBrowseModelItem::type() const
+QString QIviStandardItem::type() const
 {
     return QString();
 }
 
-QVariantMap QIviSearchAndBrowseModelItem::data() const
+QVariantMap QIviStandardItem::data() const
 {
     return d->m_data;
 }
 
-void QIviSearchAndBrowseModelItem::setData(const QVariantMap &data)
+void QIviStandardItem::setData(const QVariantMap &data)
 {
     d->m_data = data;
 }
@@ -173,13 +173,13 @@ void QIviSearchAndBrowseModelItem::setData(const QVariantMap &data)
 
     \sa operator!=()
 */
-bool QIviSearchAndBrowseModelItem::operator==(const QIviSearchAndBrowseModelItem &other)
+bool QIviStandardItem::operator==(const QIviStandardItem &other)
 {
     return (d->m_id == other.d->m_id);
 }
 
 /*!
-    \fn bool QIviSearchAndBrowseModelItem::operator!=(const QIviSearchAndBrowseModelItem &other)
+    \fn bool QIviStandardItem::operator!=(const QIviStandardItem &other)
 
     Returns \e true if this item is not equal to \a other; otherwise returns false.
 
diff --git a/src/ivicore/qivisearchandbrowsemodelitem.h b/src/ivicore/qivistandarditem.h
index 291af25..e73dd76 100644
--- a/src/ivicore/qivisearchandbrowsemodelitem.h
+++ b/src/ivicore/qivistandarditem.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QIVISEARCHANDBROWSEMODELITEM_H
-#define QIVISEARCHANDBROWSEMODELITEM_H
+#ifndef QIviStandardItem_H
+#define QIviStandardItem_H
 
 #include <QtCore/QMetaType>
 #include <QtCore/QSharedDataPointer>
@@ -50,9 +50,9 @@
 
 QT_BEGIN_NAMESPACE
 
-class QIviSearchAndBrowseModelItemPrivate;
+class QIviStandardItemPrivate;
 
-class Q_QTIVICORE_EXPORT QIviSearchAndBrowseModelItem
+class Q_QTIVICORE_EXPORT QIviStandardItem
 {
     Q_GADGET
 
@@ -62,10 +62,10 @@ class Q_QTIVICORE_EXPORT QIviSearchAndBrowseModelItem
     Q_PROPERTY(QVariantMap data READ data WRITE setData)
 
 public:
-    QIviSearchAndBrowseModelItem();
-    QIviSearchAndBrowseModelItem(const QIviSearchAndBrowseModelItem &);
-    QIviSearchAndBrowseModelItem &operator=(const QIviSearchAndBrowseModelItem &);
-    virtual ~QIviSearchAndBrowseModelItem();
+    QIviStandardItem();
+    QIviStandardItem(const QIviStandardItem &);
+    QIviStandardItem &operator=(const QIviStandardItem &);
+    virtual ~QIviStandardItem();
 
     virtual QString id() const;
     virtual void setId(const QString &id);
@@ -74,17 +74,19 @@ public:
     virtual QVariantMap data() const;
     virtual void setData(const QVariantMap &data);
 
-    bool operator==(const QIviSearchAndBrowseModelItem &other);
-    inline bool operator!=(const QIviSearchAndBrowseModelItem &other) { return !(*this == other); }
+    bool operator==(const QIviStandardItem &other);
+    inline bool operator!=(const QIviStandardItem &other) { return !(*this == other); }
 
 private:
-    QSharedDataPointer<QIviSearchAndBrowseModelItemPrivate> d;
+    QSharedDataPointer<QIviStandardItemPrivate> d;
 };
 
-Q_DECLARE_TYPEINFO(QIviSearchAndBrowseModelItem, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QIviStandardItem, Q_MOVABLE_TYPE);
+
+using QIviSearchAndBrowseModelItem = QIviStandardItem;
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QIviSearchAndBrowseModelItem)
+Q_DECLARE_METATYPE(QIviStandardItem)
 
-#endif // QIVISEARCHANDBROWSEMODELITEM_H
+#endif // QIviStandardItem_H
diff --git a/src/ivimedia/qiviplayableitem.cpp b/src/ivimedia/qiviplayableitem.cpp
index 1733155..16cd7b5 100644
--- a/src/ivimedia/qiviplayableitem.cpp
+++ b/src/ivimedia/qiviplayableitem.cpp
@@ -101,7 +101,7 @@ public:
     \qmltype PlayableItem
     \instantiates QIviPlayableItem
     \inqmlmodule QtIvi.Media
-    \inherits SearchAndBrowseModelItem
+    \inherits StandardItem
     \brief The PlayableItem is the base class of a row in the PlayQueue model.
 
     \note This item is not creatable from QML.
@@ -124,20 +124,20 @@ public:
 */
 
 QIviPlayableItem::QIviPlayableItem()
-    : QIviSearchAndBrowseModelItem()
+    : QIviStandardItem()
     , d(new QIviPlayableItemPrivate)
 {
 }
 
 QIviPlayableItem::QIviPlayableItem(const QIviPlayableItem &rhs)
-    : QIviSearchAndBrowseModelItem(rhs)
+    : QIviStandardItem(rhs)
     , d(rhs.d)
 {
 }
 
 QIviPlayableItem &QIviPlayableItem::operator=(const QIviPlayableItem &rhs)
 {
-    QIviSearchAndBrowseModelItem::operator=(rhs);
+    QIviStandardItem::operator=(rhs);
     if (this != &rhs)
         d.operator=(rhs.d);
     return *this;
@@ -172,7 +172,7 @@ QString QIviPlayableItem::type() const
 */
 bool QIviPlayableItem::operator==(const QIviPlayableItem &other)
 {
-    return (QIviSearchAndBrowseModelItem::operator==(other) &&
+    return (QIviStandardItem::operator==(other) &&
             d->m_url == other.d->m_url);
 }
 
diff --git a/src/ivimedia/qiviplayableitem.h b/src/ivimedia/qiviplayableitem.h
index 4b0d220..7994688 100644
--- a/src/ivimedia/qiviplayableitem.h
+++ b/src/ivimedia/qiviplayableitem.h
@@ -44,7 +44,7 @@
 
 #include <QtIviMedia/qtivimediaglobal.h>
 #include <QtIviCore/QIviSearchAndBrowseModel>
-#include <QtIviCore/QIviSearchAndBrowseModelItem>
+#include <QtIviCore/QIviStandardItem>
 #include <QtCore/QUrl>
 
 QT_BEGIN_NAMESPACE
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 class QIviPlayableItemPrivate;
 class QIviAudioTrackItemPrivate;
 
-class Q_QTIVIMEDIA_EXPORT QIviPlayableItem : public QIviSearchAndBrowseModelItem
+class Q_QTIVIMEDIA_EXPORT QIviPlayableItem : public QIviStandardItem
 {
     Q_GADGET
 
diff --git a/src/ivimedia/qiviplayqueue.cpp b/src/ivimedia/qiviplayqueue.cpp
index a321561..00ae4db 100644
--- a/src/ivimedia/qiviplayqueue.cpp
+++ b/src/ivimedia/qiviplayqueue.cpp
@@ -466,7 +466,7 @@ QVariant QIviPlayQueue::data(const QModelIndex &index, int role) const
     if (row >= d->m_fetchedDataCount - d->m_fetchMoreThreshold && canFetchMore(QModelIndex()))
         emit fetchMoreThresholdReached();
 
-    const QIviSearchAndBrowseModelItem *item = d->itemAt(row);
+    const QIviStandardItem *item = d->itemAt(row);
     if (!item)
         return QVariant();
 
diff --git a/src/ivimedia/qivitunerstation.cpp b/src/ivimedia/qivitunerstation.cpp
index c79da02..85e8856 100644
--- a/src/ivimedia/qivitunerstation.cpp
+++ b/src/ivimedia/qivitunerstation.cpp
@@ -94,7 +94,7 @@ public:
     \qmltype TunerStation
     \instantiates QIviTunerStation
     \inqmlmodule QtIvi.Media
-    \inherits SearchAndBrowseModelItem
+    \inherits StandardItem
     \brief The TunerStation represents a tuner station.
 
     \note This item is not creatable from QML.
@@ -193,20 +193,20 @@ public:
 */
 
 QIviTunerStation::QIviTunerStation()
-    : QIviSearchAndBrowseModelItem()
+    : QIviStandardItem()
     , d(new QIviTunerStationPrivate)
 {
 }
 
 QIviTunerStation::QIviTunerStation(const QIviTunerStation &rhs)
-    : QIviSearchAndBrowseModelItem(rhs)
+    : QIviStandardItem(rhs)
     , d(rhs.d)
 {
 }
 
 QIviTunerStation &QIviTunerStation::operator=(const QIviTunerStation &rhs)
 {
-    QIviSearchAndBrowseModelItem::operator=(rhs);
+    QIviStandardItem::operator=(rhs);
     if (this != &rhs)
         d.operator=(rhs.d);
     return *this;
@@ -299,7 +299,7 @@ QString QIviTunerStation::type() const
 */
 bool QIviTunerStation::operator==(const QIviTunerStation &other)
 {
-    return (QIviSearchAndBrowseModelItem::operator==(other) &&
+    return (QIviStandardItem::operator==(other) &&
             d->m_stationName == other.d->m_stationName &&
             d->m_frequency == other.d->m_frequency &&
             d->m_stationLogoUrl == other.d->m_stationLogoUrl &&
diff --git a/src/ivimedia/qivitunerstation.h b/src/ivimedia/qivitunerstation.h
index c4b22c3..b121cec 100644
--- a/src/ivimedia/qivitunerstation.h
+++ b/src/ivimedia/qivitunerstation.h
@@ -44,14 +44,14 @@
 
 #include <QtIviMedia/qtivimediaglobal.h>
 #include <QtIviMedia/QIviAmFmTuner>
-#include <QtIviCore/QIviSearchAndBrowseModelItem>
+#include <QtIviCore/QIviStandardItem>
 
 QT_BEGIN_NAMESPACE
 
 class QIviTunerStationPrivate;
 class QIviAmFmTunerStationPrivate;
 
-class Q_QTIVIMEDIA_EXPORT QIviTunerStation : public QIviSearchAndBrowseModelItem
+class Q_QTIVIMEDIA_EXPORT QIviTunerStation : public QIviStandardItem
 {
     Q_GADGET
 
diff --git a/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.cpp b/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.cpp
index 12829c2..c4594cc 100644
--- a/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.cpp
+++ b/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.cpp
@@ -380,7 +380,7 @@ QString SearchAndBrowseBackend::goForward(const QUuid &identifier, const QString
     return new_type;
 }
 
-QIviPendingReply<void> SearchAndBrowseBackend::insert(const QUuid &identifier, const QString &type, int index, const QIviSearchAndBrowseModelItem *item)
+QIviPendingReply<void> SearchAndBrowseBackend::insert(const QUuid &identifier, const QString &type, int index, const QIviStandardItem *item)
 {
     Q_UNUSED(identifier)
     Q_UNUSED(type)
@@ -409,7 +409,7 @@ QIviPendingReply<void> SearchAndBrowseBackend::move(const QUuid &identifier, con
     return QIviPendingReply<void>::createFailedReply();
 }
 
-QIviPendingReply<int> SearchAndBrowseBackend::indexOf(const QUuid &identifier, const QString &type, const QIviSearchAndBrowseModelItem *item)
+QIviPendingReply<int> SearchAndBrowseBackend::indexOf(const QUuid &identifier, const QString &type, const QIviStandardItem *item)
 {
     Q_UNUSED(identifier)
     Q_UNUSED(type)
diff --git a/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.h b/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.h
index 9c5f42f..23626ac 100644
--- a/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.h
+++ b/src/plugins/ivimedia/media_simulator/searchandbrowsebackend.h
@@ -85,10 +85,10 @@ public:
     bool canGoForward(const QUuid &identifier, const QString &type, const QString &itemId) override;
     QString goForward(const QUuid &identifier, const QString &type, const QString &itemId) override;
 
-    QIviPendingReply<void> insert(const QUuid &identifier, const QString &type, int index, const QIviSearchAndBrowseModelItem *item) override;
+    QIviPendingReply<void> insert(const QUuid &identifier, const QString &type, int index, const QIviStandardItem *item) override;
     QIviPendingReply<void> remove(const QUuid &identifier, const QString &type, int index) override;
     QIviPendingReply<void> move(const QUuid &identifier, const QString &type, int currentIndex, int newIndex) override;
-    QIviPendingReply<int> indexOf(const QUuid &identifier, const QString &type, const QIviSearchAndBrowseModelItem *item) override;
+    QIviPendingReply<int> indexOf(const QUuid &identifier, const QString &type, const QIviStandardItem *item) override;
 
 private slots:
     void search(const QUuid &identifier, const QString &queryString, const QString &type, int start, int count);
diff --git a/src/plugins/ivimedia/media_simulator/usbbrowsebackend.cpp b/src/plugins/ivimedia/media_simulator/usbbrowsebackend.cpp
index 86c61a0..6526ec0 100644
--- a/src/plugins/ivimedia/media_simulator/usbbrowsebackend.cpp
+++ b/src/plugins/ivimedia/media_simulator/usbbrowsebackend.cpp
@@ -146,7 +146,7 @@ QString UsbBrowseBackend::goForward(const QUuid &identifier, const QString &type
         return itemId;
 }
 
-QIviPendingReply<void> UsbBrowseBackend::insert(const QUuid &identifier, const QString &type, int index, const QIviSearchAndBrowseModelItem *item)
+QIviPendingReply<void> UsbBrowseBackend::insert(const QUuid &identifier, const QString &type, int index, const QIviStandardItem *item)
 {
     Q_UNUSED(identifier)
     Q_UNUSED(type)
@@ -175,7 +175,7 @@ QIviPendingReply<void> UsbBrowseBackend::move(const QUuid &identifier, const QSt
     return QIviPendingReply<void>::createFailedReply();
 }
 
-QIviPendingReply<int> UsbBrowseBackend::indexOf(const QUuid &identifier, const QString &type, const QIviSearchAndBrowseModelItem *item)
+QIviPendingReply<int> UsbBrowseBackend::indexOf(const QUuid &identifier, const QString &type, const QIviStandardItem *item)
 {
     Q_UNUSED(identifier)
     Q_UNUSED(type)
diff --git a/src/plugins/ivimedia/media_simulator/usbbrowsebackend.h b/src/plugins/ivimedia/media_simulator/usbbrowsebackend.h
index a360a55..7fe7f33 100644
--- a/src/plugins/ivimedia/media_simulator/usbbrowsebackend.h
+++ b/src/plugins/ivimedia/media_simulator/usbbrowsebackend.h
@@ -62,10 +62,10 @@ public:
     bool canGoForward(const QUuid &identifier, const QString &type, const QString &itemId) override;
     QString goForward(const QUuid &identifier, const QString &type, const QString &itemId) override;
 
-    QIviPendingReply<void> insert(const QUuid &identifier, const QString &type, int index, const QIviSearchAndBrowseModelItem *item) override;
+    QIviPendingReply<void> insert(const QUuid &identifier, const QString &type, int index, const QIviStandardItem *item) override;
     QIviPendingReply<void> remove(const QUuid &identifier, const QString &type, int index) override;
     QIviPendingReply<void> move(const QUuid &identifier, const QString &type, int currentIndex, int newIndex) override;
-    QIviPendingReply<int> indexOf(const QUuid &identifier, const QString &type, const QIviSearchAndBrowseModelItem *item) override;
+    QIviPendingReply<int> indexOf(const QUuid &identifier, const QString &type, const QIviStandardItem *item) override;
 
 private:
     QString m_rootFolder;
diff --git a/src/plugins/ivimedia/tuner_simulator/searchandbrowsebackend.cpp b/src/plugins/ivimedia/tuner_simulator/searchandbrowsebackend.cpp
index c483f7c..cd8e911 100644
--- a/src/plugins/ivimedia/tuner_simulator/searchandbrowsebackend.cpp
+++ b/src/plugins/ivimedia/tuner_simulator/searchandbrowsebackend.cpp
@@ -139,7 +139,7 @@ QString SearchAndBrowseBackend::goForward(const QUuid &identifier, const QString
     return QString();
 }
 
-QIviPendingReply<void> SearchAndBrowseBackend::insert(const QUuid &identifier, const QString &type, int index, const QIviSearchAndBrowseModelItem *item)
+QIviPendingReply<void> SearchAndBrowseBackend::insert(const QUuid &identifier, const QString &type, int index, const QIviStandardItem *item)
 {
     if (type != QLatin1String("presets") || item->type() != QLatin1String("amfmtunerstation"))
         return QIviPendingReply<void>::createFailedReply();
@@ -187,7 +187,7 @@ QIviPendingReply<void> SearchAndBrowseBackend::move(const QUuid &identifier, con
     return reply;
 }
 
-QIviPendingReply<int> SearchAndBrowseBackend::indexOf(const QUuid &identifier, const QString &type, const QIviSearchAndBrowseModelItem *item)
+QIviPendingReply<int> SearchAndBrowseBackend::indexOf(const QUuid &identifier, const QString &type, const QIviStandardItem *item)
 {
     Q_UNUSED(identifier)
 
diff --git a/src/plugins/ivimedia/tuner_simulator/searchandbrowsebackend.h b/src/plugins/ivimedia/tuner_simulator/searchandbrowsebackend.h
index c84115f..9d2d884 100644
--- a/src/plugins/ivimedia/tuner_simulator/searchandbrowsebackend.h
+++ b/src/plugins/ivimedia/tuner_simulator/searchandbrowsebackend.h
@@ -65,10 +65,10 @@ public:
     bool canGoForward(const QUuid &identifier, const QString &type, const QString &itemId) override;
     QString goForward(const QUuid &identifier, const QString &type, const QString &itemId) override;
 
-    QIviPendingReply<void> insert(const QUuid &identifier, const QString &type, int index, const QIviSearchAndBrowseModelItem *item) override;
+    QIviPendingReply<void> insert(const QUuid &identifier, const QString &type, int index, const QIviStandardItem *item) override;
     QIviPendingReply<void> remove(const QUuid &identifier, const QString &type, int index) override;
     QIviPendingReply<void> move(const QUuid &identifier, const QString &type, int currentIndex, int newIndex) override;
-    QIviPendingReply<int> indexOf(const QUuid &identifier, const QString &type, const QIviSearchAndBrowseModelItem *item) override;
+    QIviPendingReply<int> indexOf(const QUuid &identifier, const QString &type, const QIviStandardItem *item) override;
 private:
 
     AmFmTunerBackend *m_tunerBackend;
diff --git a/sync.profile b/sync.profile
index dd46ea2..631e40a 100644
--- a/sync.profile
+++ b/sync.profile
@@ -9,6 +9,7 @@
 %classnames = (
      "qdlt.h" => "QtDlt",
      "qiviqueryterm.h" => "QIviAbstractQueryTerm", "QIviConjunctionTerm", "QIviScopeTerm", "QIviFilterTerm", "QIviOrderTerm",
+     "qivistandarditem.h" => "QIviStandardItem", "QIviSearchAndBrowseModelItem",
 );
 %deprecatedheaders = (
 );
diff --git a/tests/auto/core/qivipagingmodel/tst_qivipagingmodel.cpp b/tests/auto/core/qivipagingmodel/tst_qivipagingmodel.cpp
index 5f565cf..a048a48 100644
--- a/tests/auto/core/qivipagingmodel/tst_qivipagingmodel.cpp
+++ b/tests/auto/core/qivipagingmodel/tst_qivipagingmodel.cpp
@@ -32,7 +32,7 @@
 #include <QIviPagingModel>
 #include <private/qivipagingmodel_p.h>
 #include <QIviPagingModelInterface>
-#include <QIviSearchAndBrowseModelItem>
+#include <QIviStandardItem>
 #include <QQmlEngine>
 #include <QQmlContext>
 #include <QQmlComponent>
@@ -60,11 +60,11 @@ public:
         m_list = createItemList("simple");
     }
 
-    QList<QIviSearchAndBrowseModelItem> createItemList(const QString &name)
+    QList<QIviStandardItem> createItemList(const QString &name)
     {
-        QList<QIviSearchAndBrowseModelItem> list;
+        QList<QIviStandardItem> list;
         for (int i=0; i<100; i++) {
-            QIviSearchAndBrowseModelItem item;
+            QIviStandardItem item;
             item.setId(name + QLatin1String(" ") + QString::number(i));
             QVariantMap map;
             map.insert("type", name);
@@ -106,7 +106,7 @@ public:
         emit dataFetched(identifier, requestedItems, start, start + count < m_list.count());
     }
 
-    void insert(int index, const QIviSearchAndBrowseModelItem item)
+    void insert(int index, const QIviStandardItem item)
     {
         m_list.insert(index, item);
         QVariantList variantList = { QVariant::fromValue(item) };
@@ -139,7 +139,7 @@ Q_SIGNALS:
     void unregisterInstanceCalled(const QUuid &identifier);
 
 private:
-    QList<QIviSearchAndBrowseModelItem> m_list;
+    QList<QIviStandardItem> m_list;
     QtIviCoreModule::ModelCapabilities m_caps;
 };
 
@@ -304,11 +304,11 @@ void tst_QIviPagingModel::testGetAt()
     QIviPagingModel model;
     model.setServiceObject(service);
 
-    QIviSearchAndBrowseModelItem item = model.at<QIviSearchAndBrowseModelItem>(0);
+    QIviStandardItem item = model.at<QIviStandardItem>(0);
     QCOMPARE(item.id(), QLatin1String("simple 0"));
 
     QVariant var = model.get(0);
-    QCOMPARE(var.value<QIviSearchAndBrowseModelItem>().id(), item.id());
+    QCOMPARE(var.value<QIviStandardItem>().id(), item.id());
 }
 
 void tst_QIviPagingModel::testFetchMore_data()
@@ -361,13 +361,13 @@ void tst_QIviPagingModel::testFetchMore()
 
     // Ask for an item before the threshold, shouldn't trigger the threshold reached signal and fetch new data.
     int offset = model.fetchMoreThreshold() + 1;
-    QCOMPARE(model.at<QIviSearchAndBrowseModelItem>(model.chunkSize() - offset).id(),
+    QCOMPARE(model.at<QIviStandardItem>(model.chunkSize() - offset).id(),
              QLatin1String("simple ") + QString::number(model.chunkSize() - offset));
     QVERIFY(!fetchMoreThresholdSpy.count());
 
     QCOMPARE(model.rowCount(), model.chunkSize());
     // By using model.at we already prefetch the next chunk of data
-    QCOMPARE(model.at<QIviSearchAndBrowseModelItem>(model.chunkSize() - 1).id(), QLatin1String("simple ") + QString::number(model.chunkSize() - 1));
+    QCOMPARE(model.at<QIviStandardItem>(model.chunkSize() - 1).id(), QLatin1String("simple ") + QString::number(model.chunkSize() - 1));
 
     QVERIFY(fetchMoreThresholdSpy.count());
     fetchMoreThresholdSpy.clear();
@@ -396,7 +396,7 @@ void tst_QIviPagingModel::testDataChangedMode()
     //TODO remove this section once we have fixed the capability race
     QSignalSpy fetchMoreThresholdSpy(&model, SIGNAL(fetchMoreThresholdReached()));
     QCOMPARE(model.rowCount(), model.chunkSize());
-    QCOMPARE(model.at<QIviSearchAndBrowseModelItem>(model.chunkSize() - 1).id(), QLatin1String("simple ") + QString::number(model.chunkSize() - 1));
+    QCOMPARE(model.at<QIviStandardItem>(model.chunkSize() - 1).id(), QLatin1String("simple ") + QString::number(model.chunkSize() - 1));
     QVERIFY(fetchMoreThresholdSpy.count());
     fetchMoreThresholdSpy.clear();
 
@@ -414,7 +414,7 @@ void tst_QIviPagingModel::testDataChangedMode()
 
     // Asking for an item near inside the threshold range should trigger a new fetch.
     QSignalSpy fetchDataSpy(service->testBackend(), SIGNAL(dataFetched(const QUuid &, const QList<QVariant> &, int , bool )));
-    QCOMPARE(model.at<QIviSearchAndBrowseModelItem>(testIndex).id(), QLatin1String("simple ") + QString::number(testIndex));
+    QCOMPARE(model.at<QIviStandardItem>(testIndex).id(), QLatin1String("simple ") + QString::number(testIndex));
     QVERIFY(fetchMoreThresholdSpy.count());
     QVERIFY(fetchDataSpy.count());
 
@@ -474,7 +474,7 @@ void tst_QIviPagingModel::testDataChangedMode_jump()
     QSignalSpy fetchDataSpy(service->testBackend(), SIGNAL(dataFetched(const QUuid &, const QList<QVariant> &, int , bool )));
     model.get(99);
     dataChangedSpy.wait();
-    QCOMPARE(model.at<QIviSearchAndBrowseModelItem>(99).id(), QLatin1String("simple ") + QString::number(99));
+    QCOMPARE(model.at<QIviStandardItem>(99).id(), QLatin1String("simple ") + QString::number(99));
     QVERIFY(fetchDataSpy.count());
 
     // Test that we really fetched new data
@@ -491,9 +491,9 @@ void tst_QIviPagingModel::testEditing()
     QIviPagingModel model;
     model.setServiceObject(service);
 
-    QCOMPARE(model.at<QIviSearchAndBrowseModelItem>(0).id(), QLatin1String("simple 0"));
+    QCOMPARE(model.at<QIviStandardItem>(0).id(), QLatin1String("simple 0"));
 
-    QIviSearchAndBrowseModelItem newItem;
+    QIviStandardItem newItem;
     newItem.setId(QLatin1String("testItem"));
 
     // Add a new Item
@@ -503,7 +503,7 @@ void tst_QIviPagingModel::testEditing()
     QCOMPARE(insertSpy.at(0).at(1).toInt(), 0);
     QCOMPARE(insertSpy.at(0).at(2).toInt(), 0);
 
-    QCOMPARE(model.at<QIviSearchAndBrowseModelItem>(0).id(), newItem.id());
+    QCOMPARE(model.at<QIviStandardItem>(0).id(), newItem.id());
 
     // Move the item to a new location
     QSignalSpy moveSpy(&model, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &, const QVector<int> &)));
@@ -513,7 +513,7 @@ void tst_QIviPagingModel::testEditing()
     QCOMPARE(moveSpy.at(0).at(0).toModelIndex().row(), 0);
     QCOMPARE(moveSpy.at(0).at(1).toModelIndex().row(), newIndex);
 
-    QCOMPARE(model.at<QIviSearchAndBrowseModelItem>(newIndex).id(), newItem.id());
+    QCOMPARE(model.at<QIviStandardItem>(newIndex).id(), newItem.id());
 
     // Remove the item again
     QSignalSpy removedSpy(&model, SIGNAL(rowsRemoved(const QModelIndex &, int , int )));
@@ -522,7 +522,7 @@ void tst_QIviPagingModel::testEditing()
     QCOMPARE(removedSpy.at(0).at(1).toInt(), newIndex);
     QCOMPARE(removedSpy.at(0).at(2).toInt(), newIndex);
 
-    QCOMPARE(model.at<QIviSearchAndBrowseModelItem>(newIndex).id(), QLatin1String("simple 10"));
+    QCOMPARE(model.at<QIviStandardItem>(newIndex).id(), QLatin1String("simple 10"));
 }
 
 void tst_QIviPagingModel::testMissingCapabilities()
diff --git a/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp b/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp
index a069c1c..bf5faf2 100644
--- a/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp
+++ b/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp
@@ -31,7 +31,7 @@
 #include <QIviServiceManager>
 #include <QIviSearchAndBrowseModel>
 #include <QIviSearchAndBrowseModelInterface>
-#include <QIviSearchAndBrowseModelItem>
+#include <QIviStandardItem>
 #include <QQmlEngine>
 #include <QQmlContext>
 #include <QQmlComponent>
@@ -46,7 +46,7 @@ public:
     //Registers the type under the passed names. Can be called more often to fill the availableTypes
     void registerType(const QString &name)
     {
-        registerContentType<QIviSearchAndBrowseModelItem>(name);
+        registerContentType<QIviStandardItem>(name);
     }
 
     //Sets the capabilities this instance should report
@@ -78,9 +78,9 @@ public:
         QString type("filter");
         registerType(type);
 
-        QList<QIviSearchAndBrowseModelItem> list;
+        QList<QIviStandardItem> list;
         for (int i=0; i<100; i++) {
-            QIviSearchAndBrowseModelItem item;
+            QIviStandardItem item;
             item.setId(QString::number(i));
             QVariantMap map;
             map.insert("type", type);
@@ -91,11 +91,11 @@ public:
         m_lists.insert(type, list);
     }
 
-    QList<QIviSearchAndBrowseModelItem> createItemList(const QString &name)
+    QList<QIviStandardItem> createItemList(const QString &name)
     {
-        QList<QIviSearchAndBrowseModelItem> list;
+        QList<QIviStandardItem> list;
         for (int i=0; i<100; i++) {
-            QIviSearchAndBrowseModelItem item;
+            QIviStandardItem item;
             item.setId(name + QLatin1String(" ") + QString::number(i));
             QVariantMap map;
             map.insert("type", name);
@@ -141,7 +141,7 @@ public:
         if (!m_lists.contains(m_contentType))
             return;
 
-        QList<QIviSearchAndBrowseModelItem> list = m_lists.value(m_contentType);
+        QList<QIviStandardItem> list = m_lists.value(m_contentType);
 
         if (m_caps.testFlag(QtIviCoreModule::SupportsFiltering) && m_filterTerm) {
             if (m_filterTerm->type() != QIviAbstractQueryTerm::FilterTerm) {
@@ -161,14 +161,14 @@ public:
                 return;
             }
 
-            const QMetaObject mo = QIviSearchAndBrowseModelItem::staticMetaObject;
+            const QMetaObject mo = QIviStandardItem::staticMetaObject;
             int mpi = mo.indexOfProperty(filterTerm->propertyName().toUtf8());
             Q_ASSERT(mpi != -1);
 
             QMetaProperty mp = mo.property(mpi);
 
-            QList<QIviSearchAndBrowseModelItem> resultList;
-            for (const QIviSearchAndBrowseModelItem &item : qAsConst(list)) {
+            QList<QIviStandardItem> resultList;
+            for (const QIviStandardItem &item : qAsConst(list)) {
                 QVariant value = mp.readOnGadget(&item);
                 if (value.canConvert(filterTerm->value().userType()))
                     value.convert(filterTerm->value().userType());
@@ -195,13 +195,13 @@ public:
                 return;
             }
 
-            const QMetaObject mo = QIviSearchAndBrowseModelItem::staticMetaObject;
+            const QMetaObject mo = QIviStandardItem::staticMetaObject;
             int mpi = mo.indexOfProperty(m_orderTerms.first().propertyName().toUtf8());
             Q_ASSERT(mpi != -1);
 
             QMetaProperty mp = mo.property(mpi);
 
-            qSort(list.begin(), list.end(), [mp, this](const QIviSearchAndBrowseModelItem &s1, const QIviSearchAndBrowseModelItem &s2) {
+            qSort(list.begin(), list.end(), [mp, this](const QIviStandardItem &s1, const QIviStandardItem &s2) {
                 QVariant var1 = mp.readOnGadget(&s1);
                 QVariant var2 = mp.readOnGadget(&s2);
                 if (var1.canConvert(QMetaType::Int) && var1.canConvert(QMetaType::Int)) {
@@ -269,9 +269,9 @@ public:
         return "levelOne";
     }
 
-    virtual QIviPendingReply<void> insert(const QUuid &identifier, const QString &type, int index, const QIviSearchAndBrowseModelItem *item) override
+    virtual QIviPendingReply<void> insert(const QUuid &identifier, const QString &type, int index, const QIviStandardItem *item) override
     {
-        QList<QIviSearchAndBrowseModelItem> list = m_lists.value(type);
+        QList<QIviStandardItem> list = m_lists.value(type);
 
         list.insert(index, *item);
         QVariantList variantList = { QVariant::fromValue(*item) };
@@ -287,7 +287,7 @@ public:
 
     virtual QIviPendingReply<void> remove(const QUuid &identifier, const QString &type, int index) override
     {
-        QList<QIviSearchAndBrowseModelItem> list = m_lists.value(type);
+        QList<QIviStandardItem> list = m_lists.value(type);
 
         list.removeAt(index);
         m_lists.insert(type, list);
@@ -301,7 +301,7 @@ public:
 
     virtual QIviPendingReply<void> move(const QUuid &identifier, const QString &type, int currentIndex, int newIndex) override
     {
-        QList<QIviSearchAndBrowseModelItem> list = m_lists.value(type);
+        QList<QIviStandardItem> list = m_lists.value(type);
 
         int min = qMin(currentIndex, newIndex);
         int max = qMax(currentIndex, newIndex);
@@ -320,10 +320,10 @@ public:
         return reply;
     }
 
-    virtual QIviPendingReply<int> indexOf(const QUuid &identifier, const QString &type, const QIviSearchAndBrowseModelItem *item) override
+    virtual QIviPendingReply<int> indexOf(const QUuid &identifier, const QString &type, const QIviStandardItem *item) override
     {
         Q_UNUSED(identifier)
-        QList<QIviSearchAndBrowseModelItem> list = m_lists.value(type);
+        QList<QIviStandardItem> list = m_lists.value(type);
 
         QIviPendingReply<int> reply;
         reply.setSuccess(list.indexOf(*item));
@@ -331,7 +331,7 @@ public:
     }
 
 private:
-    QHash<QString, QList<QIviSearchAndBrowseModelItem>> m_lists;
+    QHash<QString, QList<QIviStandardItem>> m_lists;
     QtIviCoreModule::ModelCapabilities m_caps;
     QString m_contentType;
     QIviAbstractQueryTerm *m_filterTerm = nullptr;
@@ -441,10 +441,10 @@ void tst_QIviSearchAndBrowseModel::testWithoutBackend()
     model.remove(0);
 
     QTest::ignoreMessage(QtWarningMsg, "Can't insert itmes without a connected backend");
-    model.insert(0, QVariant::fromValue(QIviSearchAndBrowseModelItem()));
+    model.insert(0, QVariant::fromValue(QIviStandardItem()));
 
     QTest::ignoreMessage(QtWarningMsg, "Can't get the index without a connected backend");
-    auto reply = model.indexOf(QVariant::fromValue(QIviSearchAndBrowseModelItem()));
+    auto reply = model.indexOf(QVariant::fromValue(QIviStandardItem()));
     QVERIFY(reply.isResultAvailable());
     QVERIFY(!reply.isSuccessful());
 
@@ -515,11 +515,11 @@ void tst_QIviSearchAndBrowseModel::testGetAt()
     model.setServiceObject(service);
     model.setContentType("simple");
 
-    QIviSearchAndBrowseModelItem item = model.at<QIviSearchAndBrowseModelItem>(0);
+    QIviStandardItem item = model.at<QIviStandardItem>(0);
     QCOMPARE(item.id(), QLatin1String("simple 0"));
 
     QVariant var = model.get(0);
-    QCOMPARE(var.value<QIviSearchAndBrowseModelItem>().id(), item.id());
+    QCOMPARE(var.value<QIviStandardItem>().id(), item.id());
 }
 
 void tst_QIviSearchAndBrowseModel::testFetchMore_data()
@@ -583,13 +583,13 @@ void tst_QIviSearchAndBrowseModel::testFetchMore()
 
     // Ask for an item before the threshold, shouldn't trigger the threshold reached signal and fetch new data.
     int offset = model.fetchMoreThreshold() + 1;
-    QCOMPARE(model.at<QIviSearchAndBrowseModelItem>(model.chunkSize() - offset).id(),
+    QCOMPARE(model.at<QIviStandardItem>(model.chunkSize() - offset).id(),
              QLatin1String("simple ") + QString::number(model.chunkSize() - offset));
     QVERIFY(!fetchMoreThresholdSpy.count());
 
     QCOMPARE(model.rowCount(), model.chunkSize());
     // By using model.at we already prefetch the next chunk of data
-    QCOMPARE(model.at<QIviSearchAndBrowseModelItem>(model.chunkSize() - 1).id(), QLatin1String("simple ") + QString::number(model.chunkSize() - 1));
+    QCOMPARE(model.at<QIviStandardItem>(model.chunkSize() - 1).id(), QLatin1String("simple ") + QString::number(model.chunkSize() - 1));
 
     QVERIFY(fetchMoreThresholdSpy.count());
     fetchMoreThresholdSpy.clear();
@@ -621,7 +621,7 @@ void tst_QIviSearchAndBrowseModel::testDataChangedMode()
     //TODO remove this section once we have fixed the capability race
     QSignalSpy fetchMoreThresholdSpy(&model, SIGNAL(fetchMoreThresholdReached()));
     QCOMPARE(model.rowCount(), model.chunkSize());
-    QCOMPARE(model.at<QIviSearchAndBrowseModelItem>(model.chunkSize() - 1).id(), QLatin1String("simple ") + QString::number(model.chunkSize() - 1));
+    QCOMPARE(model.at<QIviStandardItem>(model.chunkSize() - 1).id(), QLatin1String("simple ") + QString::number(model.chunkSize() - 1));
     QVERIFY(fetchMoreThresholdSpy.count());
     fetchMoreThresholdSpy.clear();
 
@@ -639,7 +639,7 @@ void tst_QIviSearchAndBrowseModel::testDataChangedMode()
 
     // Asking for an item near inside the threshold range should trigger a new fetch.
     QSignalSpy fetchDataSpy(service->testBackend(), SIGNAL(dataFetched(const QUuid &, const QList<QVariant> &, int , bool )));
-    QCOMPARE(model.at<QIviSearchAndBrowseModelItem>(testIndex).id(), QLatin1String("simple ") + QString::number(testIndex));
+    QCOMPARE(model.at<QIviStandardItem>(testIndex).id(), QLatin1String("simple ") + QString::number(testIndex));
     QVERIFY(fetchMoreThresholdSpy.count());
     QVERIFY(fetchDataSpy.count());
 
@@ -705,7 +705,7 @@ void tst_QIviSearchAndBrowseModel::testDataChangedMode_jump()
     QSignalSpy fetchDataSpy(service->testBackend(), SIGNAL(dataFetched(const QUuid &, const QList<QVariant> &, int , bool )));
     model.get(99);
     dataChangedSpy.wait();
-    QCOMPARE(model.at<QIviSearchAndBrowseModelItem>(99).id(), QLatin1String("simple ") + QString::number(99));
+    QCOMPARE(model.at<QIviStandardItem>(99).id(), QLatin1String("simple ") + QString::number(99));
     QVERIFY(fetchDataSpy.count());
 
     // Test that we really fetched new data
@@ -738,7 +738,7 @@ void tst_QIviSearchAndBrowseModel::testNavigation()
     QVERIFY(model->serviceObject());
 
     QCOMPARE(model->rowCount(), model->chunkSize());
-    QCOMPARE(model->at<QIviSearchAndBrowseModelItem>(1).id(), QLatin1String("levelOne ") + QString::number(1));
+    QCOMPARE(model->at<QIviStandardItem>(1).id(), QLatin1String("levelOne ") + QString::number(1));
     QCOMPARE(model->data(model->index(1), QIviSearchAndBrowseModel::CanGoForwardRole).toBool(), true);
 
     // Check that navigating deeper on the first item is not possible
@@ -753,7 +753,7 @@ void tst_QIviSearchAndBrowseModel::testNavigation()
     }
     if (navigationType == QIviSearchAndBrowseModel::InModelNavigation)
         QVERIFY(model->canGoBack());
-    QCOMPARE(model->at<QIviSearchAndBrowseModelItem>(1).id(), QLatin1String("levelTwo ") + QString::number(1));
+    QCOMPARE(model->at<QIviStandardItem>(1).id(), QLatin1String("levelTwo ") + QString::number(1));
     QCOMPARE(model->data(model->index(1), QIviSearchAndBrowseModel::CanGoForwardRole).toBool(), true);
 
     // Check that navigating deeper on the first item is not possible
@@ -768,7 +768,7 @@ void tst_QIviSearchAndBrowseModel::testNavigation()
     }
     if (navigationType == QIviSearchAndBrowseModel::InModelNavigation)
         QVERIFY(model->canGoBack());
-    QCOMPARE(model->at<QIviSearchAndBrowseModelItem>(1).id(), QLatin1String("levelThree ") + QString::number(1));
+    QCOMPARE(model->at<QIviStandardItem>(1).id(), QLatin1String("levelThree ") + QString::number(1));
     QCOMPARE(model->data(model->index(1), QIviSearchAndBrowseModel::CanGoForwardRole).toBool(), false);
 
     // Check that we can't got forward anymore
@@ -782,12 +782,12 @@ void tst_QIviSearchAndBrowseModel::testNavigation()
         QVERIFY(model->canGoBack());
 
         model->goBack();
-        QCOMPARE(model->at<QIviSearchAndBrowseModelItem>(1).id(), QLatin1String("levelTwo ") + QString::number(1));
+        QCOMPARE(model->at<QIviStandardItem>(1).id(), QLatin1String("levelTwo ") + QString::number(1));
 
         QVERIFY(model->canGoBack());
 
         model->goBack();
-        QCOMPARE(model->at<QIviSearchAndBrowseModelItem>(1).id(), QLatin1String("levelOne ") + QString::number(1));
+        QCOMPARE(model->at<QIviStandardItem>(1).id(), QLatin1String("levelOne ") + QString::number(1));
 
         QVERIFY(!model->canGoBack());
         QTest::ignoreMessage(QtWarningMsg, "Can't go backward anymore");
@@ -827,7 +827,7 @@ void tst_QIviSearchAndBrowseModel::testFilter()
     model.setContentType("filter");
 
     // Check that we have a unfiltered content before setting the filter
-    QCOMPARE(model.at<QIviSearchAndBrowseModelItem>(0).id(), QString::number(0));
+    QCOMPARE(model.at<QIviStandardItem>(0).id(), QString::number(0));
 
     // Set the query
     QSignalSpy queryChangedSpy(&model, SIGNAL(queryChanged(QString)));
@@ -839,14 +839,14 @@ void tst_QIviSearchAndBrowseModel::testFilter()
     QVERIFY(queryChangedSpy.count());
 
     // Check the filtered content
-    QCOMPARE(model.at<QIviSearchAndBrowseModelItem>(0).id(), expectedContent);
+    QCOMPARE(model.at<QIviStandardItem>(0).id(), expectedContent);
 
     // Reset to unfiltered
     model.setQuery(QString());
     QCOMPARE(model.query(), QString());
 
     // Check that we have a unfiltered content after removing the filter
-    QCOMPARE(model.at<QIviSearchAndBrowseModelItem>(0).id(), QString::number(0));
+    QCOMPARE(model.at<QIviStandardItem>(0).id(), QString::number(0));
 }
 
 void tst_QIviSearchAndBrowseModel::testEditing()
@@ -862,9 +862,9 @@ void tst_QIviSearchAndBrowseModel::testEditing()
     model.setServiceObject(service);
     model.setContentType("simple");
 
-    QCOMPARE(model.at<QIviSearchAndBrowseModelItem>(0).id(), QLatin1String("simple 0"));
+    QCOMPARE(model.at<QIviStandardItem>(0).id(), QLatin1String("simple 0"));
 
-    QIviSearchAndBrowseModelItem newItem;
+    QIviStandardItem newItem;
     newItem.setId(QLatin1String("testItem"));
 
     // Add a new Item
@@ -874,7 +874,7 @@ void tst_QIviSearchAndBrowseModel::testEditing()
     QCOMPARE(insertSpy.at(0).at(1).toInt(), 0);
     QCOMPARE(insertSpy.at(0).at(2).toInt(), 0);
 
-    QCOMPARE(model.at<QIviSearchAndBrowseModelItem>(0).id(), newItem.id());
+    QCOMPARE(model.at<QIviStandardItem>(0).id(), newItem.id());
 
     // Move the item to a new location
     QSignalSpy moveSpy(&model, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &, const QVector<int> &)));
@@ -884,7 +884,7 @@ void tst_QIviSearchAndBrowseModel::testEditing()
     QCOMPARE(moveSpy.at(0).at(0).toModelIndex().row(), 0);
     QCOMPARE(moveSpy.at(0).at(1).toModelIndex().row(), newIndex);
 
-    QCOMPARE(model.at<QIviSearchAndBrowseModelItem>(newIndex).id(), newItem.id());
+    QCOMPARE(model.at<QIviStandardItem>(newIndex).id(), newItem.id());
 
     // Remove the item again
     QSignalSpy removedSpy(&model, SIGNAL(rowsRemoved(const QModelIndex &, int , int )));
@@ -893,7 +893,7 @@ void tst_QIviSearchAndBrowseModel::testEditing()
     QCOMPARE(removedSpy.at(0).at(1).toInt(), newIndex);
     QCOMPARE(removedSpy.at(0).at(2).toInt(), newIndex);
 
-    QCOMPARE(model.at<QIviSearchAndBrowseModelItem>(newIndex).id(), QLatin1String("simple 10"));
+    QCOMPARE(model.at<QIviStandardItem>(newIndex).id(), QLatin1String("simple 10"));
 }
 
 void tst_QIviSearchAndBrowseModel::testIndexOf_qml()
@@ -915,7 +915,7 @@ void tst_QIviSearchAndBrowseModel::testIndexOf_qml()
 
     obj->setProperty("model", QVariant::fromValue(&model));
 
-    QIviSearchAndBrowseModelItem item = model.at<QIviSearchAndBrowseModelItem>(25);
+    QIviStandardItem item = model.at<QIviStandardItem>(25);
     QCOMPARE(item.id(), QLatin1String("simple 25"));
 
     QVERIFY(QMetaObject::invokeMethod(obj, "callIndexOf", Q_ARG(QVariant, QVariant::fromValue(item))));
@@ -982,7 +982,7 @@ void tst_QIviSearchAndBrowseModel::testMissingCapabilities()
     model.remove(0);
 
     QTest::ignoreMessage(QtWarningMsg, "The backend doesn't support inserting items");
-    model.insert(0, QVariant::fromValue(QIviSearchAndBrowseModelItem()));
+    model.insert(0, QVariant::fromValue(QIviStandardItem()));
 
     QTest::ignoreMessage(QtWarningMsg, "The backend doesn't support filtering or sorting. Changing the query will have no effect");
     model.setQuery(QString("id>10"));