Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2012-08-06 19:57:37 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-08-06 19:58:33 (GMT) |
| commit | d1281fa275f9d419682f0fbb0b414f92e7b667ee (patch) | |
| tree | 5f5e7c854146b5441f7e383e5d89a54e9908e890 /Swift/QtUI/QtChatWindow.h | |
| parent | 6f26d9aa86f0909af13b23b1a925b8d492e74154 (diff) | |
| download | swift-contrib-d1281fa275f9d419682f0fbb0b414f92e7b667ee.zip swift-contrib-d1281fa275f9d419682f0fbb0b414f92e7b667ee.tar.bz2 | |
More consistent linkification and emoticonification.
Resolves: #959
Diffstat (limited to 'Swift/QtUI/QtChatWindow.h')
| -rw-r--r-- | Swift/QtUI/QtChatWindow.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Swift/QtUI/QtChatWindow.h b/Swift/QtUI/QtChatWindow.h index 1ba56be..a703818 100644 --- a/Swift/QtUI/QtChatWindow.h +++ b/Swift/QtUI/QtChatWindow.h @@ -183,10 +183,11 @@ namespace Swift { void beginCorrection(); void cancelCorrection(); void handleSettingChanged(const std::string& setting); - std::string addMessage(const std::string &message, const std::string &senderName, bool senderIsSelf, boost::shared_ptr<SecurityLabel> label, const std::string& avatarPath, const QString& style, const boost::posix_time::ptime& time); - void replaceMessage(const std::string& message, const std::string& id, const boost::posix_time::ptime& time, const QString& style); + std::string addMessage(const QString& message, const std::string& senderName, bool senderIsSelf, boost::shared_ptr<SecurityLabel> label, const std::string& avatarPath, const QString& style, const boost::posix_time::ptime& time); + void replaceMessage(const QString& message, const std::string& id, const boost::posix_time::ptime& time, const QString& style); void handleOccupantSelectionChanged(RosterItem* item); bool appendToPreviousCheck(PreviousMessageKind messageKind, const std::string& senderName, bool senderIsSelf) const; + QString linkimoticonify(const QString& message) const; int unreadCount_; bool contactIsTyping_; |