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>

6 files changed, 12 insertions, 12 deletions

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;