piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 21:30:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

InputCommon: Use nested namespace specifiers where applicable

Browse Source
This commit is contained in:
Lioncash
2019-06-17 16:39:24 -04:00
parent 8e030a4a45
commit ec60027f56
38 changed files with 78 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/InputCommon/ControllerInterface/OSX/OSX.h
View File

@ -4,14 +4,11 @@
#pragma once
namespace ciface
{
namespace OSX
namespace ciface::OSX
{
void Init(void* window);
void PopulateDevices(void* window);
void DeInit();
void DeviceElementDebugPrint(const void*, void*);
} // namespace OSX
} // namespace ciface
} // namespace ciface::OSX

7
Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm
View File

@ -17,9 +17,7 @@
#include "InputCommon/ControllerInterface/OSX/OSXJoystick.h"
#include "InputCommon/ControllerInterface/OSX/RunLoopStopper.h"
namespace ciface
{
namespace OSX
namespace ciface::OSX
{
constexpr CFTimeInterval FOREVER = 1e20;
static std::thread s_hotplug_thread;
@ -227,5 +225,4 @@ void DeInit()
IOHIDManagerClose(HIDManager, kIOHIDOptionsTypeNone);
CFRelease(HIDManager);
}
}
}
} // namespace ciface::OSX

7
Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h
View File

@ -11,9 +11,7 @@
#include "InputCommon/ControllerInterface/Device.h"
#include "InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h"
namespace ciface
{
namespace OSX
namespace ciface::OSX
{
class Joystick : public ForceFeedback::ForceFeedbackDevice
{
@ -90,5 +88,4 @@ private:
ForceFeedback::FFDeviceAdapterReference m_ff_device;
};
} // namespace OSX
} // namespace ciface
} // namespace ciface::OSX

7
Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
View File

@ -13,9 +13,7 @@
#include "Common/Logging/Log.h"
#include "Common/StringUtil.h"
namespace ciface
{
namespace OSX
namespace ciface::OSX
{
void Joystick::AddElements(CFArrayRef elements, std::set<IOHIDElementCookie>& cookies)
{
@ -341,5 +339,4 @@ bool Joystick::IsSameDevice(const IOHIDDeviceRef other_device) const
{
return m_device == other_device;
}
}
}
} // namespace ciface::OSX

8
Source/Core/InputCommon/ControllerInterface/OSX/RunLoopStopper.h
View File

@ -6,9 +6,7 @@
#include <Foundation/Foundation.h>
namespace ciface
{
namespace OSX
namespace ciface::OSX
{
class RunLoopStopper
{
@ -40,6 +38,4 @@ public:
CFRunLoopRemoveSource(runloop, m_source, mode);
}
};
} // namespace OSX
} // namespace ciface
} // namespace ciface::OSX