From dc47c5fc0c606a75939ee68007f8c4d786412af4 Mon Sep 17 00:00:00 2001
From: David Kelly <david@highfidelity.io>
Date: Tue, 6 Dec 2016 11:12:50 -0800
Subject: [PATCH] CR feedback

lame mistake - it is always the error branches that get you.
---
 interface/src/Application.cpp                 | 2 +-
 libraries/networking/src/FingerprintUtils.cpp | 6 +-----
 libraries/networking/src/FingerprintUtils.h   | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 1bde51d6cc..946bad2cc3 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -583,7 +583,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us
     
     // TODO: This is temporary, while developing
-    FingerprintUtils::getMachineFingerprint();
+    fingerprint::getMachineFingerprint();
     // End TODO
     auto nodeList = DependencyManager::get<NodeList>();
 
diff --git a/libraries/networking/src/FingerprintUtils.cpp b/libraries/networking/src/FingerprintUtils.cpp
index b8e519c05d..1dc17e0c5b 100644
--- a/libraries/networking/src/FingerprintUtils.cpp
+++ b/libraries/networking/src/FingerprintUtils.cpp
@@ -25,7 +25,7 @@
 
 static const QString FALLBACK_FINGERPRINT_KEY = "fallbackFingerprint";
 
-QUuid FingerprintUtils::getMachineFingerprint() {
+QUuid fingerprint::getMachineFingerprint() {
 
     QString uuidString;
 
@@ -56,7 +56,6 @@ QUuid FingerprintUtils::getMachineFingerprint() {
 
     if (FAILED(hres)) {
         qDebug() << "Failed to initialize WbemLocator";
-        return uuidString;
     }
     
     // Connect to WMI through the IWbemLocator::ConnectServer method
@@ -79,7 +78,6 @@ QUuid FingerprintUtils::getMachineFingerprint() {
     if (FAILED(hres)) {
         pLoc->Release();
         qDebug() << "Failed to connect to WMI";
-        return uuidString;
     }
     
     // Set security levels on the proxy
@@ -98,7 +96,6 @@ QUuid FingerprintUtils::getMachineFingerprint() {
         pSvc->Release();
         pLoc->Release();     
         qDebug() << "Failed to set security on proxy blanket";
-        return uuidString;
     }
     
     // Use the IWbemServices pointer to grab the Win32_BIOS stuff
@@ -114,7 +111,6 @@ QUuid FingerprintUtils::getMachineFingerprint() {
         pSvc->Release();
         pLoc->Release();
         qDebug() << "query to get Win32_ComputerSystemProduct info";
-        return uuidString;
     }
     
     // Get the SerialNumber from the Win32_BIOS data 
diff --git a/libraries/networking/src/FingerprintUtils.h b/libraries/networking/src/FingerprintUtils.h
index 2e4c5db561..1d59bd20a5 100644
--- a/libraries/networking/src/FingerprintUtils.h
+++ b/libraries/networking/src/FingerprintUtils.h
@@ -15,7 +15,7 @@
 #include <QString>
 #include <QUuid>
 
-namespace FingerprintUtils {
+namespace fingerprint {
     QUuid getMachineFingerprint();
 };