summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Voicu <vladvoic@gmail.com>2011-06-01 20:36:29 (GMT)
committerKevin Smith <git@kismith.co.uk>2011-06-12 09:59:09 (GMT)
commit29a83617e0a066ee0692d2bbcecc9335f73b8138 (patch)
tree789993173439e43c3201b4562349411b355a33ea /Swift/Controllers/Chat/ChatControllerBase.h
parent5839de3affdaedafdcb5d9ec7cdfe57fd373d558 (diff)
downloadswift-29a83617e0a066ee0692d2bbcecc9335f73b8138.zip
swift-29a83617e0a066ee0692d2bbcecc9335f73b8138.tar.bz2
Replace last message feature for MUC
License: This patch is BSD-licensed, see http://www.opensource.org/licenses/bsd-license.php
Diffstat (limited to 'Swift/Controllers/Chat/ChatControllerBase.h')
-rw-r--r--Swift/Controllers/Chat/ChatControllerBase.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/Swift/Controllers/Chat/ChatControllerBase.h b/Swift/Controllers/Chat/ChatControllerBase.h
index e0f1b94..3364ccb 100644
--- a/Swift/Controllers/Chat/ChatControllerBase.h
+++ b/Swift/Controllers/Chat/ChatControllerBase.h
@@ -4,8 +4,7 @@
* See Documentation/Licenses/GPLv3.txt for more information.
*/
-#ifndef SWIFTEN_ChatControllerBase_H
-#define SWIFTEN_ChatControllerBase_H
+#pragma once
#include <map>
#include <vector>
@@ -85,8 +84,7 @@ namespace Swift {
ChatWindow* chatWindow_;
JID toJID_;
bool labelsEnabled_;
- bool replacedMessage_;
- std::string lastMessageUIID_;
+ std::map<JID, std::string> lastMessagesUIID_;
PresenceOracle* presenceOracle_;
AvatarManager* avatarManager_;
bool useDelayForLatency_;
@@ -95,5 +93,3 @@ namespace Swift {
TimerFactory* timerFactory_;
};
}
-
-#endif