Update video_player_enhancements with changes from master

1 files changed, 33 insertions, 36 deletions

diff --git a/src/emoji/EmojiModel.cpp b/src/emoji/EmojiModel.cpp

index 66e7aeda..07e6fdbd 100644
--- a/src/emoji/EmojiModel.cpp
+++ b/src/emoji/EmojiModel.cpp
@@ -14,63 +14,60 @@ using namespace emoji;
 int
 EmojiModel::categoryToIndex(int category)
 {
-        auto dist = std::distance(Provider::emoji.begin(),
-                                  std::lower_bound(Provider::emoji.begin(),
-                                                   Provider::emoji.end(),
-                                                   static_cast<Emoji::Category>(category),
-                                                   [](const struct Emoji &e, Emoji::Category c) {
-                                                           return e.category < c;
-                                                   }));
+    auto dist = std::distance(
+      Provider::emoji.begin(),
+      std::lower_bound(Provider::emoji.begin(),
+                       Provider::emoji.end(),
+                       static_cast<Emoji::Category>(category),
+                       [](const struct Emoji &e, Emoji::Category c) { return e.category < c; }));
 
-        return static_cast<int>(dist);
+    return static_cast<int>(dist);
 }
 
 QHash<int, QByteArray>
 EmojiModel::roleNames() const
 {
-        static QHash<int, QByteArray> roles;
+    static QHash<int, QByteArray> roles;
 
-        if (roles.isEmpty()) {
-                roles = QAbstractListModel::roleNames();
-                roles[static_cast<int>(EmojiModel::Roles::Unicode)] = QByteArrayLiteral("unicode");
-                roles[static_cast<int>(EmojiModel::Roles::ShortName)] =
-                  QByteArrayLiteral("shortName");
-                roles[static_cast<int>(EmojiModel::Roles::Category)] =
-                  QByteArrayLiteral("category");
-                roles[static_cast<int>(EmojiModel::Roles::Emoji)] = QByteArrayLiteral("emoji");
-        }
+    if (roles.isEmpty()) {
+        roles                                                 = QAbstractListModel::roleNames();
+        roles[static_cast<int>(EmojiModel::Roles::Unicode)]   = QByteArrayLiteral("unicode");
+        roles[static_cast<int>(EmojiModel::Roles::ShortName)] = QByteArrayLiteral("shortName");
+        roles[static_cast<int>(EmojiModel::Roles::Category)]  = QByteArrayLiteral("category");
+        roles[static_cast<int>(EmojiModel::Roles::Emoji)]     = QByteArrayLiteral("emoji");
+    }
 
-        return roles;
+    return roles;
 }
 
 int
 EmojiModel::rowCount(const QModelIndex &parent) const
 {
-        return parent == QModelIndex() ? Provider::emoji.count() : 0;
+    return parent == QModelIndex() ? Provider::emoji.count() : 0;
 }
 
 QVariant
 EmojiModel::data(const QModelIndex &index, int role) const
 {
-        if (hasIndex(index.row(), index.column(), index.parent())) {
-                switch (role) {
-                case Qt::DisplayRole:
-                case CompletionModel::CompletionRole:
-                case static_cast<int>(EmojiModel::Roles::Unicode):
-                        return Provider::emoji[index.row()].unicode;
+    if (hasIndex(index.row(), index.column(), index.parent())) {
+        switch (role) {
+        case Qt::DisplayRole:
+        case CompletionModel::CompletionRole:
+        case static_cast<int>(EmojiModel::Roles::Unicode):
+            return Provider::emoji[index.row()].unicode;
 
-                case Qt::ToolTipRole:
-                case CompletionModel::SearchRole:
-                case static_cast<int>(EmojiModel::Roles::ShortName):
-                        return Provider::emoji[index.row()].shortName;
+        case Qt::ToolTipRole:
+        case CompletionModel::SearchRole:
+        case static_cast<int>(EmojiModel::Roles::ShortName):
+            return Provider::emoji[index.row()].shortName;
 
-                case static_cast<int>(EmojiModel::Roles::Category):
-                        return QVariant::fromValue(Provider::emoji[index.row()].category);
+        case static_cast<int>(EmojiModel::Roles::Category):
+            return QVariant::fromValue(Provider::emoji[index.row()].category);
 
-                case static_cast<int>(EmojiModel::Roles::Emoji):
-                        return QVariant::fromValue(Provider::emoji[index.row()]);
-                }
+        case static_cast<int>(EmojiModel::Roles::Emoji):
+            return QVariant::fromValue(Provider::emoji[index.row()]);
         }
+    }
 
-        return {};
+    return {};
 }