From 890185acee972a628af935c3de26a42f70727ae7 Mon Sep 17 00:00:00 2001 From: Isaac Turner Date: Sun, 28 Apr 2024 21:15:19 +0800 Subject: [PATCH] [ntcore] Remove deprecated delete function (#6552) --- .../generate/main/java/NetworkTableEntry.java.jinja | 10 ---------- .../edu/wpi/first/networktables/NetworkTableEntry.java | 10 ---------- .../native/include/networktables/NetworkTableEntry.h | 7 ------- .../native/include/networktables/NetworkTableEntry.inc | 4 ---- 4 files changed, 31 deletions(-) diff --git a/ntcore/src/generate/main/java/NetworkTableEntry.java.jinja b/ntcore/src/generate/main/java/NetworkTableEntry.java.jinja index fa3a72a949..d0bbb3fff0 100644 --- a/ntcore/src/generate/main/java/NetworkTableEntry.java.jinja +++ b/ntcore/src/generate/main/java/NetworkTableEntry.java.jinja @@ -580,16 +580,6 @@ public final class NetworkTableEntry implements Publisher, Subscriber { NetworkTablesJNI.unpublish(m_handle); } - /** - * Deletes the entry. - * - * @deprecated Use unpublish() instead. - */ - @Deprecated(since = "2022", forRemoval = true) - public void delete() { - unpublish(); - } - @Override public boolean equals(Object other) { if (other == this) { diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/NetworkTableEntry.java b/ntcore/src/generated/main/java/edu/wpi/first/networktables/NetworkTableEntry.java index bec010bf23..e9ba91699b 100644 --- a/ntcore/src/generated/main/java/edu/wpi/first/networktables/NetworkTableEntry.java +++ b/ntcore/src/generated/main/java/edu/wpi/first/networktables/NetworkTableEntry.java @@ -981,16 +981,6 @@ public final class NetworkTableEntry implements Publisher, Subscriber { NetworkTablesJNI.unpublish(m_handle); } - /** - * Deletes the entry. - * - * @deprecated Use unpublish() instead. - */ - @Deprecated(since = "2022", forRemoval = true) - public void delete() { - unpublish(); - } - @Override public boolean equals(Object other) { if (other == this) { diff --git a/ntcore/src/main/native/include/networktables/NetworkTableEntry.h b/ntcore/src/main/native/include/networktables/NetworkTableEntry.h index 31fe9a68bd..74825c4958 100644 --- a/ntcore/src/main/native/include/networktables/NetworkTableEntry.h +++ b/ntcore/src/main/native/include/networktables/NetworkTableEntry.h @@ -500,13 +500,6 @@ class NetworkTableEntry final { */ void Unpublish(); - /** - * Deletes the entry. - * @deprecated Use Unpublish() instead. - */ - [[deprecated("Use Unpublish() instead")]] - void Delete(); - /** * Gets the entry's topic. * diff --git a/ntcore/src/main/native/include/networktables/NetworkTableEntry.inc b/ntcore/src/main/native/include/networktables/NetworkTableEntry.inc index 0b4f628f4a..c025156d71 100644 --- a/ntcore/src/main/native/include/networktables/NetworkTableEntry.inc +++ b/ntcore/src/main/native/include/networktables/NetworkTableEntry.inc @@ -240,8 +240,4 @@ inline void NetworkTableEntry::Unpublish() { return nt::Unpublish(m_handle); } -inline void NetworkTableEntry::Delete() { - Unpublish(); -} - } // namespace nt