1 files changed, 4 insertions, 4 deletions
diff --git a/board.h b/board.h
index 78ebf8a..deb1dfb 100644
--- a/board.h
+++ b/board.h
@@ -5,6 +5,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QObject>
 #include <QtCore/QPair>
+#include <QtCore/QRegExp>
 #include <QtCore/QQueue>
 #include <QtSql/QSqlDatabase>
 
@@ -34,6 +35,7 @@ public:
 	QString removeHtml(QString text) const;
 	QString removeBbcode(QString text) const;
 	QString bbcodeToRichText(QString text) const;
+	QString parseSmilies(QString text) const;
 
 	QString renderHumanDate(const QDateTime& dateTime);
 	QString renderHumanTime(const QDateTime& dateTime);
@@ -41,14 +43,12 @@ public:
 	// These functions wrap emitting the signals below
 	void notifyConfigChanged(const QString& key = QString());
 	void notifyForumsChanged();
-	void notifySmiliesChanged();
 	void notifyForumTopicsChanged(int forumId, int start, int end);
 	void notifyTopicPostsChanged(int topicId, int start, int end);
 
 signals:
 	void configChanged(const QString& key);
 	void forumsChanged();
-	void smiliesChanged();
 	void forumTopicsChanged(int forumId, int start, int end);
 	void topicPostsChanged(int topicId, int start, int end);
 
@@ -66,7 +66,6 @@ private:
 	void initializeSmilies();
 	void fetchConfigIfOutdated();
 	void fetchForumsIfOutdated();
-	void fetchSmiliesIfOutdated();
 
 private slots:
 	void handleActionFinished(Action *action);
@@ -81,7 +80,8 @@ private:
 	/** Configuration cache */
 	mutable QHash<QString, QString> _config;
 	QList< QPair<QRegExp, QString> > _bbcodes;
-	QList< QPair<QString, QString> > _smilies;
+	QHash<QString, QString> _smilies;
+	QRegExp _smilieRegexp;
 };
 
 inline bool Board::busy() const