diff --git a/interface/resources/images/cool.svg b/interface/resources/images/cool.svg
deleted file mode 100644
index 2e8348108a..0000000000
--- a/interface/resources/images/cool.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
diff --git a/interface/resources/images/grin.svg b/interface/resources/images/grin.svg
deleted file mode 100644
index 8e36a16555..0000000000
--- a/interface/resources/images/grin.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
diff --git a/interface/resources/images/happy.svg b/interface/resources/images/happy.svg
deleted file mode 100644
index fe31d01991..0000000000
--- a/interface/resources/images/happy.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
diff --git a/interface/resources/images/sad.svg b/interface/resources/images/sad.svg
deleted file mode 100644
index 0029bfded5..0000000000
--- a/interface/resources/images/sad.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
diff --git a/interface/resources/images/smiley.svg b/interface/resources/images/smiley.svg
deleted file mode 100644
index 1b0e707bf6..0000000000
--- a/interface/resources/images/smiley.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
diff --git a/interface/resources/images/tongue.svg b/interface/resources/images/tongue.svg
deleted file mode 100644
index 35361d2b2b..0000000000
--- a/interface/resources/images/tongue.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
diff --git a/interface/resources/images/wink.svg b/interface/resources/images/wink.svg
deleted file mode 100644
index b1aef4823d..0000000000
--- a/interface/resources/images/wink.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
diff --git a/interface/src/ui/ChatWindow.cpp b/interface/src/ui/ChatWindow.cpp
index 06608ef5e4..c459a6d426 100644
--- a/interface/src/ui/ChatWindow.cpp
+++ b/interface/src/ui/ChatWindow.cpp
@@ -31,14 +31,12 @@ const int NUM_MESSAGES_TO_TIME_STAMP = 20;
const QRegularExpression regexLinks("((?:(?:ftp)|(?:https?))://\\S+)");
const QRegularExpression regexHifiLinks("([#@]\\S+)");
-
ChatWindow::ChatWindow(QWidget* parent) :
FramelessDialog(parent, 0, POSITION_RIGHT),
ui(new Ui::ChatWindow),
numMessagesAfterLastTimeStamp(0),
_mousePressed(false),
- _mouseStartPosition(),
- _emoticonMap()
+ _mouseStartPosition()
{
setAttribute(Qt::WA_DeleteOnClose, false);
@@ -65,14 +63,6 @@ ChatWindow::ChatWindow(QWidget* parent) :
ui->connectingToXMPPLabel->setText(tr("You must be logged in to chat with others."));
}
- _emoticonMap.insert(new QRegularExpression(QRegExp::escape(":)")), new QString("../resources/images/smiley.svg"));
- _emoticonMap.insert(new QRegularExpression(QRegExp::escape(":D")), new QString("../resources/images/happy.svg"));
- _emoticonMap.insert(new QRegularExpression(QRegExp::escape("B)")), new QString("../resources/images/cool.svg"));
- _emoticonMap.insert(new QRegularExpression(QRegExp::escape(":O")), new QString("../resources/images/grin.svg"));
- _emoticonMap.insert(new QRegularExpression(QRegExp::escape(":(")), new QString("../resources/images/sad.svg"));
- _emoticonMap.insert(new QRegularExpression(QRegExp::escape(":P")), new QString("../resources/images/tongue.svg"));
- _emoticonMap.insert(new QRegularExpression(QRegExp::escape(";)")), new QString("../resources/images/wink.svg"));
-
#ifdef HAVE_QXMPP
const QXmppClient& xmppClient = XmppClient::getInstance().getXMPPClient();
if (xmppClient.isConnected()) {
@@ -294,13 +284,6 @@ void ChatWindow::messageReceived(const QXmppMessage& message) {
QString messageText = message.body().toHtmlEscaped();
messageText = messageText.replace(regexLinks, "\\1");
messageText = messageText.replace(regexHifiLinks, "\\1");
-
- QMapIterator it(_emoticonMap);
- while (it.hasNext()) {
- it.next();
- messageText.replace(*it.key(), "![](\"")
");
- }
-
messageArea->setHtml(userLabel + messageText);
bool atBottom = isAtBottom();
diff --git a/interface/src/ui/ChatWindow.h b/interface/src/ui/ChatWindow.h
index 3dce35b1b2..399c9e917c 100644
--- a/interface/src/ui/ChatWindow.h
+++ b/interface/src/ui/ChatWindow.h
@@ -57,7 +57,6 @@ private:
QDateTime lastMessageStamp;
bool _mousePressed;
QPoint _mouseStartPosition;
- QMap _emoticonMap;
private slots:
void connected();