summaryrefslogtreecommitdiff
path: root/NxWidgets/nxwm/src
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-04-13 16:26:44 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-04-13 16:26:44 -0600
commit638c1a6dc07b438efa220c5345e94c3a963505ca (patch)
tree85feed8dbf4f2dd7a2eec83ed88606f14a2f02a2 /NxWidgets/nxwm/src
parent43ec94a665e13552402ff4f102e0f65f6792cf29 (diff)
downloadnuttx-638c1a6dc07b438efa220c5345e94c3a963505ca.tar.gz
nuttx-638c1a6dc07b438efa220c5345e94c3a963505ca.tar.bz2
nuttx-638c1a6dc07b438efa220c5345e94c3a963505ca.zip
More trailing whilespace removal
Diffstat (limited to 'NxWidgets/nxwm/src')
-rw-r--r--NxWidgets/nxwm/src/chexcalculator.cxx12
-rw-r--r--NxWidgets/nxwm/src/cnxconsole.cxx4
-rw-r--r--NxWidgets/nxwm/src/ctouchscreen.cxx8
-rw-r--r--NxWidgets/nxwm/src/glyph_calculator.cxx4
-rw-r--r--NxWidgets/nxwm/src/glyph_calibration.cxx4
-rw-r--r--NxWidgets/nxwm/src/glyph_cmd.cxx4
-rw-r--r--NxWidgets/nxwm/src/glyph_minimize.cxx4
-rw-r--r--NxWidgets/nxwm/src/glyph_mplayer_controls.cxx174
-rw-r--r--NxWidgets/nxwm/src/glyph_nsh.cxx4
-rw-r--r--NxWidgets/nxwm/src/glyph_play24x24.cxx4
-rw-r--r--NxWidgets/nxwm/src/glyph_start.cxx4
-rw-r--r--NxWidgets/nxwm/src/glyph_stop.cxx4
12 files changed, 115 insertions, 115 deletions
diff --git a/NxWidgets/nxwm/src/chexcalculator.cxx b/NxWidgets/nxwm/src/chexcalculator.cxx
index eeb0b1d1d..dc42de0c0 100644
--- a/NxWidgets/nxwm/src/chexcalculator.cxx
+++ b/NxWidgets/nxwm/src/chexcalculator.cxx
@@ -92,9 +92,9 @@ namespace NxWM
KEY_PLUS, // Additions
// Special operations
-
+
KEY_EQUAL, // Equal/Enter key
-
+
KEY_DECIMAL, // Decimal mode
KEY_HEXADECIMAL, // Hexadecimal mode
@@ -247,7 +247,7 @@ CHexCalculator::CHexCalculator(CTaskbar *taskbar, CApplicationWindow *window)
CHexCalculator::~CHexCalculator(void)
{
- // Destroy widgets
+ // Destroy widgets
if (m_text)
{
@@ -598,7 +598,7 @@ void CHexCalculator::labelKeypad(void)
{
label = "";
}
-
+
// Set the text in the label
m_keypad->setText(i, j, label);
@@ -848,7 +848,7 @@ void CHexCalculator::handleActionEvent(const NXWidgets::CWidgetEventArgs &e)
break;
// Special operations
-
+
case KEY_EQUAL: // Equal/Enter key
{
// Is there a high precedence operation?
@@ -877,7 +877,7 @@ void CHexCalculator::handleActionEvent(const NXWidgets::CWidgetEventArgs &e)
result = true;
}
break;
-
+
case KEY_DECIMAL: // Decimal mode
{
if (m_hexMode)
diff --git a/NxWidgets/nxwm/src/cnxconsole.cxx b/NxWidgets/nxwm/src/cnxconsole.cxx
index 3a506cb4b..e78e91631 100644
--- a/NxWidgets/nxwm/src/cnxconsole.cxx
+++ b/NxWidgets/nxwm/src/cnxconsole.cxx
@@ -311,7 +311,7 @@ void CNxConsole::stop(void)
// Calling task_delete() will also invoke the on_exit() handler. We se
// m_pid = -1 before calling task_delete() to let the on_exit() handler,
// CNxConsole::exitHandler(), know that it should not do anything
-
+
pid_t pid = m_pid;
m_pid = -1;
@@ -319,7 +319,7 @@ void CNxConsole::stop(void)
task_delete(pid);
}
-
+
// Destroy the NX console device
if (m_nxcon)
diff --git a/NxWidgets/nxwm/src/ctouchscreen.cxx b/NxWidgets/nxwm/src/ctouchscreen.cxx
index 8bf570f74..f05f29ebd 100644
--- a/NxWidgets/nxwm/src/ctouchscreen.cxx
+++ b/NxWidgets/nxwm/src/ctouchscreen.cxx
@@ -108,7 +108,7 @@ CTouchscreen::CTouchscreen(NXWidgets::CNxServer *server, struct nxgl_size_s *win
// Use the default touch data buffer
m_touch = &m_sample;
-
+
// Initialize the m_waitSem semaphore so that any waits for data will block
sem_init(&m_waitSem, 0, 0);
@@ -138,7 +138,7 @@ CTouchscreen::~CTouchscreen(void)
}
// Destroy the semaphores that we created.
-
+
sem_destroy(&m_waitSem);
}
@@ -209,10 +209,10 @@ void CTouchscreen::setCalibrationData(const struct SCalibrationData &caldata)
// Save a copy of the calibration data
m_calibData = caldata;
-
+
// Note that we have calibration data. Data will now be scaled and forwarded
// to NX (unless we are still in cpature mode)
-
+
m_calibrated = true;
// Wake up the listener thread so that it will use our buffer
diff --git a/NxWidgets/nxwm/src/glyph_calculator.cxx b/NxWidgets/nxwm/src/glyph_calculator.cxx
index 9bb3f690d..e8f5376d3 100644
--- a/NxWidgets/nxwm/src/glyph_calculator.cxx
+++ b/NxWidgets/nxwm/src/glyph_calculator.cxx
@@ -36,7 +36,7 @@
/********************************************************************************************
* Included Files
********************************************************************************************/
-
+
#include <nuttx/config.h>
#include <sys/types.h>
@@ -181,7 +181,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_calculatorBitmap =
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
CONFIG_NXWIDGETS_FMT, // fmt - Color format
BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT)
- BITMAP_NCOLUMNS, // width - Width in pixels
+ BITMAP_NCOLUMNS, // width - Width in pixels
BITMAP_NROWS, // height - Height in rows
{ // lut - Pointer to the beginning of the Look-Up Table (LUT)
g_calculatorNormalLut, // Index 0: Unselected LUT
diff --git a/NxWidgets/nxwm/src/glyph_calibration.cxx b/NxWidgets/nxwm/src/glyph_calibration.cxx
index df169f556..3a9a30806 100644
--- a/NxWidgets/nxwm/src/glyph_calibration.cxx
+++ b/NxWidgets/nxwm/src/glyph_calibration.cxx
@@ -36,7 +36,7 @@
/********************************************************************************************
* Included Files
********************************************************************************************/
-
+
#include <nuttx/config.h>
#include <sys/types.h>
@@ -188,7 +188,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_calibrationBitmap =
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
CONFIG_NXWIDGETS_FMT, // fmt - Color format
BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT)
- BITMAP_NCOLUMNS, // width - Width in pixels
+ BITMAP_NCOLUMNS, // width - Width in pixels
BITMAP_NROWS, // height - Height in rows
{ // lut - Pointer to the beginning of the Look-Up Table (LUT)
g_calibrationNormalLut, // Index 0: Unselected LUT
diff --git a/NxWidgets/nxwm/src/glyph_cmd.cxx b/NxWidgets/nxwm/src/glyph_cmd.cxx
index 373d8ad5e..cc8b8dca3 100644
--- a/NxWidgets/nxwm/src/glyph_cmd.cxx
+++ b/NxWidgets/nxwm/src/glyph_cmd.cxx
@@ -36,7 +36,7 @@
/********************************************************************************************
* Included Files
********************************************************************************************/
-
+
#include <nuttx/config.h>
#include <sys/types.h>
@@ -171,7 +171,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_cmdBitmap =
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
CONFIG_NXWIDGETS_FMT, // fmt - Color format
BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT)
- BITMAP_NCOLUMNS, // width - Width in pixels
+ BITMAP_NCOLUMNS, // width - Width in pixels
BITMAP_NROWS, // height - Height in rows
{ // lut - Pointer to the beginning of the Look-Up Table (LUT)
g_cmdNormalLut, // Index 0: Unselected LUT
diff --git a/NxWidgets/nxwm/src/glyph_minimize.cxx b/NxWidgets/nxwm/src/glyph_minimize.cxx
index 31feb268f..bf228e0b2 100644
--- a/NxWidgets/nxwm/src/glyph_minimize.cxx
+++ b/NxWidgets/nxwm/src/glyph_minimize.cxx
@@ -36,7 +36,7 @@
/********************************************************************************************
* Included Files
********************************************************************************************/
-
+
#include <nuttx/config.h>
#include <sys/types.h>
@@ -169,7 +169,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_minimizeBitmap =
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
CONFIG_NXWIDGETS_FMT, // fmt - Color format
BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT)
- BITMAP_NCOLUMNS, // width - Width in pixels
+ BITMAP_NCOLUMNS, // width - Width in pixels
BITMAP_NROWS, // height - Height in rows
{ // lut - Pointer to the beginning of the Look-Up Table (LUT)
g_minimizeNormalLut, // Index 0: Unselected LUT
diff --git a/NxWidgets/nxwm/src/glyph_mplayer_controls.cxx b/NxWidgets/nxwm/src/glyph_mplayer_controls.cxx
index 011f892a2..38da35844 100644
--- a/NxWidgets/nxwm/src/glyph_mplayer_controls.cxx
+++ b/NxWidgets/nxwm/src/glyph_mplayer_controls.cxx
@@ -70,14 +70,14 @@ using namespace NxWM;
static const NXWidgets::nxwidget_pixel_t palette[BITMAP_PALETTESIZE] =
{
- CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, MKRGB( 11, 24,108), MKRGB( 63, 90,192), MKRGB(121,136,250),
- MKRGB(224,234,244), MKRGB( 69, 80,149), MKRGB(127,169,239), MKRGB(152,174,207),
+ CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, MKRGB( 11, 24,108), MKRGB( 63, 90,192), MKRGB(121,136,250),
+ MKRGB(224,234,244), MKRGB( 69, 80,149), MKRGB(127,169,239), MKRGB(152,174,207),
};
static const NXWidgets::nxwidget_pixel_t hilight_palette[BITMAP_PALETTESIZE] =
{
- CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, MKRGB( 61, 74,158), MKRGB(113,140,242), MKRGB(171,186,255),
- MKRGB(255,255,255), MKRGB(119,130,199), MKRGB(177,219,255), MKRGB(202,224,255),
+ CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, MKRGB( 61, 74,158), MKRGB(113,140,242), MKRGB(171,186,255),
+ MKRGB(255,255,255), MKRGB(119,130,199), MKRGB(177,219,255), MKRGB(202,224,255),
};
/* Bitmap definition for the "Play" button */
@@ -93,35 +93,35 @@ static const NXWidgets::SRlePaletteBitmapEntry play_bitmap[] =
{ 5, 0}, { 6, 3}, { 9, 6}, { 7, 3}, { 5, 0}, /* Row 6 */
{ 4, 0}, { 1, 2}, { 22, 3}, { 1, 2}, { 4, 0}, /* Row 7 */
{ 3, 0}, { 1, 5}, { 23, 3}, { 1, 2}, { 1, 5}, { 3, 0}, /* Row 8 */
- { 3, 0}, { 3, 2}, { 5, 3}, { 1, 6}, { 13, 3}, { 4, 2},
+ { 3, 0}, { 3, 2}, { 5, 3}, { 1, 6}, { 13, 3}, { 4, 2},
{ 3, 0}, /* Row 9 */
- { 2, 0}, { 1, 5}, { 6, 2}, { 2, 3}, { 2, 4}, { 1, 6},
+ { 2, 0}, { 1, 5}, { 6, 2}, { 2, 3}, { 2, 4}, { 1, 6},
{ 9, 3}, { 6, 2}, { 1, 5}, { 2, 0}, /* Row 10 */
- { 2, 0}, { 1, 5}, { 8, 2}, { 1, 7}, { 3, 4}, { 1, 6},
+ { 2, 0}, { 1, 5}, { 8, 2}, { 1, 7}, { 3, 4}, { 1, 6},
{ 2, 2}, { 1, 3}, { 10, 2}, { 1, 5}, { 2, 0}, /* Row 11 */
- { 1, 0}, { 4, 5}, { 6, 2}, { 1, 7}, { 4, 4}, { 1, 7},
+ { 1, 0}, { 4, 5}, { 6, 2}, { 1, 7}, { 4, 4}, { 1, 7},
{ 1, 3}, { 8, 2}, { 4, 5}, { 2, 0}, /* Row 12 */
- { 1, 0}, { 7, 5}, { 3, 2}, { 1, 7}, { 6, 4}, { 1, 7},
+ { 1, 0}, { 7, 5}, { 3, 2}, { 1, 7}, { 6, 4}, { 1, 7},
{ 3, 2}, { 8, 5}, { 2, 0}, /* Row 13 */
- { 1, 0}, { 9, 5}, { 1, 2}, { 1, 7}, { 8, 4}, { 1, 7},
+ { 1, 0}, { 9, 5}, { 1, 2}, { 1, 7}, { 8, 4}, { 1, 7},
{ 8, 5}, { 1, 1}, { 1, 5}, { 1, 0}, /* Row 14 */
- { 1, 0}, { 4, 1}, { 6, 5}, { 1, 7}, { 10, 4}, { 1, 7},
+ { 1, 0}, { 4, 1}, { 6, 5}, { 1, 7}, { 10, 4}, { 1, 7},
{ 3, 5}, { 4, 1}, { 1, 5}, { 1, 0}, /* Row 15 */
- { 1, 0}, { 8, 1}, { 2, 5}, { 1, 7}, { 10, 4}, { 1, 7},
+ { 1, 0}, { 8, 1}, { 2, 5}, { 1, 7}, { 10, 4}, { 1, 7},
{ 7, 1}, { 1, 5}, { 1, 0}, /* Row 16 */
- { 1, 0}, { 10, 1}, { 1, 7}, { 9, 4}, { 1, 5}, { 8, 1},
+ { 1, 0}, { 10, 1}, { 1, 7}, { 9, 4}, { 1, 5}, { 8, 1},
{ 1, 5}, { 1, 0}, /* Row 17 */
- { 1, 0}, { 10, 1}, { 1, 7}, { 7, 4}, { 1, 5}, { 10, 1},
+ { 1, 0}, { 10, 1}, { 1, 7}, { 7, 4}, { 1, 5}, { 10, 1},
{ 2, 0}, /* Row 18 */
- { 1, 0}, { 1, 5}, { 9, 1}, { 1, 7}, { 5, 4}, { 1, 7},
+ { 1, 0}, { 1, 5}, { 9, 1}, { 1, 7}, { 5, 4}, { 1, 7},
{ 12, 1}, { 2, 0}, /* Row 19 */
- { 2, 0}, { 9, 1}, { 1, 7}, { 4, 4}, { 1, 5}, { 13, 1},
+ { 2, 0}, { 9, 1}, { 1, 7}, { 4, 4}, { 1, 5}, { 13, 1},
{ 2, 0}, /* Row 20 */
- { 2, 0}, { 9, 1}, { 1, 7}, { 2, 4}, { 1, 7}, { 1, 2},
+ { 2, 0}, { 9, 1}, { 1, 7}, { 2, 4}, { 1, 7}, { 1, 2},
{ 13, 1}, { 1, 5}, { 2, 0}, /* Row 21 */
- { 2, 0}, { 1, 5}, { 8, 1}, { 1, 7}, { 1, 4}, { 1, 5},
+ { 2, 0}, { 1, 5}, { 8, 1}, { 1, 7}, { 1, 4}, { 1, 5},
{ 6, 2}, { 9, 1}, { 3, 0}, /* Row 22 */
- { 3, 0}, { 7, 1}, { 1, 2}, { 1, 5}, { 10, 2}, { 6, 1},
+ { 3, 0}, { 7, 1}, { 1, 2}, { 1, 5}, { 10, 2}, { 6, 1},
{ 1, 5}, { 3, 0}, /* Row 23 */
{ 4, 0}, { 4, 1}, { 16, 2}, { 4, 1}, { 4, 0}, /* Row 24 */
{ 4, 0}, { 1, 5}, { 2, 1}, { 18, 2}, { 2, 1}, { 5, 0}, /* Row 25 */
@@ -158,45 +158,45 @@ static const NXWidgets::SRlePaletteBitmapEntry pause_bitmap[] =
{ 4, 0}, { 1, 2}, { 22, 3}, { 1, 2}, { 4, 0}, /* Row 7 */
{ 3, 0}, { 1, 5}, { 23, 3}, { 1, 2}, { 1, 5}, { 3, 0}, /* Row 8 */
{ 3, 0}, { 3, 2}, { 19, 3}, { 4, 2}, { 3, 0}, /* Row 9 */
- { 2, 0}, { 1, 5}, { 5, 2}, { 2, 3}, { 1, 6}, { 3, 4},
- { 3, 3}, { 1, 7}, { 2, 4}, { 1, 7}, { 2, 3}, { 6, 2},
+ { 2, 0}, { 1, 5}, { 5, 2}, { 2, 3}, { 1, 6}, { 3, 4},
+ { 3, 3}, { 1, 7}, { 2, 4}, { 1, 7}, { 2, 3}, { 6, 2},
{ 1, 5}, { 2, 0}, /* Row 10 */
- { 2, 0}, { 1, 5}, { 7, 2}, { 1, 7}, { 3, 4}, { 1, 7},
- { 1, 2}, { 1, 3}, { 4, 4}, { 1, 3}, { 7, 2}, { 1, 5},
+ { 2, 0}, { 1, 5}, { 7, 2}, { 1, 7}, { 3, 4}, { 1, 7},
+ { 1, 2}, { 1, 3}, { 4, 4}, { 1, 3}, { 7, 2}, { 1, 5},
{ 2, 0}, /* Row 11 */
- { 1, 0}, { 4, 5}, { 5, 2}, { 1, 7}, { 3, 4}, { 1, 7},
- { 1, 2}, { 1, 3}, { 4, 4}, { 1, 6}, { 4, 2}, { 4, 5},
+ { 1, 0}, { 4, 5}, { 5, 2}, { 1, 7}, { 3, 4}, { 1, 7},
+ { 1, 2}, { 1, 3}, { 4, 4}, { 1, 6}, { 4, 2}, { 4, 5},
{ 2, 0}, /* Row 12 */
- { 1, 0}, { 8, 5}, { 1, 2}, { 1, 7}, { 3, 4}, { 1, 7},
- { 1, 2}, { 1, 5}, { 4, 4}, { 1, 5}, { 1, 2}, { 7, 5},
+ { 1, 0}, { 8, 5}, { 1, 2}, { 1, 7}, { 3, 4}, { 1, 7},
+ { 1, 2}, { 1, 5}, { 4, 4}, { 1, 5}, { 1, 2}, { 7, 5},
{ 2, 0}, /* Row 13 */
- { 1, 0}, { 9, 5}, { 1, 7}, { 3, 4}, { 1, 7}, { 1, 2},
+ { 1, 0}, { 9, 5}, { 1, 7}, { 3, 4}, { 1, 7}, { 1, 2},
{ 1, 5}, { 4, 4}, { 8, 5}, { 1, 1}, { 1, 5}, { 1, 0}, /* Row 14 */
- { 1, 0}, { 4, 1}, { 5, 5}, { 1, 7}, { 3, 4}, { 1, 7},
+ { 1, 0}, { 4, 1}, { 5, 5}, { 1, 7}, { 3, 4}, { 1, 7},
{ 2, 5}, { 4, 4}, { 5, 5}, { 4, 1}, { 1, 5}, { 1, 0}, /* Row 15 */
- { 1, 0}, { 9, 1}, { 1, 7}, { 3, 4}, { 1, 7}, { 2, 5},
+ { 1, 0}, { 9, 1}, { 1, 7}, { 3, 4}, { 1, 7}, { 2, 5},
{ 4, 4}, { 1, 5}, { 8, 1}, { 1, 5}, { 1, 0}, /* Row 16 */
- { 1, 0}, { 9, 1}, { 1, 7}, { 3, 4}, { 1, 7}, { 1, 1},
+ { 1, 0}, { 9, 1}, { 1, 7}, { 3, 4}, { 1, 7}, { 1, 1},
{ 1, 5}, { 4, 4}, { 1, 5}, { 8, 1}, { 1, 5}, { 1, 0}, /* Row 17 */
- { 1, 0}, { 9, 1}, { 1, 7}, { 3, 4}, { 1, 7}, { 1, 1},
+ { 1, 0}, { 9, 1}, { 1, 7}, { 3, 4}, { 1, 7}, { 1, 1},
{ 1, 5}, { 4, 4}, { 1, 5}, { 8, 1}, { 2, 0}, /* Row 18 */
- { 1, 0}, { 1, 5}, { 8, 1}, { 1, 7}, { 3, 4}, { 1, 7},
+ { 1, 0}, { 1, 5}, { 8, 1}, { 1, 7}, { 3, 4}, { 1, 7},
{ 1, 1}, { 1, 5}, { 4, 4}, { 1, 5}, { 8, 1}, { 2, 0}, /* Row 19 */
- { 2, 0}, { 8, 1}, { 1, 7}, { 3, 4}, { 1, 7}, { 1, 1},
+ { 2, 0}, { 8, 1}, { 1, 7}, { 3, 4}, { 1, 7}, { 1, 1},
{ 1, 5}, { 4, 4}, { 1, 5}, { 8, 1}, { 2, 0}, /* Row 20 */
- { 2, 0}, { 8, 1}, { 1, 7}, { 3, 4}, { 1, 7}, { 1, 1},
+ { 2, 0}, { 8, 1}, { 1, 7}, { 3, 4}, { 1, 7}, { 1, 1},
{ 1, 2}, { 4, 4}, { 1, 5}, { 7, 1}, { 1, 5}, { 2, 0}, /* Row 21 */
- { 2, 0}, { 1, 5}, { 7, 1}, { 1, 7}, { 3, 4}, { 1, 6},
+ { 2, 0}, { 1, 5}, { 7, 1}, { 1, 7}, { 3, 4}, { 1, 6},
{ 1, 1}, { 1, 2}, { 4, 4}, { 1, 2}, { 7, 1}, { 3, 0}, /* Row 22 */
- { 3, 0}, { 7, 1}, { 1, 2}, { 3, 6}, { 4, 2}, { 2, 6},
+ { 3, 0}, { 7, 1}, { 1, 2}, { 3, 6}, { 4, 2}, { 2, 6},
{ 2, 2}, { 6, 1}, { 1, 5}, { 3, 0}, /* Row 23 */
{ 4, 0}, { 4, 1}, { 16, 2}, { 4, 1}, { 4, 0}, /* Row 24 */
{ 4, 0}, { 1, 5}, { 2, 1}, { 18, 2}, { 2, 1}, { 5, 0}, /* Row 25 */
- { 5, 0}, { 1, 5}, { 1, 1}, { 6, 2}, { 6, 2}, { 7, 2},
+ { 5, 0}, { 1, 5}, { 1, 1}, { 6, 2}, { 6, 2}, { 7, 2},
{ 1, 5}, { 5, 0}, /* Row 26 */
- { 6, 0}, { 1, 5}, { 4, 2}, { 1, 5}, { 8, 2}, { 1, 5},
+ { 6, 0}, { 1, 5}, { 4, 2}, { 1, 5}, { 8, 2}, { 1, 5},
{ 4, 2}, { 7, 0}, /* Row 27 */
- { 8, 0}, { 3, 2}, { 4, 2}, { 2, 2}, { 4, 2}, { 2, 2},
+ { 8, 0}, { 3, 2}, { 4, 2}, { 2, 2}, { 4, 2}, { 2, 2},
{ 1, 5}, { 8, 0}, /* Row 28 */
{ 9, 0}, { 1, 5}, { 3, 2}, { 6, 2}, { 3, 2}, { 10, 0}, /* Row 29 */
{ 12, 0}, { 8, 2}, { 12, 0}, /* Row 30 */
@@ -222,7 +222,7 @@ static const NXWidgets::SRlePaletteBitmapEntry rew_bitmap[] =
// { 14, 0}, { 3, 4}, { 1, 7}, { 14, 0}, /* Row 1 */
{ 14, 0}, { 4, 7}, { 14, 0}, /* Row 1 */
{ 10, 0}, { 12, 7}, { 10, 0}, /* Row 2 */
- { 8, 0}, { 1, 7}, { 3, 6}, { 8, 7},
+ { 8, 0}, { 1, 7}, { 3, 6}, { 8, 7},
{ 3, 6}, { 1, 7}, { 8, 0}, /* Row 3 */
{ 7, 0}, { 7, 6}, { 3, 7}, { 8, 6}, { 7, 0}, /* Row 4 */
{ 6, 0}, { 3, 3}, { 13, 6}, { 4, 3}, { 6, 0}, /* Row 5 */
@@ -230,46 +230,46 @@ static const NXWidgets::SRlePaletteBitmapEntry rew_bitmap[] =
{ 4, 0}, { 23, 3}, { 1, 2}, { 4, 0}, /* Row 7 */
{ 3, 0}, { 1, 5}, { 23, 3}, { 1, 2}, { 1, 5}, { 3, 0}, /* Row 8 */
{ 3, 0}, { 3, 2}, { 18, 3}, { 5, 2}, { 3, 0}, /* Row 9 */
- { 2, 0}, { 1, 5}, { 5, 2}, { 6, 3}, { 1, 6}, { 7, 3},
+ { 2, 0}, { 1, 5}, { 5, 2}, { 6, 3}, { 1, 6}, { 7, 3},
{ 2, 2}, { 2, 6}, { 3, 2}, { 1, 5}, { 2, 0}, /* Row 10 */
- { 2, 0}, { 1, 5}, { 9, 2}, { 1, 6}, { 2, 4}, { 1, 3},
- { 1, 2}, { 2, 3}, { 3, 2}, { 1, 6}, { 2, 4}, { 1, 6},
+ { 2, 0}, { 1, 5}, { 9, 2}, { 1, 6}, { 2, 4}, { 1, 3},
+ { 1, 2}, { 2, 3}, { 3, 2}, { 1, 6}, { 2, 4}, { 1, 6},
{ 3, 2}, { 1, 5}, { 2, 0}, /* Row 11 */
- { 1, 0}, { 2, 5}, { 7, 2}, { 1, 6}, { 4, 4}, { 1, 3},
- { 4, 2}, { 1, 3}, { 1, 7}, { 3, 4}, { 1, 7}, { 3, 2},
+ { 1, 0}, { 2, 5}, { 7, 2}, { 1, 6}, { 4, 4}, { 1, 3},
+ { 4, 2}, { 1, 3}, { 1, 7}, { 3, 4}, { 1, 7}, { 3, 2},
{ 1, 5}, { 2, 0}, /* Row 12 */
- { 1, 0}, { 5, 5}, { 2, 2}, { 1, 5}, { 1, 7}, { 5, 4},
- { 1, 5}, { 3, 2}, { 1, 7}, { 5, 4}, { 1, 7}, { 1, 2},
+ { 1, 0}, { 5, 5}, { 2, 2}, { 1, 5}, { 1, 7}, { 5, 4},
+ { 1, 5}, { 3, 2}, { 1, 7}, { 5, 4}, { 1, 7}, { 1, 2},
{ 3, 5}, { 2, 0}, /* Row 13 */
- { 1, 0}, { 6, 5}, { 1, 7}, { 7, 4}, { 1, 5}, { 1, 2},
- { 1, 7}, { 7, 4}, { 1, 7}, { 3, 5}, { 1, 1}, { 1, 5},
+ { 1, 0}, { 6, 5}, { 1, 7}, { 7, 4}, { 1, 5}, { 1, 2},
+ { 1, 7}, { 7, 4}, { 1, 7}, { 3, 5}, { 1, 1}, { 1, 5},
{ 1, 0}, /* Row 14 */
- { 1, 0}, { 4, 1}, { 1, 7}, { 9, 4}, { 1, 7}, { 9, 4},
+ { 1, 0}, { 4, 1}, { 1, 7}, { 9, 4}, { 1, 7}, { 9, 4},
{ 1, 7}, { 4, 1}, { 1, 5}, { 1, 0}, /* Row 15 */
- { 1, 0}, { 4, 1}, { 1, 5}, { 9, 4}, { 1, 7}, { 9, 4},
+ { 1, 0}, { 4, 1}, { 1, 5}, { 9, 4}, { 1, 7}, { 9, 4},
{ 1, 5}, { 4, 1}, { 1, 5}, { 1, 0}, /* Row 16 */
- { 1, 0}, { 6, 1}, { 1, 5}, { 7, 4}, { 1, 5}, { 1, 1},
+ { 1, 0}, { 6, 1}, { 1, 5}, { 7, 4}, { 1, 5}, { 1, 1},
{ 1, 5}, { 7, 4}, { 1, 5}, { 4, 1}, { 1, 5}, { 1, 0}, /* Row 17 */
- { 1, 0}, { 8, 1}, { 1, 7}, { 5, 4}, { 1, 5}, { 3, 1},
+ { 1, 0}, { 8, 1}, { 1, 7}, { 5, 4}, { 1, 5}, { 3, 1},
{ 1, 7}, { 5, 4}, { 1, 5}, { 4, 1}, { 2, 0}, /* Row 18 */
- { 1, 0}, { 1, 5}, { 8, 1}, { 1, 5}, { 4, 4}, { 1, 5},
+ { 1, 0}, { 1, 5}, { 8, 1}, { 1, 5}, { 4, 4}, { 1, 5},
{ 4, 1}, { 1, 5}, { 4, 4}, { 1, 5}, { 4, 1}, { 2, 0}, /* Row 19 */
- { 2, 0}, { 10, 1}, { 1, 7}, { 2, 4}, { 1, 2}, { 6, 1},
+ { 2, 0}, { 10, 1}, { 1, 7}, { 2, 4}, { 1, 2}, { 6, 1},
{ 1, 7}, { 2, 4}, { 1, 5}, { 4, 1}, { 2, 0}, /* Row 20 */
- { 2, 0}, { 11, 1}, { 1, 5}, { 1, 4}, { 1, 2}, { 7, 1},
+ { 2, 0}, { 11, 1}, { 1, 5}, { 1, 4}, { 1, 2}, { 7, 1},
{ 1, 5}, { 1, 7}, { 1, 5}, { 3, 1}, { 1, 5}, { 2, 0}, /* Row 21 */
- { 2, 0}, { 1, 5}, { 9, 1}, { 1, 2}, { 1, 1}, { 6, 2},
+ { 2, 0}, { 1, 5}, { 9, 1}, { 1, 2}, { 1, 1}, { 6, 2},
{ 9, 1}, { 3, 0}, /* Row 22 */
{ 3, 0}, { 7, 1}, { 12, 2}, { 6, 1}, { 1, 5}, { 3, 0}, /* Row 23 */
{ 4, 0}, { 5, 1}, { 14, 2}, { 5, 1}, { 4, 0}, /* Row 24 */
{ 4, 0}, { 1, 5}, { 2, 1}, { 18, 2}, { 2, 1}, { 5, 0}, /* Row 25 */
- { 5, 0}, { 1, 5}, { 1, 1}, { 6, 2}, { 6, 2}, { 7, 2},
+ { 5, 0}, { 1, 5}, { 1, 1}, { 6, 2}, { 6, 2}, { 7, 2},
{ 1, 5}, { 5, 0}, /* Row 26 */
- { 6, 0}, { 1, 5}, { 4, 2}, { 1, 5}, { 8, 2}, { 1, 5},
+ { 6, 0}, { 1, 5}, { 4, 2}, { 1, 5}, { 8, 2}, { 1, 5},
{ 4, 2}, { 7, 0}, /* Row 27 */
- { 8, 0}, { 3, 2}, { 3, 2}, { 4, 2}, { 3, 2}, { 2, 2},
+ { 8, 0}, { 3, 2}, { 3, 2}, { 4, 2}, { 3, 2}, { 2, 2},
{ 1, 5}, { 8, 0}, /* Row 28 */
- { 9, 0}, { 1, 5}, { 3, 2}, { 6, 2}, { 2, 2}, { 1, 5},
+ { 9, 0}, { 1, 5}, { 3, 2}, { 6, 2}, { 2, 2}, { 1, 5},
{ 10, 0}, /* Row 29 */
{ 12, 0}, { 3, 2}, { 2, 2}, { 3, 2}, { 12, 0}, /* Row 30 */
{ 32, 0}, /* Row 31 */
@@ -293,7 +293,7 @@ static const NXWidgets::SRlePaletteBitmapEntry fwd_bitmap[] =
{ 32, 0}, /* Row 0 */
{ 14, 0}, { 4, 7}, { 14, 0}, /* Row 1 */
{ 10, 0}, { 12, 7}, { 10, 0}, /* Row 2 */
- { 8, 0}, { 1, 7}, { 3, 6}, { 8, 7},
+ { 8, 0}, { 1, 7}, { 3, 6}, { 8, 7},
{ 3, 6}, { 1, 7}, { 8, 0}, /* Row 3 */
{ 7, 0}, { 7, 6}, { 3, 7}, { 8, 6}, { 7, 0}, /* Row 4 */
{ 6, 0}, { 3, 3}, { 13, 6}, { 4, 3}, { 6, 0}, /* Row 5 */
@@ -301,47 +301,47 @@ static const NXWidgets::SRlePaletteBitmapEntry fwd_bitmap[] =
{ 4, 0}, { 1, 2}, { 22, 3}, { 1, 2}, { 4, 0}, /* Row 7 */
{ 3, 0}, { 1, 5}, { 23, 3}, { 1, 2}, { 1, 5}, { 3, 0}, /* Row 8 */
{ 3, 0}, { 3, 2}, { 19, 3}, { 4, 2}, { 3, 0}, /* Row 9 */
- { 2, 0}, { 1, 5}, { 3, 2}, { 2, 6}, { 2, 2}, { 7, 3},
+ { 2, 0}, { 1, 5}, { 3, 2}, { 2, 6}, { 2, 2}, { 7, 3},
{ 1, 6}, { 5, 3}, { 6, 2}, { 1, 5}, { 2, 0}, /* Row 10 */
- { 2, 0}, { 1, 5}, { 3, 2}, { 1, 7}, { 2, 4}, { 1, 3},
- { 2, 2}, { 3, 3}, { 1, 2}, { 1, 6}, { 2, 4}, { 1, 6},
+ { 2, 0}, { 1, 5}, { 3, 2}, { 1, 7}, { 2, 4}, { 1, 3},
+ { 2, 2}, { 3, 3}, { 1, 2}, { 1, 6}, { 2, 4}, { 1, 6},
{ 9, 2}, { 1, 5}, { 2, 0}, /* Row 11 */
- { 1, 0}, { 2, 5}, { 3, 2}, { 1, 7}, { 3, 4}, { 1, 7},
- { 5, 2}, { 1, 6}, { 4, 4}, { 1, 5}, { 7, 2}, { 1, 5},
+ { 1, 0}, { 2, 5}, { 3, 2}, { 1, 7}, { 3, 4}, { 1, 7},
+ { 5, 2}, { 1, 6}, { 4, 4}, { 1, 5}, { 7, 2}, { 1, 5},
{ 2, 0}, /* Row 12 */
- { 1, 0}, { 4, 5}, { 1, 2}, { 1, 7}, { 5, 4}, { 1, 7},
- { 3, 2}, { 1, 6}, { 5, 4}, { 1, 7}, { 1, 5}, { 2, 2},
+ { 1, 0}, { 4, 5}, { 1, 2}, { 1, 7}, { 5, 4}, { 1, 7},
+ { 3, 2}, { 1, 6}, { 5, 4}, { 1, 7}, { 1, 5}, { 2, 2},
{ 4, 5}, { 2, 0}, /* Row 13 */
- { 1, 0}, { 1, 5}, { 1, 1}, { 2, 5}, { 1, 1}, { 1, 7},
- { 7, 4}, { 1, 7}, { 1, 2}, { 1, 5}, { 7, 4}, { 1, 7},
+ { 1, 0}, { 1, 5}, { 1, 1}, { 2, 5}, { 1, 1}, { 1, 7},
+ { 7, 4}, { 1, 7}, { 1, 2}, { 1, 5}, { 7, 4}, { 1, 7},
{ 4, 5}, { 1, 1}, { 1, 5}, { 1, 0}, /* Row 14 */
- { 1, 0}, { 5, 1}, { 1, 7}, { 9, 4}, { 1, 7}, { 9, 4},
+ { 1, 0}, { 5, 1}, { 1, 7}, { 9, 4}, { 1, 7}, { 9, 4},
{ 1, 5}, { 3, 1}, { 1, 5}, { 1, 0}, /* Row 15 */
- { 1, 0}, { 5, 1}, { 1, 7}, { 8, 4}, { 2, 7}, { 8, 4},
+ { 1, 0}, { 5, 1}, { 1, 7}, { 8, 4}, { 2, 7}, { 8, 4},
{ 1, 7}, { 4, 1}, { 1, 5}, { 1, 0}, /* Row 16 */
- { 1, 0}, { 5, 1}, { 1, 5}, { 7, 4}, { 1, 5}, { 1, 1},
+ { 1, 0}, { 5, 1}, { 1, 5}, { 7, 4}, { 1, 5}, { 1, 1},
{ 1, 5}, { 7, 4}, { 1, 5}, { 5, 1}, { 1, 5}, { 1, 0}, /* Row 17 */
- { 1, 0}, { 5, 1}, { 1, 5}, { 5, 4}, { 1, 7}, { 3, 1},
+ { 1, 0}, { 5, 1}, { 1, 5}, { 5, 4}, { 1, 7}, { 3, 1},
{ 1, 5}, { 5, 4}, { 1, 7}, { 7, 1}, { 2, 0}, /* Row 18 */
- { 1, 0}, { 1, 5}, { 4, 1}, { 1, 5}, { 3, 4}, { 1, 7},
- { 1, 2}, { 4, 1}, { 1, 5}, { 4, 4}, { 1, 5}, { 8, 1},
+ { 1, 0}, { 1, 5}, { 4, 1}, { 1, 5}, { 3, 4}, { 1, 7},
+ { 1, 2}, { 4, 1}, { 1, 5}, { 4, 4}, { 1, 5}, { 8, 1},
{ 2, 0}, /* Row 19 */
- { 2, 0}, { 4, 1}, { 1, 5}, { 2, 4}, { 1, 5}, { 6, 1},
+ { 2, 0}, { 4, 1}, { 1, 5}, { 2, 4}, { 1, 5}, { 6, 1},
{ 1, 5}, { 2, 4}, { 1, 7}, { 10, 1}, { 2, 0}, /* Row 20 */
- { 2, 0}, { 4, 1}, { 2, 7}, { 8, 1}, { 1, 5}, { 1, 4},
+ { 2, 0}, { 4, 1}, { 2, 7}, { 8, 1}, { 1, 5}, { 1, 4},
{ 1, 2}, { 10, 1}, { 1, 5}, { 2, 0}, /* Row 21 */
- { 2, 0}, { 1, 5}, { 9, 1}, { 6, 2}, { 1, 1}, { 1, 2},
+ { 2, 0}, { 1, 5}, { 9, 1}, { 6, 2}, { 1, 1}, { 1, 2},
{ 9, 1}, { 3, 0}, /* Row 22 */
{ 3, 0}, { 7, 1}, { 12, 2}, { 6, 1}, { 1, 5}, { 3, 0}, /* Row 23 */
{ 4, 0}, { 5, 1}, { 14, 2}, { 5, 1}, { 4, 0}, /* Row 24 */
{ 4, 0}, { 1, 5}, { 2, 1}, { 18, 2}, { 2, 1}, { 5, 0}, /* Row 25 */
- { 5, 0}, { 1, 5}, { 1, 1}, { 6, 2}, { 6, 2}, { 7, 2},
+ { 5, 0}, { 1, 5}, { 1, 1}, { 6, 2}, { 6, 2}, { 7, 2},
{ 1, 5}, { 5, 0}, /* Row 26 */
- { 6, 0}, { 1, 5}, { 4, 2}, { 1, 5}, { 8, 2}, { 1, 5},
+ { 6, 0}, { 1, 5}, { 4, 2}, { 1, 5}, { 8, 2}, { 1, 5},
{ 4, 2}, { 7, 0}, /* Row 27 */
- { 8, 0}, { 3, 2}, { 3, 2}, { 4, 2}, { 3, 2}, { 2, 2},
+ { 8, 0}, { 3, 2}, { 3, 2}, { 4, 2}, { 3, 2}, { 2, 2},
{ 1, 5}, { 8, 0}, /* Row 28 */
- { 9, 0}, { 1, 5}, { 3, 2}, { 6, 2}, { 2, 2}, { 1, 5},
+ { 9, 0}, { 1, 5}, { 3, 2}, { 6, 2}, { 2, 2}, { 1, 5},
{ 10, 0}, /* Row 29 */
{ 12, 0}, { 3, 2}, { 2, 2}, { 3, 2}, { 12, 0}, /* Row 30 */
{ 32, 0}, /* Row 31 */
@@ -367,7 +367,7 @@ static const NXWidgets::SRlePaletteBitmapEntry vol_bitmap[] =
{ 3, 0}, { 5, 3}, { 6, 6}, { 5, 3}, { 3, 0}, /* Row 4 */
{ 3, 0}, { 16, 3}, { 3, 0}, /* Row 5 */
{ 2, 0}, { 2, 2}, { 13, 3}, { 3, 2}, { 2, 0}, /* Row 6 */
- { 1, 0}, { 1, 5}, { 4, 2}, { 10, 3}, { 4, 2}, { 1, 5},
+ { 1, 0}, { 1, 5}, { 4, 2}, { 10, 3}, { 4, 2}, { 1, 5},
{ 1, 0}, /* Row 7 */
{ 1, 0}, { 2, 5}, { 15, 2}, { 3, 5}, { 1, 0}, /* Row 8 */
{ 1, 0}, { 5, 5}, { 10, 2}, { 5, 5}, { 1, 0}, /* Row 9 */
@@ -376,7 +376,7 @@ static const NXWidgets::SRlePaletteBitmapEntry vol_bitmap[] =
{ 1, 0}, { 20, 1}, { 1, 0}, /* Row 12 */
{ 1, 0}, { 20, 1}, { 1, 0}, /* Row 13 */
{ 1, 0}, { 19, 1}, { 1, 5}, { 1, 0}, /* Row 14 */
- { 1, 0}, { 1, 5}, { 7, 1}, { 1, 5}, { 4, 2}, { 6, 1},
+ { 1, 0}, { 1, 5}, { 7, 1}, { 1, 5}, { 4, 2}, { 6, 1},
{ 2, 0}, /* Row 15 */
{ 2, 0}, { 5, 1}, { 8, 2}, { 4, 1}, { 1, 5}, { 2, 0}, /* Row 16 */
{ 3, 0}, { 2, 1}, { 12, 2}, { 2, 1}, { 3, 0}, /* Row 17 */
diff --git a/NxWidgets/nxwm/src/glyph_nsh.cxx b/NxWidgets/nxwm/src/glyph_nsh.cxx
index 213db54dd..efa83f7ed 100644
--- a/NxWidgets/nxwm/src/glyph_nsh.cxx
+++ b/NxWidgets/nxwm/src/glyph_nsh.cxx
@@ -36,7 +36,7 @@
/********************************************************************************************
* Included Files
********************************************************************************************/
-
+
#include <nuttx/config.h>
#include <sys/types.h>
@@ -205,7 +205,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_nshBitmap =
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
CONFIG_NXWIDGETS_FMT, // fmt - Color format
BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT)
- BITMAP_NCOLUMNS, // width - Width in pixels
+ BITMAP_NCOLUMNS, // width - Width in pixels
BITMAP_NROWS, // height - Height in rows
{ // lut - Pointer to the beginning of the Look-Up Table (LUT)
g_nshLut, // Index 0: Unselected LUT
diff --git a/NxWidgets/nxwm/src/glyph_play24x24.cxx b/NxWidgets/nxwm/src/glyph_play24x24.cxx
index ffe389fc5..c96ef0b03 100644
--- a/NxWidgets/nxwm/src/glyph_play24x24.cxx
+++ b/NxWidgets/nxwm/src/glyph_play24x24.cxx
@@ -36,7 +36,7 @@
/********************************************************************************************
* Included Files
********************************************************************************************/
-
+
#include <nuttx/config.h>
#include <sys/types.h>
@@ -248,7 +248,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_playBitmap24x24 =
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
CONFIG_NXWIDGETS_FMT, // fmt - Color format
BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT)
- BITMAP_NCOLUMNS, // width - Width in pixels
+ BITMAP_NCOLUMNS, // width - Width in pixels
BITMAP_NROWS, // height - Height in rows
{ // lut - Pointer to the beginning of the Look-Up Table (LUT)
g_playNormalLut, // Index 0: Unselected LUT
diff --git a/NxWidgets/nxwm/src/glyph_start.cxx b/NxWidgets/nxwm/src/glyph_start.cxx
index ce1bf6a2c..2fd7b3cd1 100644
--- a/NxWidgets/nxwm/src/glyph_start.cxx
+++ b/NxWidgets/nxwm/src/glyph_start.cxx
@@ -36,7 +36,7 @@
/********************************************************************************************
* Included Files
********************************************************************************************/
-
+
#include <nuttx/config.h>
#include <sys/types.h>
@@ -206,7 +206,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_startBitmap =
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
CONFIG_NXWIDGETS_FMT, // fmt - Color format
BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT)
- BITMAP_NCOLUMNS, // width - Width in pixels
+ BITMAP_NCOLUMNS, // width - Width in pixels
BITMAP_NROWS, // height - Height in rows
{ // lut - Pointer to the beginning of the Look-Up Table (LUT)
g_startLut, // Index 0: Unselected LUT
diff --git a/NxWidgets/nxwm/src/glyph_stop.cxx b/NxWidgets/nxwm/src/glyph_stop.cxx
index 74836e01d..d9436b5d8 100644
--- a/NxWidgets/nxwm/src/glyph_stop.cxx
+++ b/NxWidgets/nxwm/src/glyph_stop.cxx
@@ -36,7 +36,7 @@
/********************************************************************************************
* Included Files
********************************************************************************************/
-
+
#include <nuttx/config.h>
#include <sys/types.h>
@@ -184,7 +184,7 @@ const struct NXWidgets::SRlePaletteBitmap NxWM::g_stopBitmap =
CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel
CONFIG_NXWIDGETS_FMT, // fmt - Color format
BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT)
- BITMAP_NCOLUMNS, // width - Width in pixels
+ BITMAP_NCOLUMNS, // width - Width in pixels
BITMAP_NROWS, // height - Height in rows
{ // lut - Pointer to the beginning of the Look-Up Table (LUT)
g_stopNormalLut, // Index 0: Unselected LUT