DeviceQualifier: small cleanup

2017-11-04 13:49:07 -07:00 · 2017-11-04 13:49:07 -07:00 · 6b7d5bb80c
parent ac855e2c93
commit 6b7d5bb80c
2 changed files with 5 additions and 6 deletions
--- a/Source/Core/InputCommon/ControllerInterface/Device.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Device.cpp
@ -87,15 +87,17 @@ std::string DeviceQualifier::ToString() const
 //
 void DeviceQualifier::FromString(const std::string& str)
 {
+  *this = {};
+
  std::istringstream ss(str);

-  std::getline(ss, source = "", '/');
+  std::getline(ss, source, '/');

  // silly
  std::getline(ss, name, '/');
-  std::istringstream(name) >> (cid = -1);
+  std::istringstream(name) >> cid;

-  std::getline(ss, name = "");
+  std::getline(ss, name);
 }

 //
--- a/Source/Core/InputCommon/ControllerInterface/Device.h
+++ b/Source/Core/InputCommon/ControllerInterface/Device.h
@ -18,9 +18,6 @@ namespace ciface
 {
 namespace Core
 {
-// Forward declarations
-class DeviceQualifier;
-
 //
 // Device
 //