From 99bc6f92d1e4a8577784cc97e204f7642772b3fb Mon Sep 17 00:00:00 2001 From: wilix-lead Date: Sun, 15 Jul 2018 00:41:38 +0300 Subject: [PATCH] Rename io.h to menuIo.h (io.cpp -> menuIo.cpp) for perevent confusing with arduino-stm32 (and other possible platforms) --- src/items.h | 2 +- src/menu.h | 2 +- src/{io.cpp => menuIo.cpp} | 0 src/{io.h => menuIo.h} | 0 src/nav.h | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename src/{io.cpp => menuIo.cpp} (100%) rename src/{io.h => menuIo.h} (100%) diff --git a/src/items.h b/src/items.h index c3407f3d..2658faea 100644 --- a/src/items.h +++ b/src/items.h @@ -449,7 +449,7 @@ //////////////////////////////////////////////////////////////////////// // template implementation - #include "io.h" + #include "menuIo.h" #include "nav.h" namespace Menu { diff --git a/src/menu.h b/src/menu.h index 30008ee4..9e2570ac 100644 --- a/src/menu.h +++ b/src/menu.h @@ -59,7 +59,7 @@ warranty, express or implied, as to its usefulness for any purpose. } #include "items.h" - #include "io.h" + #include "menuIo.h" #include "nav.h" #endif diff --git a/src/io.cpp b/src/menuIo.cpp similarity index 100% rename from src/io.cpp rename to src/menuIo.cpp diff --git a/src/io.h b/src/menuIo.h similarity index 100% rename from src/io.h rename to src/menuIo.h diff --git a/src/nav.h b/src/nav.h index 48e67b37..37b65faf 100644 --- a/src/nav.h +++ b/src/nav.h @@ -2,7 +2,7 @@ #ifndef RSITE_ARDUINO_MENU_SYSTEM_NAV #define RSITE_ARDUINO_MENU_SYSTEM_NAV #include "menuBase.h" - #include "io.h" + #include "menuIo.h" namespace Menu { //navigation panels (min 1) describe output dimensions (in characters)