From b0060e51843d085af6c7426d216cdd1bbc41dbbb Mon Sep 17 00:00:00 2001 From: Rohit Nirmal Date: Thu, 4 Sep 2014 19:41:42 -0500 Subject: [PATCH] Controller Interface: Remove "using namespace" in header file. --- Source/Core/DolphinWX/InputConfigDiag.cpp | 22 +++++++++---------- Source/Core/DolphinWX/InputConfigDiag.h | 2 +- Source/Core/InputCommon/ControllerEmu.h | 2 +- .../ControllerInterface.cpp | 16 +++++++------- .../ControllerInterface/ControllerInterface.h | 12 +++++----- 5 files changed, 26 insertions(+), 28 deletions(-) diff --git a/Source/Core/DolphinWX/InputConfigDiag.cpp b/Source/Core/DolphinWX/InputConfigDiag.cpp index 9bd9c68b56..378b8729a0 100644 --- a/Source/Core/DolphinWX/InputConfigDiag.cpp +++ b/Source/Core/DolphinWX/InputConfigDiag.cpp @@ -218,19 +218,19 @@ void ControlDialog::UpdateListContents() { control_lbox->Clear(); - Device* const dev = g_controller_interface.FindDevice(m_devq); + ciface::Core::Device* const dev = g_controller_interface.FindDevice(m_devq); if (dev) { if (control_reference->is_input) { - for (Device::Input* input : dev->Inputs()) + for (ciface::Core::Device::Input* input : dev->Inputs()) { control_lbox->Append(StrToWxStr(input->GetName())); } } else // It's an output { - for (Device::Output* output : dev->Outputs()) + for (ciface::Core::Device::Output* output : dev->Outputs()) { control_lbox->Append(StrToWxStr(output->GetName())); } @@ -373,8 +373,8 @@ inline bool IsAlphabetic(wxString &str) inline void GetExpressionForControl(wxString &expr, wxString &control_name, - DeviceQualifier *control_device = nullptr, - DeviceQualifier *default_device = nullptr) + ciface::Core::DeviceQualifier *control_device = nullptr, + ciface::Core::DeviceQualifier *default_device = nullptr) { expr = ""; @@ -506,7 +506,7 @@ void ControlDialog::DetectControl(wxCommandEvent& event) wxButton* const btn = (wxButton*)event.GetEventObject(); const wxString lbl = btn->GetLabel(); - Device* const dev = g_controller_interface.FindDevice(m_devq); + ciface::Core::Device* const dev = g_controller_interface.FindDevice(m_devq); if (dev) { btn->SetLabel(_("[ waiting ]")); @@ -515,7 +515,7 @@ void ControlDialog::DetectControl(wxCommandEvent& event) wxTheApp->Yield(true); std::lock_guard lk(m_config.controls_lock); - Device::Control* const ctrl = control_reference->Detect(DETECT_WAIT_TIME, dev); + ciface::Core::Device::Control* const ctrl = control_reference->Detect(DETECT_WAIT_TIME, dev); // if we got input, select it in the list if (ctrl) @@ -546,7 +546,7 @@ bool GamepadPage::DetectButton(ControlButton* button) { bool success = false; // find device :/ - Device* const dev = g_controller_interface.FindDevice(controller->default_device); + ciface::Core::Device* const dev = g_controller_interface.FindDevice(controller->default_device); if (dev) { button->SetLabel(_("[ waiting ]")); @@ -555,7 +555,7 @@ bool GamepadPage::DetectButton(ControlButton* button) wxTheApp->Yield(true); std::lock_guard lk(m_config.controls_lock); - Device::Control* const ctrl = button->control_reference->Detect(DETECT_WAIT_TIME, dev); + ciface::Core::Device::Control* const ctrl = button->control_reference->Detect(DETECT_WAIT_TIME, dev); // if we got input, update expression and reference if (ctrl) @@ -725,12 +725,12 @@ void GamepadPage::DeleteProfile(wxCommandEvent&) void InputConfigDialog::UpdateDeviceComboBox() { - DeviceQualifier dq; + ciface::Core::DeviceQualifier dq; for (GamepadPage* page : m_padpages) { page->device_cbox->Clear(); - for (Device* d : g_controller_interface.Devices()) + for (ciface::Core::Device* d : g_controller_interface.Devices()) { dq.FromDevice(d); page->device_cbox->Append(StrToWxStr(dq.ToString())); diff --git a/Source/Core/DolphinWX/InputConfigDiag.h b/Source/Core/DolphinWX/InputConfigDiag.h index c5eb0daaa9..5d1f94ba03 100644 --- a/Source/Core/DolphinWX/InputConfigDiag.h +++ b/Source/Core/DolphinWX/InputConfigDiag.h @@ -124,7 +124,7 @@ private: GamepadPage* const m_parent; wxStaticText* m_bound_label; wxStaticText* m_error_label; - DeviceQualifier m_devq; + ciface::Core::DeviceQualifier m_devq; bool GetExpressionForSelectedControl(wxString &expr); }; diff --git a/Source/Core/InputCommon/ControllerEmu.h b/Source/Core/InputCommon/ControllerEmu.h index 38f8679f44..e8dd22889c 100644 --- a/Source/Core/InputCommon/ControllerEmu.h +++ b/Source/Core/InputCommon/ControllerEmu.h @@ -442,5 +442,5 @@ public: std::vector> groups; - DeviceQualifier default_device; + ciface::Core::DeviceQualifier default_device; }; diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index 6d9d3b82a2..09fcf12ed8 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -81,10 +81,10 @@ void ControllerInterface::Shutdown() if (!m_is_init) return; - for (Device* d : m_devices) + for (ciface::Core::Device* d : m_devices) { // Set outputs to ZERO before destroying device - for (Device::Output* o : d->Outputs()) + for (ciface::Core::Device::Output* o : d->Outputs()) o->SetState(0); // Update output @@ -145,7 +145,7 @@ bool ControllerInterface::UpdateInput(const bool force) size_t ok_count = 0; - for (Device* d : m_devices) + for (ciface::Core::Device* d : m_devices) { if (d->UpdateInput()) ++ok_count; @@ -173,7 +173,7 @@ bool ControllerInterface::UpdateOutput(const bool force) size_t ok_count = 0; - for (Device* d : m_devices) + for (ciface::Core::Device* d : m_devices) { if (d->UpdateOutput()) ++ok_count; @@ -217,7 +217,7 @@ ControlState ControllerInterface::OutputReference::State(const ControlState stat // need to call this to re-parse a control reference's expression after changing it // void ControllerInterface::UpdateReference(ControllerInterface::ControlReference* ref - , const DeviceQualifier& default_device) const + , const ciface::Core::DeviceQualifier& default_device) const { delete ref->parsed_expression; ref->parsed_expression = nullptr; @@ -236,7 +236,7 @@ void ControllerInterface::UpdateReference(ControllerInterface::ControlReference* // upon input, return pointer to detected Control // else return nullptr // -Device::Control* ControllerInterface::InputReference::Detect(const unsigned int ms, Device* const device) +ciface::Core::Device::Control* ControllerInterface::InputReference::Detect(const unsigned int ms, ciface::Core::Device* const device) { unsigned int time = 0; std::vector states(device->Inputs().size()); @@ -246,7 +246,7 @@ Device::Control* ControllerInterface::InputReference::Detect(const unsigned int // get starting state of all inputs, // so we can ignore those that were activated at time of Detect start - std::vector::const_iterator + std::vector::const_iterator i = device->Inputs().begin(), e = device->Inputs().end(); for (std::vector::iterator state = states.begin(); i != e; ++i) @@ -286,7 +286,7 @@ Device::Control* ControllerInterface::InputReference::Detect(const unsigned int // // set all binded outputs to power for x milliseconds return false // -Device::Control* ControllerInterface::OutputReference::Detect(const unsigned int ms, Device* const device) +ciface::Core::Device::Control* ControllerInterface::OutputReference::Detect(const unsigned int ms, ciface::Core::Device* const device) { // ignore device diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h index 5ea5e1b041..af4fc35cc5 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h @@ -36,15 +36,13 @@ #define CIFACE_USE_SDL #endif -using namespace ciface::Core; - // // ControllerInterface // // Some crazy shit I made to control different device inputs and outputs // from lots of different sources, hopefully more easily. // -class ControllerInterface : public DeviceContainer +class ControllerInterface : public ciface::Core::DeviceContainer { public: @@ -63,7 +61,7 @@ public: friend class ControllerInterface; public: virtual ControlState State(const ControlState state = 0) = 0; - virtual Device::Control* Detect(const unsigned int ms, Device* const device) = 0; + virtual ciface::Core::Device::Control* Detect(const unsigned int ms, ciface::Core::Device* const device) = 0; ControlState range; std::string expression; @@ -98,7 +96,7 @@ public: public: InputReference() : ControlReference(true) {} ControlState State(const ControlState state) override; - Device::Control* Detect(const unsigned int ms, Device* const device) override; + ciface::Core::Device::Control* Detect(const unsigned int ms, ciface::Core::Device* const device) override; }; // @@ -111,7 +109,7 @@ public: public: OutputReference() : ControlReference(false) {} ControlState State(const ControlState state) override; - Device::Control* Detect(const unsigned int ms, Device* const device) override; + ciface::Core::Device::Control* Detect(const unsigned int ms, ciface::Core::Device* const device) override; }; ControllerInterface() : m_is_init(false), m_hwnd(nullptr) {} @@ -121,7 +119,7 @@ public: void Shutdown(); bool IsInit() const { return m_is_init; } - void UpdateReference(ControlReference* control, const DeviceQualifier& default_device) const; + void UpdateReference(ControlReference* control, const ciface::Core::DeviceQualifier& default_device) const; bool UpdateInput(const bool force = false); bool UpdateOutput(const bool force = false);