strat: use m_ for member variables

This commit is contained in:
Michael Scire
2021-10-10 00:14:06 -07:00
parent ce28591ab2
commit a595c232b9
425 changed files with 8531 additions and 8484 deletions

View File

@@ -21,16 +21,16 @@ namespace ams::mitm::sysupdater {
class ErrorContextHolder {
private:
err::ErrorContext error_context;
err::ErrorContext m_error_context;
public:
constexpr ErrorContextHolder() : error_context{} { /* ... */ }
constexpr ErrorContextHolder() : m_error_context{} { /* ... */ }
virtual ~ErrorContextHolder() { /* ... */ }
template<typename T>
Result SaveErrorContextIfFailed(T &async, Result result) {
if (R_FAILED(result)) {
async.GetErrorContext(std::addressof(this->error_context));
async.GetErrorContext(std::addressof(m_error_context));
return result;
}
@@ -46,7 +46,7 @@ namespace ams::mitm::sysupdater {
template<typename T>
Result SaveInternalTaskErrorContextIfFailed(T &async, Result result) {
if (R_FAILED(result)) {
async.CreateErrorContext(std::addressof(this->error_context));
async.CreateErrorContext(std::addressof(m_error_context));
return result;
}
@@ -54,7 +54,7 @@ namespace ams::mitm::sysupdater {
}
const err::ErrorContext &GetErrorContextImpl() {
return this->error_context;
return m_error_context;
}
};
@@ -93,15 +93,15 @@ namespace ams::mitm::sysupdater {
/* We don't implement the RequestServer::ManagedStop details, as we don't implement stoppable request list. */
class AsyncPrepareSdCardUpdateImpl : public AsyncResultBase, private ErrorContextHolder {
private:
Result result;
os::SystemEvent event;
util::optional<ThreadInfo> thread_info;
ncm::InstallTaskBase *task;
Result m_result;
os::SystemEvent m_event;
util::optional<ThreadInfo> m_thread_info;
ncm::InstallTaskBase *m_task;
public:
AsyncPrepareSdCardUpdateImpl(ncm::InstallTaskBase *task) : result(ResultSuccess()), event(os::EventClearMode_ManualClear, true), thread_info(), task(task) { /* ... */ }
AsyncPrepareSdCardUpdateImpl(ncm::InstallTaskBase *task) : m_result(ResultSuccess()), m_event(os::EventClearMode_ManualClear, true), m_thread_info(), m_task(task) { /* ... */ }
virtual ~AsyncPrepareSdCardUpdateImpl();
os::SystemEvent &GetEvent() { return this->event; }
os::SystemEvent &GetEvent() { return m_event; }
virtual Result GetErrorContext(sf::Out<err::ErrorContext> out) override {
*out = ErrorContextHolder::GetErrorContextImpl();
@@ -113,7 +113,7 @@ namespace ams::mitm::sysupdater {
Result Execute();
virtual void CancelImpl() override;
virtual Result GetImpl() override { return this->result; }
virtual Result GetImpl() override { return m_result; }
};
}