From d9ad1f9d3d241413263ebee7bbbae89886fd7efe Mon Sep 17 00:00:00 2001
From: Luc <luc.lebosse@gmail.com>
Date: Wed, 30 Nov 2016 10:57:21 +0100
Subject: [PATCH] Change LinkedList to GenLinkedList to avoid conflict

like with AsyncWebServer library
---
 esp3d/{LinkedList.h => GenLinkedList.h} | 48 ++++++++++++-------------
 esp3d/storestrings.h                    |  4 +--
 esp3d/webinterface.cpp                  |  4 +--
 3 files changed, 28 insertions(+), 28 deletions(-)
 rename esp3d/{LinkedList.h => GenLinkedList.h} (85%)

diff --git a/esp3d/LinkedList.h b/esp3d/GenLinkedList.h
similarity index 85%
rename from esp3d/LinkedList.h
rename to esp3d/GenLinkedList.h
index 85b2b097..f2051cec 100644
--- a/esp3d/LinkedList.h
+++ b/esp3d/GenLinkedList.h
@@ -1,5 +1,5 @@
 /*
-	LinkedList.h - V1.1 - Generic LinkedList implementation
+	GenLinkedList.h - V1.1 - Generic LinkedList implementation
 	Works better with FIFO, because LIFO will need to
 	search the entire List to find the last one;
 
@@ -11,8 +11,8 @@
 */
 
 
-#ifndef LinkedList_h
-#define LinkedList_h
+#ifndef GenLinkedList_h
+#define GenLinkedList_h
 
 template<class T>
 struct ListNode {
@@ -21,7 +21,7 @@ struct ListNode {
 };
 
 template <typename T>
-class LinkedList
+class GenLinkedList
 {
 
 protected:
@@ -39,26 +39,26 @@ protected:
     ListNode<T>* getNode(int index);
 
 public:
-    LinkedList();
-    ~LinkedList();
+    GenLinkedList();
+    ~GenLinkedList();
 
     /*
-    	Returns current size of LinkedList
+    	Returns current size of GenLinkedList
     */
     virtual int size();
     /*
     	Adds a T object in the specified index;
-    	Unlink and link the LinkedList correcly;
+    	Unlink and link the GenLinkedList correcly;
     	Increment _size
     */
     virtual bool add(int index, T);
     /*
-    	Adds a T object in the end of the LinkedList;
+    	Adds a T object in the end of the GenLinkedList;
     	Increment _size;
     */
     virtual bool add(T);
     /*
-    	Adds a T object in the start of the LinkedList;
+    	Adds a T object in the start of the GenLinkedList;
     	Increment _size;
     */
     virtual bool unshift(T);
@@ -95,9 +95,9 @@ public:
 
 };
 
-// Initialize LinkedList with false values
+// Initialize GenLinkedList with false values
 template<typename T>
-LinkedList<T>::LinkedList()
+GenLinkedList<T>::GenLinkedList()
 {
     root=NULL;
     last=NULL;
@@ -110,7 +110,7 @@ LinkedList<T>::LinkedList()
 
 // Clear Nodes and free Memory
 template<typename T>
-LinkedList<T>::~LinkedList()
+GenLinkedList<T>::~GenLinkedList()
 {
     ListNode<T>* tmp;
     while(root!=NULL) {
@@ -128,7 +128,7 @@ LinkedList<T>::~LinkedList()
 */
 
 template<typename T>
-ListNode<T>* LinkedList<T>::getNode(int index)
+ListNode<T>* GenLinkedList<T>::getNode(int index)
 {
 
     int _pos = 0;
@@ -160,13 +160,13 @@ ListNode<T>* LinkedList<T>::getNode(int index)
 }
 
 template<typename T>
-int LinkedList<T>::size()
+int GenLinkedList<T>::size()
 {
     return _size;
 }
 
 template<typename T>
-bool LinkedList<T>::add(int index, T _t)
+bool GenLinkedList<T>::add(int index, T _t)
 {
 
     if(index >= _size) {
@@ -190,7 +190,7 @@ bool LinkedList<T>::add(int index, T _t)
 }
 
 template<typename T>
-bool LinkedList<T>::add(T _t)
+bool GenLinkedList<T>::add(T _t)
 {
 
     ListNode<T> *tmp = new ListNode<T>();
@@ -214,7 +214,7 @@ bool LinkedList<T>::add(T _t)
 }
 
 template<typename T>
-bool LinkedList<T>::unshift(T _t)
+bool GenLinkedList<T>::unshift(T _t)
 {
 
     if(_size == 0) {
@@ -233,7 +233,7 @@ bool LinkedList<T>::unshift(T _t)
 }
 
 template<typename T>
-bool LinkedList<T>::set(int index, T _t)
+bool GenLinkedList<T>::set(int index, T _t)
 {
     // Check if index position is in bounds
     if(index < 0 || index >= _size) {
@@ -245,7 +245,7 @@ bool LinkedList<T>::set(int index, T _t)
 }
 
 template<typename T>
-T LinkedList<T>::pop()
+T GenLinkedList<T>::pop()
 {
     if(_size <= 0) {
         return T();
@@ -273,7 +273,7 @@ T LinkedList<T>::pop()
 }
 
 template<typename T>
-T LinkedList<T>::shift()
+T GenLinkedList<T>::shift()
 {
     if(_size <= 0) {
         return T();
@@ -296,7 +296,7 @@ T LinkedList<T>::shift()
 }
 
 template<typename T>
-T LinkedList<T>::remove(int index)
+T GenLinkedList<T>::remove(int index)
 {
     if (index < 0 || index >= _size) {
         return T();
@@ -322,7 +322,7 @@ T LinkedList<T>::remove(int index)
 
 
 template<typename T>
-T LinkedList<T>::get(int index)
+T GenLinkedList<T>::get(int index)
 {
     ListNode<T> *tmp = getNode(index);
 
@@ -330,7 +330,7 @@ T LinkedList<T>::get(int index)
 }
 
 template<typename T>
-void LinkedList<T>::clear()
+void GenLinkedList<T>::clear()
 {
     while(size() > 0) {
         shift();
diff --git a/esp3d/storestrings.h b/esp3d/storestrings.h
index 6589f50b..a9012c07 100644
--- a/esp3d/storestrings.h
+++ b/esp3d/storestrings.h
@@ -21,7 +21,7 @@
 #ifndef STORESTRINGS_h
 #define STORESTRINGS_h
 #include <ESP8266WiFi.h>
-#include "LinkedList.h"
+#include "GenLinkedList.h"
 class STORESTRINGS_CLASS
 {
 public:
@@ -55,7 +55,7 @@ public:
 private:
     int _maxsize;
     int _maxstringlength;
-    LinkedList<char *> _charlist;
+    GenLinkedList<char *> _charlist;
 };
 
 #endif
diff --git a/esp3d/webinterface.cpp b/esp3d/webinterface.cpp
index 464f1ed4..8f53b4e3 100644
--- a/esp3d/webinterface.cpp
+++ b/esp3d/webinterface.cpp
@@ -27,7 +27,7 @@
 #include <WiFiUdp.h>
 #include <ESP8266WiFi.h>
 #include <ESP8266WebServer.h>
-#include "LinkedList.h"
+#include "GenLinkedList.h"
 #include "storestrings.h"
 #include "command.h"
 #include "bridge.h"
@@ -220,7 +220,7 @@ bool WEBINTERFACE_CLASS::processTemplate(const char  * filename, STORESTRINGS_CL
         return false;
     }
 
-    LinkedList<FSFILE> myFileList  = LinkedList<FSFILE>();
+    GenLinkedList<FSFILE> myFileList  = GenLinkedList<FSFILE>();
     String  buffer2send;
     bool header_sent=false;