core: use nested namespaces
This commit is contained in:
parent
f409342ab5
commit
39e163b7ce
19 changed files with 40 additions and 80 deletions
|
@ -34,8 +34,7 @@ struct hash<Service::APT::AppletId> {
|
|||
};
|
||||
} // namespace std
|
||||
|
||||
namespace HLE {
|
||||
namespace Applets {
|
||||
namespace HLE::Applets {
|
||||
|
||||
static std::unordered_map<Service::APT::AppletId, std::shared_ptr<Applet>> applets;
|
||||
/// The CoreTiming event identifier for the Applet update callback.
|
||||
|
@ -136,5 +135,4 @@ void Init() {
|
|||
void Shutdown() {
|
||||
Core::System::GetInstance().CoreTiming().RemoveEvent(applet_update_event);
|
||||
}
|
||||
} // namespace Applets
|
||||
} // namespace HLE
|
||||
} // namespace HLE::Applets
|
||||
|
|
|
@ -8,8 +8,7 @@
|
|||
#include "core/hle/result.h"
|
||||
#include "core/hle/service/apt/applet_manager.h"
|
||||
|
||||
namespace HLE {
|
||||
namespace Applets {
|
||||
namespace HLE::Applets {
|
||||
|
||||
class Applet {
|
||||
public:
|
||||
|
@ -86,5 +85,4 @@ void Init();
|
|||
|
||||
/// Shuts down the HLE applets
|
||||
void Shutdown();
|
||||
} // namespace Applets
|
||||
} // namespace HLE
|
||||
} // namespace HLE::Applets
|
||||
|
|
|
@ -7,8 +7,7 @@
|
|||
#include "core/hle/applets/erreula.h"
|
||||
#include "core/hle/service/apt/apt.h"
|
||||
|
||||
namespace HLE {
|
||||
namespace Applets {
|
||||
namespace HLE::Applets {
|
||||
|
||||
ResultCode ErrEula::ReceiveParameter(const Service::APT::MessageParameter& parameter) {
|
||||
if (parameter.signal != Service::APT::SignalType::Request) {
|
||||
|
@ -67,5 +66,4 @@ ResultCode ErrEula::StartImpl(const Service::APT::AppletStartupParameter& parame
|
|||
|
||||
void ErrEula::Update() {}
|
||||
|
||||
} // namespace Applets
|
||||
} // namespace HLE
|
||||
} // namespace HLE::Applets
|
||||
|
|
|
@ -7,8 +7,7 @@
|
|||
#include "core/hle/applets/applet.h"
|
||||
#include "core/hle/kernel/shared_memory.h"
|
||||
|
||||
namespace HLE {
|
||||
namespace Applets {
|
||||
namespace HLE::Applets {
|
||||
|
||||
class ErrEula final : public Applet {
|
||||
public:
|
||||
|
@ -26,5 +25,4 @@ private:
|
|||
Kernel::SharedPtr<Kernel::SharedMemory> framebuffer_memory;
|
||||
};
|
||||
|
||||
} // namespace Applets
|
||||
} // namespace HLE
|
||||
} // namespace HLE::Applets
|
||||
|
|
|
@ -15,8 +15,7 @@
|
|||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
namespace HLE {
|
||||
namespace Applets {
|
||||
namespace HLE::Applets {
|
||||
|
||||
ResultCode MiiSelector::ReceiveParameter(const Service::APT::MessageParameter& parameter) {
|
||||
if (parameter.signal != Service::APT::SignalType::Request) {
|
||||
|
@ -110,5 +109,4 @@ ResultCode MiiSelector::StartImpl(const Service::APT::AppletStartupParameter& pa
|
|||
}
|
||||
|
||||
void MiiSelector::Update() {}
|
||||
} // namespace Applets
|
||||
} // namespace HLE
|
||||
} // namespace HLE::Applets
|
||||
|
|
|
@ -12,8 +12,7 @@
|
|||
#include "core/hle/result.h"
|
||||
#include "core/hle/service/apt/apt.h"
|
||||
|
||||
namespace HLE {
|
||||
namespace Applets {
|
||||
namespace HLE::Applets {
|
||||
|
||||
struct MiiConfig {
|
||||
u8 enable_cancel_button;
|
||||
|
@ -126,5 +125,4 @@ private:
|
|||
|
||||
MiiConfig config;
|
||||
};
|
||||
} // namespace Applets
|
||||
} // namespace HLE
|
||||
} // namespace HLE::Applets
|
||||
|
|
|
@ -7,8 +7,7 @@
|
|||
#include "core/hle/applets/mint.h"
|
||||
#include "core/hle/service/apt/apt.h"
|
||||
|
||||
namespace HLE {
|
||||
namespace Applets {
|
||||
namespace HLE::Applets {
|
||||
|
||||
ResultCode Mint::ReceiveParameter(const Service::APT::MessageParameter& parameter) {
|
||||
if (parameter.signal != Service::APT::SignalType::Request) {
|
||||
|
@ -67,5 +66,4 @@ ResultCode Mint::StartImpl(const Service::APT::AppletStartupParameter& parameter
|
|||
|
||||
void Mint::Update() {}
|
||||
|
||||
} // namespace Applets
|
||||
} // namespace HLE
|
||||
} // namespace HLE::Applets
|
||||
|
|
|
@ -7,8 +7,7 @@
|
|||
#include "core/hle/applets/applet.h"
|
||||
#include "core/hle/kernel/shared_memory.h"
|
||||
|
||||
namespace HLE {
|
||||
namespace Applets {
|
||||
namespace HLE::Applets {
|
||||
|
||||
class Mint final : public Applet {
|
||||
public:
|
||||
|
@ -26,5 +25,4 @@ private:
|
|||
Kernel::SharedPtr<Kernel::SharedMemory> framebuffer_memory;
|
||||
};
|
||||
|
||||
} // namespace Applets
|
||||
} // namespace HLE
|
||||
} // namespace HLE::Applets
|
||||
|
|
|
@ -19,8 +19,7 @@
|
|||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
namespace HLE {
|
||||
namespace Applets {
|
||||
namespace HLE::Applets {
|
||||
|
||||
ResultCode SoftwareKeyboard::ReceiveParameter(Service::APT::MessageParameter const& parameter) {
|
||||
if (parameter.signal != Service::APT::SignalType::Request) {
|
||||
|
@ -188,5 +187,4 @@ Frontend::KeyboardConfig SoftwareKeyboard::ToFrontendConfig(
|
|||
static_cast<bool>(config.filter_flags & SoftwareKeyboardFilter::Callback);
|
||||
return frontend_config;
|
||||
}
|
||||
} // namespace Applets
|
||||
} // namespace HLE
|
||||
} // namespace HLE::Applets
|
||||
|
|
|
@ -13,8 +13,7 @@
|
|||
#include "core/hle/result.h"
|
||||
#include "core/hle/service/apt/apt.h"
|
||||
|
||||
namespace HLE {
|
||||
namespace Applets {
|
||||
namespace HLE::Applets {
|
||||
|
||||
/// Maximum number of buttons that can be in the keyboard.
|
||||
constexpr int MAX_BUTTON = 3;
|
||||
|
@ -210,5 +209,4 @@ private:
|
|||
|
||||
std::shared_ptr<Frontend::SoftwareKeyboard> frontend_applet;
|
||||
};
|
||||
} // namespace Applets
|
||||
} // namespace HLE
|
||||
} // namespace HLE::Applets
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue