Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 17:49:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

CR feedback

Browse source 
lame mistake - it is always the error branches that get you.
This commit is contained in:
David Kelly 2016-12-06 11:12:50 -08:00
parent c40aadfea4
commit dc47c5fc0c
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -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 Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us
// TODO: This is temporary, while developing // TODO: This is temporary, while developing
FingerprintUtils::getMachineFingerprint(); fingerprint::getMachineFingerprint();
// End TODO // End TODO
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();

6
libraries/networking/src/FingerprintUtils.cpp
View file

@ -25,7 +25,7 @@
static const QString FALLBACK_FINGERPRINT_KEY = "fallbackFingerprint"; static const QString FALLBACK_FINGERPRINT_KEY = "fallbackFingerprint";
QUuid FingerprintUtils::getMachineFingerprint() { QUuid fingerprint::getMachineFingerprint() {
QString uuidString; QString uuidString;
@ -56,7 +56,6 @@ QUuid FingerprintUtils::getMachineFingerprint() {
if (FAILED(hres)) { if (FAILED(hres)) {
qDebug() << "Failed to initialize WbemLocator"; qDebug() << "Failed to initialize WbemLocator";
return uuidString;
} }
// Connect to WMI through the IWbemLocator::ConnectServer method // Connect to WMI through the IWbemLocator::ConnectServer method
@ -79,7 +78,6 @@ QUuid FingerprintUtils::getMachineFingerprint() {
if (FAILED(hres)) { if (FAILED(hres)) {
pLoc->Release(); pLoc->Release();
qDebug() << "Failed to connect to WMI"; qDebug() << "Failed to connect to WMI";
return uuidString;
} }
// Set security levels on the proxy // Set security levels on the proxy
@ -98,7 +96,6 @@ QUuid FingerprintUtils::getMachineFingerprint() {
pSvc->Release(); pSvc->Release();
pLoc->Release(); pLoc->Release();
qDebug() << "Failed to set security on proxy blanket"; qDebug() << "Failed to set security on proxy blanket";
return uuidString;
} }
// Use the IWbemServices pointer to grab the Win32_BIOS stuff // Use the IWbemServices pointer to grab the Win32_BIOS stuff
@ -114,7 +111,6 @@ QUuid FingerprintUtils::getMachineFingerprint() {
pSvc->Release(); pSvc->Release();
pLoc->Release(); pLoc->Release();
qDebug() << "query to get Win32_ComputerSystemProduct info"; qDebug() << "query to get Win32_ComputerSystemProduct info";
return uuidString;
} }
// Get the SerialNumber from the Win32_BIOS data // Get the SerialNumber from the Win32_BIOS data

2
libraries/networking/src/FingerprintUtils.h
View file

@ -15,7 +15,7 @@
#include <QString> #include <QString>
#include <QUuid> #include <QUuid>
namespace FingerprintUtils { namespace fingerprint {
QUuid getMachineFingerprint(); QUuid getMachineFingerprint();
}; };