Rename CONFIG_NXCONSOLE* to CONFIG_NXTERM*

8 files changed, 14 insertions, 14 deletions

diff --git a/NxWidgets/libnxwidgets/include/cbgwindow.hxx b/NxWidgets/libnxwidgets/include/cbgwindow.hxx
index 0b73a01de..57c0a1675 100644
--- a/NxWidgets/libnxwidgets/include/cbgwindow.hxx
+++ b/NxWidgets/libnxwidgets/include/cbgwindow.hxx
@@ -220,7 +220,7 @@ namespace NXWidgets
      *    directed to the widgets within the window.
      */
 
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
     inline void redirectNxConsole(NXCONSOLE handle)
     {
       setNxConsole(handle);
diff --git a/NxWidgets/libnxwidgets/include/ccallback.hxx b/NxWidgets/libnxwidgets/include/ccallback.hxx
index 8127dc20d..8d96f0022 100644
--- a/NxWidgets/libnxwidgets/include/ccallback.hxx
+++ b/NxWidgets/libnxwidgets/include/ccallback.hxx
@@ -49,7 +49,7 @@
 #include <nuttx/nx/nxglib.h>
 #include <nuttx/nx/nx.h>
 
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
 #  include <nuttx/nx/nxconsole.h>
 #endif
 
@@ -93,7 +93,7 @@ namespace NXWidgets
   private:
     CWidgetControl      *m_widgetControl; /**< The widget control instance for this window */
     struct nx_callback_s m_callbacks;     /**< C-callable vtable of callback function pointers */
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
     NXCONSOLE            m_nxconsole;      /**< The NxConsole handle for redirection of keyboard input */
 #endif
 
@@ -257,7 +257,7 @@ namespace NXWidgets
      *    directed to the widgets within the window.
      */
 
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
     inline void setNxConsole(NXCONSOLE handle)
     {
       m_nxconsole = handle;
diff --git a/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx b/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx
index ea18595de..5bf2a1a03 100644
--- a/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx
+++ b/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx
@@ -241,7 +241,7 @@ namespace NXWidgets
      *    directed to the widgets within the window.
      */
 
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
     inline void redirectNxConsole(NXCONSOLE handle)
     {
       setNxConsole(handle);
diff --git a/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx b/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx
index 501067f0d..7a8a783b2 100644
--- a/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx
+++ b/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx
@@ -210,7 +210,7 @@ namespace NXWidgets
      *    directed to the widgets within the window.
      */
 
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
     inline void redirectNxConsole(NXCONSOLE handle)
     {
       setNxConsole(handle);
diff --git a/NxWidgets/libnxwidgets/include/cnxwindow.hxx b/NxWidgets/libnxwidgets/include/cnxwindow.hxx
index 780276a5f..525a0c851 100644
--- a/NxWidgets/libnxwidgets/include/cnxwindow.hxx
+++ b/NxWidgets/libnxwidgets/include/cnxwindow.hxx
@@ -214,7 +214,7 @@ namespace NXWidgets
      *    directed to the widgets within the window.
      */
 
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
     inline void redirectNxConsole(NXCONSOLE handle)
     {
       setNxConsole(handle);
diff --git a/NxWidgets/libnxwidgets/include/inxwindow.hxx b/NxWidgets/libnxwidgets/include/inxwindow.hxx
index 826d1784e..4aa2c519b 100644
--- a/NxWidgets/libnxwidgets/include/inxwindow.hxx
+++ b/NxWidgets/libnxwidgets/include/inxwindow.hxx
@@ -47,7 +47,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
 #  include <nuttx/nx/nxconsole.h>
 #endif
 
@@ -186,7 +186,7 @@ namespace NXWidgets
      *    directed to the widgets within the window.
      */
 
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
     virtual void redirectNxConsole(NXCONSOLE handle) = 0;
 #endif
 
diff --git a/NxWidgets/libnxwidgets/include/nxconfig.hxx b/NxWidgets/libnxwidgets/include/nxconfig.hxx
index 9face1e70..f6c9ead90 100644
--- a/NxWidgets/libnxwidgets/include/nxconfig.hxx
+++ b/NxWidgets/libnxwidgets/include/nxconfig.hxx
@@ -188,8 +188,8 @@
  * reducing the AND of these three conditions to a single condition.
  */
 
-#if !defined(CONFIG_NX_KBD) || !defined(CONFIG_NXCONSOLE)
-#  undef CONFIG_NXCONSOLE_NXKBDIN
+#if !defined(CONFIG_NX_KBD) || !defined(CONFIG_NXTERM)
+#  undef CONFIG_NXTERM_NXKBDIN
 #endif
 
 /* NX Server/Device Configuration *******************************************/
diff --git a/NxWidgets/libnxwidgets/src/ccallback.cxx b/NxWidgets/libnxwidgets/src/ccallback.cxx
index 4550d24b0..cec7ea1bf 100644
--- a/NxWidgets/libnxwidgets/src/ccallback.cxx
+++ b/NxWidgets/libnxwidgets/src/ccallback.cxx
@@ -44,7 +44,7 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
 #  include <nuttx/nx/nxconsole.h>
 #endif
 
@@ -87,7 +87,7 @@ CCallback::CCallback(CWidgetControl *widgetControl)
 
   // Keyboard input is initially direct to the widgets within the window
 
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
   m_nxconsole          = (NXCONSOLE)0;
 #endif
 }
@@ -209,7 +209,7 @@ void CCallback::newKeyboardEvent(NXHANDLE hwnd, uint8_t nCh,
   // (default) OR is NX keyboard input being re-directed to an NxConsole
   // driver?
 
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
   if (This->m_nxconsole)
     {
       // Keyboard input is going to an NxConsole