From e43f12c85e2602090f5724487a07b872d9c9e940 Mon Sep 17 00:00:00 2001
From: NicoHood <NicoHood@users.noreply.github.com>
Date: Mon, 12 Oct 2015 17:12:09 +0200
Subject: [PATCH] Rename two class https://github.com/arduino/Arduino/pull/3960

---
 src/MultiReport/AbsoluteMouse.cpp       | 2 +-
 src/MultiReport/Consumer.cpp            | 2 +-
 src/MultiReport/Gamepad.cpp             | 2 +-
 src/MultiReport/ImprovedKeyboard.cpp    | 2 +-
 src/MultiReport/ImprovedMouse.cpp       | 2 +-
 src/MultiReport/NKROKeyboard.cpp        | 2 +-
 src/MultiReport/System.cpp              | 2 +-
 src/SingleReport/BootKeyboard.cpp       | 2 +-
 src/SingleReport/BootKeyboard.h         | 2 +-
 src/SingleReport/BootMouse.cpp          | 2 +-
 src/SingleReport/BootMouse.h            | 2 +-
 src/SingleReport/RawHID.cpp             | 2 +-
 src/SingleReport/RawHID.h               | 2 +-
 src/SingleReport/SingleGamepad.cpp      | 2 +-
 src/SingleReport/SingleGamepad.h        | 2 +-
 src/SingleReport/SingleNKROKeyboard.cpp | 2 +-
 src/SingleReport/SingleNKROKeyboard.h   | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/MultiReport/AbsoluteMouse.cpp b/src/MultiReport/AbsoluteMouse.cpp
index c4e16c5..b8179bc 100644
--- a/src/MultiReport/AbsoluteMouse.cpp
+++ b/src/MultiReport/AbsoluteMouse.cpp
@@ -65,7 +65,7 @@ static const uint8_t _hidMultiReportDescriptorAbsoluteMouse[] PROGMEM = {
 
 AbsoluteMouse_::AbsoluteMouse_(void) 
 {
-	static HIDDescriptorListNode node(_hidMultiReportDescriptorAbsoluteMouse, sizeof(_hidMultiReportDescriptorAbsoluteMouse));
+	static HIDSubDescriptor node(_hidMultiReportDescriptorAbsoluteMouse, sizeof(_hidMultiReportDescriptorAbsoluteMouse));
 	HID().AppendDescriptor(&node);
 }
 
diff --git a/src/MultiReport/Consumer.cpp b/src/MultiReport/Consumer.cpp
index 7e8a116..0fa6841 100644
--- a/src/MultiReport/Consumer.cpp
+++ b/src/MultiReport/Consumer.cpp
@@ -43,7 +43,7 @@ static const uint8_t _hidMultiReportDescriptorConsumer[] PROGMEM = {
 
 Consumer_::Consumer_(void) 
 {
-	static HIDDescriptorListNode node(_hidMultiReportDescriptorConsumer, sizeof(_hidMultiReportDescriptorConsumer));
+	static HIDSubDescriptor node(_hidMultiReportDescriptorConsumer, sizeof(_hidMultiReportDescriptorConsumer));
 	HID().AppendDescriptor(&node);
 }
 
diff --git a/src/MultiReport/Gamepad.cpp b/src/MultiReport/Gamepad.cpp
index 5539e5b..86b95e6 100644
--- a/src/MultiReport/Gamepad.cpp
+++ b/src/MultiReport/Gamepad.cpp
@@ -74,7 +74,7 @@ static const uint8_t _hidMultiReportDescriptorGamepad[] PROGMEM = {
 
 Gamepad_::Gamepad_(void) 
 {
-	static HIDDescriptorListNode node(_hidMultiReportDescriptorGamepad, sizeof(_hidMultiReportDescriptorGamepad));
+	static HIDSubDescriptor node(_hidMultiReportDescriptorGamepad, sizeof(_hidMultiReportDescriptorGamepad));
 	HID().AppendDescriptor(&node);
 }
 
diff --git a/src/MultiReport/ImprovedKeyboard.cpp b/src/MultiReport/ImprovedKeyboard.cpp
index 1e9c060..a4d5fc3 100644
--- a/src/MultiReport/ImprovedKeyboard.cpp
+++ b/src/MultiReport/ImprovedKeyboard.cpp
@@ -61,7 +61,7 @@ static const uint8_t _hidMultiReportDescriptorKeyboard[] PROGMEM = {
 
 Keyboard_::Keyboard_(void) 
 {
-	static HIDDescriptorListNode node(_hidMultiReportDescriptorKeyboard, sizeof(_hidMultiReportDescriptorKeyboard));
+	static HIDSubDescriptor node(_hidMultiReportDescriptorKeyboard, sizeof(_hidMultiReportDescriptorKeyboard));
 	HID().AppendDescriptor(&node);
 }
 
diff --git a/src/MultiReport/ImprovedMouse.cpp b/src/MultiReport/ImprovedMouse.cpp
index c3b8e5a..9e4ffeb 100644
--- a/src/MultiReport/ImprovedMouse.cpp
+++ b/src/MultiReport/ImprovedMouse.cpp
@@ -59,7 +59,7 @@ static const uint8_t _hidMultiReportDescriptorMouse[] PROGMEM = {
 
 Mouse_::Mouse_(void) 
 {
-	static HIDDescriptorListNode node(_hidMultiReportDescriptorMouse, sizeof(_hidMultiReportDescriptorMouse));
+	static HIDSubDescriptor node(_hidMultiReportDescriptorMouse, sizeof(_hidMultiReportDescriptorMouse));
 	HID().AppendDescriptor(&node);
 }
 
diff --git a/src/MultiReport/NKROKeyboard.cpp b/src/MultiReport/NKROKeyboard.cpp
index f635c9b..5e341f9 100644
--- a/src/MultiReport/NKROKeyboard.cpp
+++ b/src/MultiReport/NKROKeyboard.cpp
@@ -66,7 +66,7 @@ static const uint8_t _hidMultiReportDescriptorNKROKeyboard[] PROGMEM = {
 
 NKROKeyboard_::NKROKeyboard_(void) 
 {
-	static HIDDescriptorListNode node(_hidMultiReportDescriptorNKROKeyboard, sizeof(_hidMultiReportDescriptorNKROKeyboard));
+	static HIDSubDescriptor node(_hidMultiReportDescriptorNKROKeyboard, sizeof(_hidMultiReportDescriptorNKROKeyboard));
 	HID().AppendDescriptor(&node);
 }
 
diff --git a/src/MultiReport/System.cpp b/src/MultiReport/System.cpp
index b3e9af5..6ba4ab4 100644
--- a/src/MultiReport/System.cpp
+++ b/src/MultiReport/System.cpp
@@ -44,7 +44,7 @@ static const uint8_t _hidMultiReportDescriptorSystem[] PROGMEM = {
 
 System_::System_(void) 
 {
-	static HIDDescriptorListNode node(_hidMultiReportDescriptorSystem, sizeof(_hidMultiReportDescriptorSystem));
+	static HIDSubDescriptor node(_hidMultiReportDescriptorSystem, sizeof(_hidMultiReportDescriptorSystem));
 	HID().AppendDescriptor(&node);
 }
 
diff --git a/src/SingleReport/BootKeyboard.cpp b/src/SingleReport/BootKeyboard.cpp
index 393d730..05dd7a2 100644
--- a/src/SingleReport/BootKeyboard.cpp
+++ b/src/SingleReport/BootKeyboard.cpp
@@ -70,7 +70,7 @@ static const uint8_t _hidReportDescriptorKeyboard[] PROGMEM = {
     0xc0                            /* END_COLLECTION */
 };
 
-BootKeyboard_::BootKeyboard_(void) : PUSBListNode(1, 1, epType), protocol(1), idle(1), leds(0)
+BootKeyboard_::BootKeyboard_(void) : PluggableUSBModule(1, 1, epType), protocol(1), idle(1), leds(0)
 {
 	epType[0] = EP_TYPE_INTERRUPT_IN;
 	PluggableUSB().plug(this);
diff --git a/src/SingleReport/BootKeyboard.h b/src/SingleReport/BootKeyboard.h
index f360d93..b7066f9 100644
--- a/src/SingleReport/BootKeyboard.h
+++ b/src/SingleReport/BootKeyboard.h
@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "../HID-APIs/KeyboardAPI.h"
 
 
-class BootKeyboard_ : public PUSBListNode, public KeyboardAPI
+class BootKeyboard_ : public PluggableUSBModule, public KeyboardAPI
 {
 public:
     BootKeyboard_(void);
diff --git a/src/SingleReport/BootMouse.cpp b/src/SingleReport/BootMouse.cpp
index 980b505..470c5cd 100644
--- a/src/SingleReport/BootMouse.cpp
+++ b/src/SingleReport/BootMouse.cpp
@@ -54,7 +54,7 @@ static const uint8_t _hidReportDescriptorMouse[] PROGMEM = {
     0xc0                            /* END_COLLECTION */
 };
 
-BootMouse_::BootMouse_(void) : PUSBListNode(1, 1, epType), protocol(1), idle(1)
+BootMouse_::BootMouse_(void) : PluggableUSBModule(1, 1, epType), protocol(1), idle(1)
 {
 	epType[0] = EP_TYPE_INTERRUPT_IN;
 	PluggableUSB().plug(this);
diff --git a/src/SingleReport/BootMouse.h b/src/SingleReport/BootMouse.h
index 00462b0..833f22d 100644
--- a/src/SingleReport/BootMouse.h
+++ b/src/SingleReport/BootMouse.h
@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "../HID-APIs/MouseAPI.h"
 
 
-class BootMouse_ : public PUSBListNode, public MouseAPI
+class BootMouse_ : public PluggableUSBModule, public MouseAPI
 {
 public:
     BootMouse_(void);
diff --git a/src/SingleReport/RawHID.cpp b/src/SingleReport/RawHID.cpp
index 7a4c9dd..8be96f9 100644
--- a/src/SingleReport/RawHID.cpp
+++ b/src/SingleReport/RawHID.cpp
@@ -47,7 +47,7 @@ static const uint8_t  _hidReportDescriptorRawHID[] PROGMEM = {
     0xC0                         /* end collection */ 
 };
 
-RawHID_::RawHID_(void) : PUSBListNode(1, 1, epType), protocol(1), idle(1), dataLength(0)
+RawHID_::RawHID_(void) : PluggableUSBModule(1, 1, epType), protocol(1), idle(1), dataLength(0)
 {
 	epType[0] = EP_TYPE_INTERRUPT_IN;
 	PluggableUSB().plug(this);
diff --git a/src/SingleReport/RawHID.h b/src/SingleReport/RawHID.h
index 399039f..15d8cb6 100644
--- a/src/SingleReport/RawHID.h
+++ b/src/SingleReport/RawHID.h
@@ -66,7 +66,7 @@ typedef union{
 	uint8_t buff[RAWHID_RX_SIZE];
 } HID_RawKeyboardRXReport_Data_t;
 
-class RawHID_ : public PUSBListNode, public Stream
+class RawHID_ : public PluggableUSBModule, public Stream
 {
 public:
 	RawHID_(void);
diff --git a/src/SingleReport/SingleGamepad.cpp b/src/SingleReport/SingleGamepad.cpp
index 136a5aa..0791f42 100644
--- a/src/SingleReport/SingleGamepad.cpp
+++ b/src/SingleReport/SingleGamepad.cpp
@@ -70,7 +70,7 @@ static const uint8_t _hidReportDescriptorGamepad[] PROGMEM = {
 	0xc0								/* END_COLLECTION */
 };
 
-SingleGamepad_::SingleGamepad_(void) : PUSBListNode(1, 1, epType), protocol(1), idle(1)
+SingleGamepad_::SingleGamepad_(void) : PluggableUSBModule(1, 1, epType), protocol(1), idle(1)
 {
 	epType[0] = EP_TYPE_INTERRUPT_IN;
 	PluggableUSB().plug(this);
diff --git a/src/SingleReport/SingleGamepad.h b/src/SingleReport/SingleGamepad.h
index 89d0e37..bca1db5 100644
--- a/src/SingleReport/SingleGamepad.h
+++ b/src/SingleReport/SingleGamepad.h
@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "../HID-APIs/GamepadAPI.h"
 
 
-class SingleGamepad_ : public PUSBListNode, public GamepadAPI
+class SingleGamepad_ : public PluggableUSBModule, public GamepadAPI
 {
 public:
     SingleGamepad_(void);
diff --git a/src/SingleReport/SingleNKROKeyboard.cpp b/src/SingleReport/SingleNKROKeyboard.cpp
index 381ecea..f88118c 100644
--- a/src/SingleReport/SingleNKROKeyboard.cpp
+++ b/src/SingleReport/SingleNKROKeyboard.cpp
@@ -75,7 +75,7 @@ static const uint8_t _hidReportDescriptorNKRO[] PROGMEM = {
 	0xC0						     /*   End Collection */
 };
 
-SingleNKROKeyboard_::SingleNKROKeyboard_(void) : PUSBListNode(1, 1, epType), protocol(1), idle(1), leds(0)
+SingleNKROKeyboard_::SingleNKROKeyboard_(void) : PluggableUSBModule(1, 1, epType), protocol(1), idle(1), leds(0)
 {
 	epType[0] = EP_TYPE_INTERRUPT_IN;
 	PluggableUSB().plug(this);
diff --git a/src/SingleReport/SingleNKROKeyboard.h b/src/SingleReport/SingleNKROKeyboard.h
index 299ed16..131eaa3 100644
--- a/src/SingleReport/SingleNKROKeyboard.h
+++ b/src/SingleReport/SingleNKROKeyboard.h
@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "../HID-APIs/NKROKeyboardAPI.h"
 
 
-class SingleNKROKeyboard_ : public PUSBListNode, public NKROKeyboardAPI
+class SingleNKROKeyboard_ : public PluggableUSBModule, public NKROKeyboardAPI
 {
 public:
     SingleNKROKeyboard_(void);