Minor fixes to various models

src/devtools/models/statemodel.h

@@ -28,7 +28,7 @@ public:
      * @brief Defines the model roles.
      */
     enum Roles {
-        TypeRole = 0, /**< The type of the state event. */
+        TypeRole = Qt::UserRole, /**< The type of the state event. */
         EventCountRole, /**< Number of events of this type. */
         StateKeyRole, /**<State key. Only valid if there's exactly one event of this type. */
     };

src/libneochat/models/roomlistmodel.cpp

@@ -215,7 +215,7 @@ QVariant RoomListModel::data(const QModelIndex &index, int role) const
         return QVariant();
     }
     NeoChatRoom *room = m_rooms.at(index.row());
-    if (role == DisplayNameRole) {
+    if (role == DisplayNameRole || role == Qt::DisplayRole) {
         return room->displayName();
     }
     if (role == EscapedDisplayNameRole) {

src/libneochat/models/roomlistmodel.h

@@ -36,7 +36,7 @@ public:
      * @brief Defines the model roles.
      */
     enum EventRoles {
-        DisplayNameRole = Qt::DisplayRole, /**< The display name of the room. */
+        DisplayNameRole = Qt::UserRole, /**< The display name of the room. */
         EscapedDisplayNameRole, /**< HTML-Escaped display name of the room. */
         AvatarRole, /**< The source URL for the room's avatar. */
         CanonicalAliasRole, /**< The room canonical alias. */

src/settings/models/permissionsmodel.cpp

@@ -190,7 +190,7 @@ QVariant PermissionsModel::data(const QModelIndex &index, int role) const
     }
 
     const auto permission = m_permissions.value(index.row());
-    if (role == NameRole) {
+    if (role == NameRole || role == Qt::DisplayRole) {
         if (permissionNames.keys().contains(permission)) {
             return permissionNames.value(permission).toString();
         }

src/settings/models/permissionsmodel.h

@@ -29,7 +29,7 @@ public:
      * @brief Defines the model roles.
      */
     enum Roles {
-        NameRole = Qt::DisplayRole, /**< The permission name. */
+        NameRole = Qt::UserRole, /**< The permission name. */
         SubtitleRole, /**< The description of the permission. */
         TypeRole, /**< The base type of the permission, normally the event type id except for ban, kick, etc. */
         LevelRole, /**< The current power level for the permission. */

src/timeline/models/mediamessagefiltermodel.cpp

@@ -75,7 +75,7 @@ QVariant MediaMessageFilterModel::data(const QModelIndex &index, int role) const
 
 QHash<int, QByteArray> MediaMessageFilterModel::roleNames() const
 {
-    auto roles = sourceModel()->roleNames();
+    auto roles = sourceModel() ? sourceModel()->roleNames() : QHash<int, QByteArray>();
     roles[SourceRole] = "source";
     roles[TempSourceRole] = "tempSource";
     roles[TypeRole] = "type";

src/timeline/models/searchmodel.cpp

@@ -23,7 +23,10 @@ void SearchModel::setSearchText(const QString &searchText)
 
 void SearchModel::search()
 {
-    Q_ASSERT(m_room);
+    if (!m_room) {
+        qWarning() << "SearchModel: No room";
+        return;
+    }
 
     if (m_job) {
         m_job->abandon();