From cb165902fdc8b36c5cf47853df24c8b1b77a7625 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 19 Feb 2014 18:12:10 -0800
Subject: [PATCH] use existing constants for HTTP operations

---
 domain-server/src/DomainServer.cpp      |  2 +-
 libraries/shared/src/AccountManager.cpp |  8 ++++----
 libraries/shared/src/AccountManager.h   | 11 +----------
 libraries/shared/src/NodeList.cpp       |  2 +-
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 5321ee514f..ddcbb916ff 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -92,7 +92,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :
 void DomainServer::requestUUIDFromDataServer() {
     // this slot is fired when we get a valid access token from the data-server
     // now let's ask it to set us up with a UUID
-    AccountManager::getInstance().authenticatedRequest("/api/v1/domains/create", AuthenticatedRequestMethod::POST,
+    AccountManager::getInstance().authenticatedRequest("/api/v1/domains/create", QNetworkAccessManager::PostOperation,
                                                        this, SLOT(parseUUIDFromDataServer()));
 }
 
diff --git a/libraries/shared/src/AccountManager.cpp b/libraries/shared/src/AccountManager.cpp
index 9a9a40bc0f..2b779ecff1 100644
--- a/libraries/shared/src/AccountManager.cpp
+++ b/libraries/shared/src/AccountManager.cpp
@@ -52,7 +52,7 @@ AccountManager::AccountManager() :
     }
 }
 
-void AccountManager::authenticatedRequest(const QString& path, AuthenticatedRequestMethod::Method method,
+void AccountManager::authenticatedRequest(const QString& path, QNetworkAccessManager::Operation operation,
                                           const QObject *successReceiver, const char *successMethod,
                                           const QByteArray& dataByteArray,
                                           const QObject* errorReceiver, const char* errorMethod) {
@@ -69,11 +69,11 @@ void AccountManager::authenticatedRequest(const QString& path, AuthenticatedRequ
         
         QNetworkReply* networkReply = NULL;
         
-        switch (method) {
-            case AuthenticatedRequestMethod::GET:
+        switch (operation) {
+            case QNetworkAccessManager::GetOperation:
                 networkReply = _networkAccessManager->get(authenticatedRequest);
                 break;
-            case AuthenticatedRequestMethod::POST:
+            case QNetworkAccessManager::PostOperation:
                 authenticatedRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
                 networkReply = _networkAccessManager->post(authenticatedRequest, dataByteArray);
             default:
diff --git a/libraries/shared/src/AccountManager.h b/libraries/shared/src/AccountManager.h
index 6243162049..65c4e7f52c 100644
--- a/libraries/shared/src/AccountManager.h
+++ b/libraries/shared/src/AccountManager.h
@@ -17,15 +17,6 @@
 
 #include "OAuthAccessToken.h"
 
-namespace AuthenticatedRequestMethod {
-    enum Method {
-        GET,
-        POST,
-        PUT,
-        DELETE
-    };
-}
-
 class AccountManager : public QObject {
     Q_OBJECT
 public:
@@ -33,7 +24,7 @@ public:
     static AccountManager& getInstance();
     
     void authenticatedRequest(const QString& path,
-                              AuthenticatedRequestMethod::Method method,
+                              QNetworkAccessManager::Operation operation,
                               const QObject* successReceiver, const char* successMethod,
                               const QByteArray& dataByteArray = QByteArray(),
                               const QObject* errorReceiver = 0, const char* errorMethod = NULL);
diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp
index ea4e63c863..deda209d1b 100644
--- a/libraries/shared/src/NodeList.cpp
+++ b/libraries/shared/src/NodeList.cpp
@@ -588,7 +588,7 @@ void NodeList::domainServerAuthReply() {
 void NodeList::requestAuthForDomainServer() {
     AccountManager::getInstance().authenticatedRequest("/api/v1/domains/"
                                                        + uuidStringWithoutCurlyBraces(_domainInfo.getUUID()) + "/auth.json",
-                                                       AuthenticatedRequestMethod::GET,
+                                                       QNetworkAccessManager::GetOperation,
                                                        this, SLOT(domainServerAuthReply()));
 }