summary refs log tree commit diff
path: root/include
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2018-02-09 12:20:09 +0200
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2018-02-09 12:20:09 +0200
commitda6b8162282c478d5df7b79a04549f72ad77fe55 (patch)
treeba17c2ad741c4aca72ad2c7423e1f86e310c61e4 /include
parentAdd a timeout timer for initial sync (#223, #222) (diff)
downloadnheko-da6b8162282c478d5df7b79a04549f72ad77fe55.tar.xz
Remove tone emoji
Diffstat (limited to 'include')
-rw-r--r--include/emoji/Category.h2
-rw-r--r--include/emoji/Provider.h19
2 files changed, 11 insertions, 10 deletions
diff --git a/include/emoji/Category.h b/include/emoji/Category.h

index 0310a4f3..d60e11fe 100644 --- a/include/emoji/Category.h +++ b/include/emoji/Category.h
@@ -31,7 +31,7 @@ class Category : public QWidget Q_OBJECT public: - Category(QString category, QList<Emoji> emoji, QWidget *parent = nullptr); + Category(QString category, std::vector<Emoji> emoji, QWidget *parent = nullptr); ~Category(); signals: diff --git a/include/emoji/Provider.h b/include/emoji/Provider.h
index 8754dabc..5cc3ced4 100644 --- a/include/emoji/Provider.h +++ b/include/emoji/Provider.h
@@ -17,7 +17,8 @@ #pragma once -#include <QList> +#include <QString> +#include <vector> namespace emoji { @@ -32,13 +33,13 @@ struct Emoji class Provider { public: - static const QList<Emoji> people; - static const QList<Emoji> nature; - static const QList<Emoji> food; - static const QList<Emoji> activity; - static const QList<Emoji> travel; - static const QList<Emoji> objects; - static const QList<Emoji> symbols; - static const QList<Emoji> flags; + static const std::vector<Emoji> people; + static const std::vector<Emoji> nature; + static const std::vector<Emoji> food; + static const std::vector<Emoji> activity; + static const std::vector<Emoji> travel; + static const std::vector<Emoji> objects; + static const std::vector<Emoji> symbols; + static const std::vector<Emoji> flags; }; } // namespace emoji