service: Use nested namespace specifiers where applicable

There were a few places where nested namespace specifiers weren't being
used where they could be within the service code. This amends that to
make the namespacing a tiny bit more compact.
This commit is contained in:
Lioncash 2018-09-22 14:23:08 +02:00 committed by fearlessTobi
parent 80cdfe1c45
commit 46da908a00
221 changed files with 443 additions and 902 deletions

View file

@ -9,8 +9,7 @@
#include "core/movie.h"
#include "core/settings.h"
namespace Service {
namespace IR {
namespace Service::IR {
enum class RequestID : u8 {
/**
@ -270,5 +269,4 @@ void ExtraHID::LoadInputDevices() {
Settings::values.analogs[Settings::NativeAnalog::CStick]);
}
} // namespace IR
} // namespace Service
} // namespace Service::IR

View file

@ -15,8 +15,7 @@ namespace CoreTiming {
struct EventType;
} // namespace CoreTiming
namespace Service {
namespace IR {
namespace Service::IR {
struct ExtraHIDResponse {
union {
@ -66,5 +65,4 @@ private:
std::atomic<bool> is_device_reload_pending;
};
} // namespace IR
} // namespace Service
} // namespace Service::IR

View file

@ -9,8 +9,7 @@
#include "core/hle/service/ir/ir_user.h"
#include "core/hle/service/service.h"
namespace Service {
namespace IR {
namespace Service::IR {
static std::weak_ptr<IR_RST> current_ir_rst;
static std::weak_ptr<IR_USER> current_ir_user;
@ -35,6 +34,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
current_ir_rst = ir_rst;
}
} // namespace IR
} // namespace Service
} // namespace Service::IR

View file

@ -8,13 +8,11 @@ namespace SM {
class ServiceManager;
}
namespace Service {
namespace IR {
namespace Service::IR {
/// Reload input devices. Used when input configuration changed
void ReloadInputDevices();
void InstallInterfaces(SM::ServiceManager& service_manager);
} // namespace IR
} // namespace Service
} // namespace Service::IR

View file

@ -11,8 +11,7 @@
#include "core/movie.h"
#include "core/settings.h"
namespace Service {
namespace IR {
namespace Service::IR {
struct PadDataEntry {
PadState current_state;
@ -174,5 +173,4 @@ void IR_RST::ReloadInputDevices() {
is_device_reload_pending.store(true);
}
} // namespace IR
} // namespace Service
} // namespace Service::IR

View file

@ -22,8 +22,7 @@ namespace CoreTiming {
struct EventType;
};
namespace Service {
namespace IR {
namespace Service::IR {
union PadState {
u32_le hex{};
@ -90,5 +89,4 @@ private:
int update_period{0};
};
} // namespace IR
} // namespace Service
} // namespace Service::IR

View file

@ -4,8 +4,7 @@
#include "core/hle/service/ir/ir_u.h"
namespace Service {
namespace IR {
namespace Service::IR {
IR_U::IR_U() : ServiceFramework("ir:u", 1) {
static const FunctionInfo functions[] = {
@ -31,5 +30,4 @@ IR_U::IR_U() : ServiceFramework("ir:u", 1) {
RegisterHandlers(functions);
}
} // namespace IR
} // namespace Service
} // namespace Service::IR

View file

@ -6,8 +6,7 @@
#include "core/hle/service/service.h"
namespace Service {
namespace IR {
namespace Service::IR {
/// Interface to "ir:u" service
class IR_U final : public ServiceFramework<IR_U> {
@ -15,5 +14,4 @@ public:
IR_U();
};
} // namespace IR
} // namespace Service
} // namespace Service::IR

View file

@ -12,8 +12,7 @@
#include "core/hle/service/ir/extra_hid.h"
#include "core/hle/service/ir/ir_user.h"
namespace Service {
namespace IR {
namespace Service::IR {
// This is a header that will present in the ir:USER shared memory if it is initialized with
// InitializeIrNopShared service function. Otherwise the shared memory doesn't have this header if
@ -439,5 +438,4 @@ void IRDevice::Send(const std::vector<u8>& data) {
send_func(data);
}
} // namespace IR
} // namespace Service
} // namespace Service::IR

View file

@ -18,8 +18,7 @@ namespace CoreTiming {
struct EventType;
};
namespace Service {
namespace IR {
namespace Service::IR {
class BufferManager;
class ExtraHID;
@ -174,5 +173,4 @@ private:
std::unique_ptr<ExtraHID> extra_hid;
};
} // namespace IR
} // namespace Service
} // namespace Service::IR