From 5c1a8e1d42038102c21cc3bd4c438c09c77e2bdd Mon Sep 17 00:00:00 2001
From: Ninja Ferret <wild.ninja.ferret@gmail.com>
Date: Fri, 23 Jan 2015 03:06:21 -0500
Subject: [PATCH] Switched sender and reciever roles

---
 cockatrice/src/tab_room.cpp       | 22 ++++++++++++++++++++--
 cockatrice/src/tab_supervisor.cpp | 13 ++++++-------
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/cockatrice/src/tab_room.cpp b/cockatrice/src/tab_room.cpp
index 2b8ffd873..8be8ba4aa 100644
--- a/cockatrice/src/tab_room.cpp
+++ b/cockatrice/src/tab_room.cpp
@@ -9,6 +9,8 @@
 #include <QLabel>
 #include <QToolButton>
 #include <QSplitter>
+#include <QCompleter>
+
 #include "tab_supervisor.h"
 #include "tab_room.h"
 #include "tab_userlists.h"
@@ -98,13 +100,29 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor, AbstractClient *_client, ServerI
     setLayout(hbox);
     
     const int userListSize = info.user_list_size();
+
     for (int i = 0; i < userListSize; ++i)
         userList->processUserInfo(info.user_list(i), true);
+
     userList->sortItems();
-    
-    const int gameListSize = info.game_list_size();
+const int gameListSize = info.game_list_size();
     for (int i = 0; i < gameListSize; ++i)
         gameSelector->processGameInfo(info.game_list(i));
+
+    
+    QChar* alertPrefix = new QChar('@');
+
+    
+    QList<QString> userNames = tabSupervisor->getUserListsTab()->getAllUsersList()->getUsers().keys();
+    for (int i = 0; i < userNames.size(); ++i) {
+       userNames[i].insert(0,alertPrefix,1);
+    }
+
+    QCompleter *completer = new QCompleter(userNames, this);
+    completer->setCompletionMode(QCompleter::InlineCompletion);
+    completer->setCaseSensitivity(Qt::CaseSensitive);
+    connect(sayEdit,SIGNAL(cursorPositionChanged(int,int)),completer,SLOT(setCompletionColumn(int)));
+    sayEdit->setCompleter(completer);
 }
 
 TabRoom::~TabRoom()
diff --git a/cockatrice/src/tab_supervisor.cpp b/cockatrice/src/tab_supervisor.cpp
index 24ce990d0..48e7cc238 100644
--- a/cockatrice/src/tab_supervisor.cpp
+++ b/cockatrice/src/tab_supervisor.cpp
@@ -446,28 +446,27 @@ void TabSupervisor::processGameEventContainer(const GameEventContainer &cont)
 
 void TabSupervisor::processUserMessageEvent(const Event_UserMessage &event)
 {
-    QString receiverName = QString::fromStdString(event.receiver_name());
+    QString senderName = QString::fromStdString(event.sender_name());
 
-    UserListTWI *twi = tabUserLists->getAllUsersList()->getUsers().value(receiverName);
+    UserListTWI *twi = tabUserLists->getAllUsersList()->getUsers().value(senderName);
 
     ServerInfo_User otherUser;
 
     if (twi)
         otherUser = twi->getUserInfo();
     else
-        otherUser.set_name(receiverName.toStdString());
+        otherUser.set_name(senderName.toStdString());
 
     UserLevelFlags otherUserLevel = UserLevelFlags(otherUser.user_level());
 
     if (settingsCache->getIgnoreUnregisteredUsers() && !otherUserLevel.testFlag(ServerInfo_User::IsRegistered))
         return;
 
-    TabMessage *tab = messageTabs.value(QString::fromStdString(event.sender_name()));
-
+    TabMessage *tab = messageTabs.value(senderName);
     if (!tab)
-        tab = messageTabs.value(receiverName);
+        tab = messageTabs.value(QString::fromStdString(event.receiver_name()));
     if (!tab)
-        tab = addMessageTab(QString::fromStdString(event.sender_name()), false);
+        tab = addMessageTab(senderName, false);
     if (!tab)
         return;
     tab->processUserMessageEvent(event);