From c9982e765ebcb29ab4513dc397cb2b214af8bd57 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 9 Mar 2015 16:28:01 -0700
Subject: [PATCH] cleanup username API from GlobalServicesScriptingInterface

---
 .../oculus/virtualKeyboardTextEntityExample.js   |  2 +-
 .../GlobalServicesScriptingInterface.cpp         |  4 ----
 .../scripting/GlobalServicesScriptingInterface.h | 16 +++++++++-------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/examples/controllers/oculus/virtualKeyboardTextEntityExample.js b/examples/controllers/oculus/virtualKeyboardTextEntityExample.js
index cf36fdbffb..15025831e7 100644
--- a/examples/controllers/oculus/virtualKeyboardTextEntityExample.js
+++ b/examples/controllers/oculus/virtualKeyboardTextEntityExample.js
@@ -86,7 +86,7 @@ keyboard.onKeyRelease = function(event) {
 
            var textLines = textText.split("\n");
            var maxLineWidth = Overlays.textSize(textSizeMeasureOverlay, textText).width;
-           var usernameLine = "--" + GlobalServices.myUsername;
+           var usernameLine = "--" + GlobalServices.username;
            var usernameWidth = Overlays.textSize(textSizeMeasureOverlay, usernameLine).width;
            if (maxLineWidth < usernameWidth) {
                maxLineWidth = usernameWidth;
diff --git a/interface/src/scripting/GlobalServicesScriptingInterface.cpp b/interface/src/scripting/GlobalServicesScriptingInterface.cpp
index 478b708e53..37367fe40c 100644
--- a/interface/src/scripting/GlobalServicesScriptingInterface.cpp
+++ b/interface/src/scripting/GlobalServicesScriptingInterface.cpp
@@ -36,10 +36,6 @@ GlobalServicesScriptingInterface* GlobalServicesScriptingInterface::getInstance(
     return &sharedInstance;
 }
 
-QString GlobalServicesScriptingInterface::getMyUsername() {
-    return AccountManager::getInstance().getAccountInfo().getUsername();
-}
-
 void GlobalServicesScriptingInterface::loggedOut() {
     emit GlobalServicesScriptingInterface::disconnected(QString("logout"));
 }
diff --git a/interface/src/scripting/GlobalServicesScriptingInterface.h b/interface/src/scripting/GlobalServicesScriptingInterface.h
index a71446a970..bf49df15ad 100644
--- a/interface/src/scripting/GlobalServicesScriptingInterface.h
+++ b/interface/src/scripting/GlobalServicesScriptingInterface.h
@@ -31,20 +31,21 @@ Q_DECLARE_METATYPE(DownloadInfoResult)
 QScriptValue DownloadInfoResultToScriptValue(QScriptEngine* engine, const DownloadInfoResult& result);
 void DownloadInfoResultFromScriptValue(const QScriptValue& object, DownloadInfoResult& result);
 
-
 class GlobalServicesScriptingInterface : public QObject {
     Q_OBJECT
-    Q_PROPERTY(QString myUsername READ getMyUsername)
-    GlobalServicesScriptingInterface();
-    ~GlobalServicesScriptingInterface();
+    
+    Q_PROPERTY(QString username READ getUsername)
+    
 public:
     static GlobalServicesScriptingInterface* getInstance();
 
-    QString getMyUsername();
+    const QString& getUsername() const { return AccountManager::getInstance().getAccountInfo().getUsername(); }
     
 public slots:
     DownloadInfoResult getDownloadInfo();
     void updateDownloadInfo();
+    
+    void setDiscoverability(const QString& discoverability);
 
 private slots:
     void loggedOut();
@@ -53,12 +54,13 @@ private slots:
 signals:
     void connected();
     void disconnected(const QString& reason);
-    void incomingMessage(const QString& username, const QString& message);
-    void onlineUsersChanged(const QStringList& usernames);
     void myUsernameChanged(const QString& username);
     void downloadInfoChanged(DownloadInfoResult info);
 
 private:
+    GlobalServicesScriptingInterface();
+    ~GlobalServicesScriptingInterface();
+    
     bool _downloading;
 };