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 {};
}
diff --git a/src/emoji/EmojiModel.h b/src/emoji/EmojiModel.h
index 679563f1..882d3eb8 100644
--- a/src/emoji/EmojiModel.h
+++ b/src/emoji/EmojiModel.h
@@ -18,22 +18,22 @@ namespace emoji {
*/
class EmojiModel : public QAbstractListModel
{
- Q_OBJECT
+ Q_OBJECT
public:
- enum Roles
- {
- Unicode = Qt::UserRole, // unicode of emoji
- Category, // category of emoji
- ShortName, // shortext of the emoji
- Emoji, // Contains everything from the Emoji
- };
+ enum Roles
+ {
+ Unicode = Qt::UserRole, // unicode of emoji
+ Category, // category of emoji
+ ShortName, // shortext of the emoji
+ Emoji, // Contains everything from the Emoji
+ };
- using QAbstractListModel::QAbstractListModel;
+ using QAbstractListModel::QAbstractListModel;
- Q_INVOKABLE int categoryToIndex(int category);
+ Q_INVOKABLE int categoryToIndex(int category);
- QHash<int, QByteArray> roleNames() const override;
- int rowCount(const QModelIndex &parent = QModelIndex()) const override;
- QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+ QHash<int, QByteArray> roleNames() const override;
+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
};
}
diff --git a/src/emoji/MacHelper.h b/src/emoji/MacHelper.h
index b3e2e631..ff49f9ba 100644
--- a/src/emoji/MacHelper.h
+++ b/src/emoji/MacHelper.h
@@ -9,6 +9,6 @@
class MacHelper
{
public:
- static void showEmojiWindow();
- static void initializeMenus();
+ static void showEmojiWindow();
+ static void initializeMenus();
};
diff --git a/src/emoji/Provider.h b/src/emoji/Provider.h
index 43c880a2..965329f9 100644
--- a/src/emoji/Provider.h
+++ b/src/emoji/Provider.h
@@ -16,37 +16,37 @@ Q_NAMESPACE
struct Emoji
{
- Q_GADGET
+ Q_GADGET
public:
- enum class Category
- {
- People,
- Nature,
- Food,
- Activity,
- Travel,
- Objects,
- Symbols,
- Flags,
- Search
- };
- Q_ENUM(Category)
+ enum class Category
+ {
+ People,
+ Nature,
+ Food,
+ Activity,
+ Travel,
+ Objects,
+ Symbols,
+ Flags,
+ Search
+ };
+ Q_ENUM(Category)
- Q_PROPERTY(const QString &unicode MEMBER unicode)
- Q_PROPERTY(const QString &shortName MEMBER shortName)
- Q_PROPERTY(emoji::Emoji::Category category MEMBER category)
+ Q_PROPERTY(const QString &unicode MEMBER unicode)
+ Q_PROPERTY(const QString &shortName MEMBER shortName)
+ Q_PROPERTY(emoji::Emoji::Category category MEMBER category)
public:
- QString unicode;
- QString shortName;
- Category category;
+ QString unicode;
+ QString shortName;
+ Category category;
};
class Provider
{
public:
- // all emoji for QML purposes
- static const QVector<Emoji> emoji;
+ // all emoji for QML purposes
+ static const QVector<Emoji> emoji;
};
} // namespace emoji
|
