mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-22 01:11:42 +00:00
SCRIPT namespace replacements
This commit is contained in:
committed by
Peter Johnson
parent
ae6c043632
commit
9aca8e0fd6
@@ -15,7 +15,7 @@ using namespace halsimgui;
|
||||
|
||||
static bool gDisableOutputsOnDSDisable = true;
|
||||
|
||||
HALProvider::HALProvider(glass::Storage& storage) : Provider{storage} {
|
||||
HALProvider::HALProvider(wpi::glass::Storage& storage) : Provider{storage} {
|
||||
storage.SetCustomApply([this] {
|
||||
for (auto&& childIt : m_storage.GetChildren()) {
|
||||
auto it = FindViewEntry(childIt.key());
|
||||
@@ -65,7 +65,7 @@ void HALProvider::DisplayMenu() {
|
||||
}
|
||||
}
|
||||
|
||||
glass::Model* HALProvider::GetModel(std::string_view name) {
|
||||
wpi::glass::Model* HALProvider::GetModel(std::string_view name) {
|
||||
auto it = FindModelEntry(name);
|
||||
if (it == m_modelEntries.end() || (*it)->name != name) {
|
||||
return nullptr;
|
||||
@@ -79,7 +79,7 @@ glass::Model* HALProvider::GetModel(std::string_view name) {
|
||||
return entry->model.get();
|
||||
}
|
||||
|
||||
void HALProvider::Show(ViewEntry* entry, glass::Window* window) {
|
||||
void HALProvider::Show(ViewEntry* entry, wpi::glass::Window* window) {
|
||||
// if there's already a window, we're done
|
||||
if (entry->window) {
|
||||
return;
|
||||
@@ -97,7 +97,7 @@ void HALProvider::Show(ViewEntry* entry, glass::Window* window) {
|
||||
if (!window) {
|
||||
window = GetOrAddWindow(
|
||||
entry->name, true,
|
||||
entry->showDefault ? glass::Window::kShow : glass::Window::kHide);
|
||||
entry->showDefault ? wpi::glass::Window::kShow : wpi::glass::Window::kHide);
|
||||
}
|
||||
if (!window) {
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user