Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpilib] Deprecate getInstance() in favor of static functions (#3440)

Browse Source 
Co-authored-by: Noam Zaks <imnoamzaks@gmail.com>
This commit is contained in:
Peter Johnson
2021-06-15 23:06:03 -07:00
committed by GitHub
parent 26ff9371d9
commit 362066a9b7
105 changed files with 1500 additions and 1539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
wpilibc/src/main/native/cpp/Preferences.cpp
View File

@@ -7,6 +7,7 @@
#include <algorithm>
#include <hal/FRCUsageReporting.h>
#include <networktables/NetworkTable.h>
#include <networktables/NetworkTableInstance.h>
using namespace frc;
@@ -14,42 +15,59 @@ using namespace frc;
// The Preferences table name
static constexpr std::string_view kTableName{"Preferences"};
namespace {
struct Instance {
Instance();
std::shared_ptr<nt::NetworkTable> table{
nt::NetworkTableInstance::GetDefault().GetTable(kTableName)};
NT_EntryListener listener;
};
} // namespace
static Instance& GetInstance() {
static Instance instance;
return instance;
}
Preferences* Preferences::GetInstance() {
::GetInstance();
static Preferences instance;
return &instance;
}
std::vector<std::string> Preferences::GetKeys() {
return m_table->GetKeys();
return ::GetInstance().table->GetKeys();
}
std::string Preferences::GetString(std::string_view key,
std::string_view defaultValue) {
return m_table->GetString(key, defaultValue);
return ::GetInstance().table->GetString(key, defaultValue);
}
int Preferences::GetInt(std::string_view key, int defaultValue) {
return static_cast<int>(m_table->GetNumber(key, defaultValue));
return static_cast<int>(::GetInstance().table->GetNumber(key, defaultValue));
}
double Preferences::GetDouble(std::string_view key, double defaultValue) {
return m_table->GetNumber(key, defaultValue);
return ::GetInstance().table->GetNumber(key, defaultValue);
}
float Preferences::GetFloat(std::string_view key, float defaultValue) {
return m_table->GetNumber(key, defaultValue);
return ::GetInstance().table->GetNumber(key, defaultValue);
}
bool Preferences::GetBoolean(std::string_view key, bool defaultValue) {
return m_table->GetBoolean(key, defaultValue);
return ::GetInstance().table->GetBoolean(key, defaultValue);
}
int64_t Preferences::GetLong(std::string_view key, int64_t defaultValue) {
return static_cast<int64_t>(m_table->GetNumber(key, defaultValue));
return static_cast<int64_t>(
::GetInstance().table->GetNumber(key, defaultValue));
}
void Preferences::SetString(std::string_view key, std::string_view value) {
auto entry = m_table->GetEntry(key);
auto entry = ::GetInstance().table->GetEntry(key);
entry.SetString(value);
entry.SetPersistent();
}
@@ -59,12 +77,12 @@ void Preferences::PutString(std::string_view key, std::string_view value) {
}
void Preferences::InitString(std::string_view key, std::string_view value) {
auto entry = m_table->GetEntry(key);
auto entry = ::GetInstance().table->GetEntry(key);
entry.SetDefaultString(value);
}
void Preferences::SetInt(std::string_view key, int value) {
auto entry = m_table->GetEntry(key);
auto entry = ::GetInstance().table->GetEntry(key);
entry.SetDouble(value);
entry.SetPersistent();
}
@@ -74,12 +92,12 @@ void Preferences::PutInt(std::string_view key, int value) {
}
void Preferences::InitInt(std::string_view key, int value) {
auto entry = m_table->GetEntry(key);
auto entry = ::GetInstance().table->GetEntry(key);
entry.SetDefaultDouble(value);
}
void Preferences::SetDouble(std::string_view key, double value) {
auto entry = m_table->GetEntry(key);
auto entry = ::GetInstance().table->GetEntry(key);
entry.SetDouble(value);
entry.SetPersistent();
}
@@ -89,12 +107,12 @@ void Preferences::PutDouble(std::string_view key, double value) {
}
void Preferences::InitDouble(std::string_view key, double value) {
auto entry = m_table->GetEntry(key);
auto entry = ::GetInstance().table->GetEntry(key);
entry.SetDefaultDouble(value);
}
void Preferences::SetFloat(std::string_view key, float value) {
auto entry = m_table->GetEntry(key);
auto entry = ::GetInstance().table->GetEntry(key);
entry.SetDouble(value);
entry.SetPersistent();
}
@@ -104,12 +122,12 @@ void Preferences::PutFloat(std::string_view key, float value) {
}
void Preferences::InitFloat(std::string_view key, float value) {
auto entry = m_table->GetEntry(key);
auto entry = ::GetInstance().table->GetEntry(key);
entry.SetDefaultDouble(value);
}
void Preferences::SetBoolean(std::string_view key, bool value) {
auto entry = m_table->GetEntry(key);
auto entry = ::GetInstance().table->GetEntry(key);
entry.SetBoolean(value);
entry.SetPersistent();
}
@@ -119,12 +137,12 @@ void Preferences::PutBoolean(std::string_view key, bool value) {
}
void Preferences::InitBoolean(std::string_view key, bool value) {
auto entry = m_table->GetEntry(key);
auto entry = ::GetInstance().table->GetEntry(key);
entry.SetDefaultBoolean(value);
}
void Preferences::SetLong(std::string_view key, int64_t value) {
auto entry = m_table->GetEntry(key);
auto entry = ::GetInstance().table->GetEntry(key);
entry.SetDouble(value);
entry.SetPersistent();
}
@@ -134,16 +152,16 @@ void Preferences::PutLong(std::string_view key, int64_t value) {
}
void Preferences::InitLong(std::string_view key, int64_t value) {
auto entry = m_table->GetEntry(key);
auto entry = ::GetInstance().table->GetEntry(key);
entry.SetDefaultDouble(value);
}
bool Preferences::ContainsKey(std::string_view key) {
return m_table->ContainsKey(key);
return ::GetInstance().table->ContainsKey(key);
}
void Preferences::Remove(std::string_view key) {
m_table->Delete(key);
::GetInstance().table->Delete(key);
}
void Preferences::RemoveAll() {
@@ -154,10 +172,9 @@ void Preferences::RemoveAll() {
}
}
Preferences::Preferences()
: m_table(nt::NetworkTableInstance::GetDefault().GetTable(kTableName)) {
m_table->GetEntry(".type").SetString("RobotPreferences");
m_listener = m_table->AddEntryListener(
Instance::Instance() {
table->GetEntry(".type").SetString("RobotPreferences");
listener = table->AddEntryListener(
[=](nt::NetworkTable* table, std::string_view name,
nt::NetworkTableEntry entry, std::shared_ptr<nt::Value> value,
int flags) { entry.SetPersistent(); },