From e9e77d8276da6ffff1306d5a2001c0982515e048 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 7 Oct 2013 13:35:16 -0700
Subject: [PATCH] set username instead of UUID in Interface preferences

---
 interface/src/DataServerClient.cpp |  4 ++--
 interface/src/DataServerClient.h   |  4 ++--
 interface/src/avatar/MyAvatar.cpp  | 11 ++++-------
 interface/src/avatar/MyAvatar.h    |  2 +-
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/interface/src/DataServerClient.cpp b/interface/src/DataServerClient.cpp
index 5c16544ba2..2eefef8ce4 100644
--- a/interface/src/DataServerClient.cpp
+++ b/interface/src/DataServerClient.cpp
@@ -52,11 +52,11 @@ void DataServerClient::putValueForKey(const char* key, const char* value) {
 void DataServerClient::getValueForKeyAndUUID(const char* key, QUuid &uuid) {
     if (!uuid.isNull()) {
         QString uuidString = uuidStringWithoutCurlyBraces(uuid);
-        getValueforKeyAndUserString(key, uuidString);
+        getValueForKeyAndUserString(key, uuidString);
     }
 }
 
-void DataServerClient::getValueforKeyAndUserString(const char* key, QString& userString) {
+void DataServerClient::getValueForKeyAndUserString(const char* key, QString& userString) {
     unsigned char getPacket[MAX_PACKET_SIZE];
     
     // setup the header for this packet
diff --git a/interface/src/DataServerClient.h b/interface/src/DataServerClient.h
index 19969b3345..c1e5ad088c 100644
--- a/interface/src/DataServerClient.h
+++ b/interface/src/DataServerClient.h
@@ -17,12 +17,12 @@ class DataServerClient {
 public:
     static void putValueForKey(const char* key, const char* value);
     static void getValueForKeyAndUUID(const char* key, QUuid& uuid);
-    static void getValueforKeyAndUserString(const char* key, QString& userString);
+    static void getValueForKeyAndUserString(const char* key, QString& userString);
     static void getClientValueForKey(const char* key) { getValueForKeyAndUserString(key, _clientUsername); }
     static void processConfirmFromDataServer(unsigned char* packetData, int numPacketBytes);
     static void processGetFromDataServer(unsigned char* packetData, int numPacketBytes);
     
-    static void setClientUsername(QString& clientUsername) { _clientUsername = clientUsername; }
+    static void setClientUsername(const QString& clientUsername) { _clientUsername = clientUsername; }
     static QString& setClientUsername() { return _clientUsername; }
 private:
     static QString _clientUsername;
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index f1875ee344..c08843b118 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -72,13 +72,10 @@ void MyAvatar::setMoveTarget(const glm::vec3 moveTarget) {
     _moveTargetStepCounter = 0;
 }
 
-void MyAvatar::setUUID(const QUuid& uuid) {
-    _uuid = uuid;
+void MyAvatar::setUsername(const QString& username) {
+    _username = username;
     
-    qDebug() << "giving" << _uuid << "to DSC class.\n";
-    
-    // give this UUID to the DataServerClient class as our client UUID
-    DataServerClient::setClientUUID(_uuid);
+    DataServerClient::setClientUsername(username);
 }
 
 void MyAvatar::simulate(float deltaTime, Transmitter* transmitter) {
@@ -560,7 +557,7 @@ void MyAvatar::saveData(QSettings* settings) {
 void MyAvatar::loadData(QSettings* settings) {
     settings->beginGroup("Avatar");
     
-    setUUID(settings->value("Usernmame").toString();
+    setUsername(settings->value("Username").toString());
     
     // in case settings is corrupt or missing loadSetting() will check for NaN
     _bodyYaw = loadSetting(settings, "bodyYaw", 0.0f);
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index dec6891807..4b37e28f55 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -34,7 +34,7 @@ public:
     void setNewScale(const float scale);
     void setWantCollisionsOn(bool wantCollisionsOn) { _isCollisionsOn = wantCollisionsOn; }
     void setMoveTarget(const glm::vec3 moveTarget);
-    void setUsername(const QString& username) { _username = username; }
+    void setUsername(const QString& username);
 
     // getters
     float getNewScale() const { return _newScale; }