The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-15 06:58:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reformat all the things. Have fun with merge conflicts.

Browse Source
This commit is contained in:
Pierre Bourdon
2016-06-24 10:43:46 +02:00
parent 2115e8a4a6
commit 3570c7f03a
1116 changed files with 187405 additions and 180344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
Source/Core/InputCommon/ControllerInterface/Device.cpp
View File

@ -17,7 +17,6 @@ namespace ciface
{
namespace Core
{
//
// Device :: ~Device
//
@ -25,55 +24,55 @@ namespace Core
//
Device::~Device()
{
// delete inputs
for (Device::Input* input : m_inputs)
delete input;
// delete inputs
for (Device::Input* input : m_inputs)
delete input;
// delete outputs
for (Device::Output* output: m_outputs)
delete output;
// delete outputs
for (Device::Output* output : m_outputs)
delete output;
}
void Device::AddInput(Device::Input* const i)
{
m_inputs.push_back(i);
m_inputs.push_back(i);
}
void Device::AddOutput(Device::Output* const o)
{
m_outputs.push_back(o);
m_outputs.push_back(o);
}
Device::Input* Device::FindInput(const std::string &name) const
Device::Input* Device::FindInput(const std::string& name) const
{
for (Input* input : m_inputs)
{
if (input->GetName() == name)
return input;
}
for (Input* input : m_inputs)
{
if (input->GetName() == name)
return input;
}
return nullptr;
return nullptr;
}
Device::Output* Device::FindOutput(const std::string &name) const
Device::Output* Device::FindOutput(const std::string& name) const
{
for (Output* output : m_outputs)
{
if (output->GetName() == name)
return output;
}
for (Output* output : m_outputs)
{
if (output->GetName() == name)
return output;
}
return nullptr;
return nullptr;
}
bool Device::Control::InputGateOn()
{
if (SConfig::GetInstance().m_BackgroundInput)
return true;
else if (Host_RendererHasFocus() || Host_UIHasFocus())
return true;
else
return false;
if (SConfig::GetInstance().m_BackgroundInput)
return true;
else if (Host_RendererHasFocus() || Host_UIHasFocus())
return true;
else
return false;
}
//
@ -83,16 +82,16 @@ bool Device::Control::InputGateOn()
//
std::string DeviceQualifier::ToString() const
{
if (source.empty() && (cid < 0) && name.empty())
return "";
if (source.empty() && (cid < 0) && name.empty())
return "";
std::ostringstream ss;
ss << source << '/';
if (cid > -1)
ss << cid;
ss << '/' << name;
std::ostringstream ss;
ss << source << '/';
if (cid > -1)
ss << cid;
ss << '/' << name;
return ss.str();
return ss.str();
}
//
@ -102,15 +101,15 @@ std::string DeviceQualifier::ToString() const
//
void DeviceQualifier::FromString(const std::string& str)
{
std::istringstream ss(str);
std::istringstream ss(str);
std::getline(ss, source = "", '/');
std::getline(ss, source = "", '/');
// silly
std::getline(ss, name, '/');
std::istringstream(name) >> (cid = -1);
// silly
std::getline(ss, name, '/');
std::istringstream(name) >> (cid = -1);
std::getline(ss, name = "");
std::getline(ss, name = "");
}
//
@ -120,66 +119,65 @@ void DeviceQualifier::FromString(const std::string& str)
//
void DeviceQualifier::FromDevice(const Device* const dev)
{
name = dev->GetName();
cid = dev->GetId();
source= dev->GetSource();
name = dev->GetName();
cid = dev->GetId();
source = dev->GetSource();
}
bool DeviceQualifier::operator==(const Device* const dev) const
{
if (dev->GetId() == cid)
if (dev->GetName() == name)
if (dev->GetSource() == source)
return true;
if (dev->GetId() == cid)
if (dev->GetName() == name)
if (dev->GetSource() == source)
return true;
return false;
return false;
}
bool DeviceQualifier::operator==(const DeviceQualifier& devq) const
{
if (cid == devq.cid)
if (name == devq.name)
if (source == devq.source)
return true;
if (cid == devq.cid)
if (name == devq.name)
if (source == devq.source)
return true;
return false;
return false;
}
Device* DeviceContainer::FindDevice(const DeviceQualifier& devq) const
{
for (Device* d : m_devices)
{
if (devq == d)
return d;
}
for (Device* d : m_devices)
{
if (devq == d)
return d;
}
return nullptr;
return nullptr;
}
Device::Input* DeviceContainer::FindInput(const std::string& name, const Device* def_dev) const
{
if (def_dev)
{
Device::Input* const inp = def_dev->FindInput(name);
if (inp)
return inp;
}
if (def_dev)
{
Device::Input* const inp = def_dev->FindInput(name);
if (inp)
return inp;
}
for (Device* d : m_devices)
{
Device::Input* const i = d->FindInput(name);
for (Device* d : m_devices)
{
Device::Input* const i = d->FindInput(name);
if (i)
return i;
}
if (i)
return i;
}
return nullptr;
return nullptr;
}
Device::Output* DeviceContainer::FindOutput(const std::string& name, const Device* def_dev) const
{
return def_dev->FindOutput(name);
}
return def_dev->FindOutput(name);
}
}
}