From b6c84f5b45487827eb14d3803da9c1747ebc42bc Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 8 Oct 2014 15:50:31 -0600 Subject: [PATCH] Fix files under NxWidgets to use the corrected syslog interfaces --- UnitTests/CButtonArray/cbuttonarray_main.cxx | 6 +-- UnitTests/CButtonArray/cbuttonarraytest.cxx | 8 ++-- UnitTests/CButtonArray/cbuttonarraytest.hxx | 9 ---- UnitTests/CCheckBox/ccheckbox_main.cxx | 25 +++++----- UnitTests/CCheckBox/ccheckboxtest.cxx | 12 ++--- UnitTests/CCheckBox/ccheckboxtest.hxx | 9 ---- UnitTests/CGlyphButton/cglyphbutton_main.cxx | 28 +++++------ UnitTests/CGlyphButton/cglyphbuttontest.cxx | 8 ++-- UnitTests/CGlyphButton/cglyphbuttontest.hxx | 9 ---- .../cglyphsliderhorizontal_main.cxx | 32 ++++++------- .../cglyphsliderhorizontaltest.cxx | 6 +-- .../cglyphsliderhorizontaltest.hxx | 9 ---- UnitTests/CImage/cimage_main.cxx | 30 ++++++------ UnitTests/CImage/cimagetest.cxx | 8 ++-- UnitTests/CImage/cimagetest.hxx | 9 ---- UnitTests/CKeypad/ckeypad_main.cxx | 6 +-- UnitTests/CKeypad/ckeypadtest.cxx | 12 ++--- UnitTests/CKeypad/ckeypadtest.hxx | 9 ---- .../clatchbuttonarray_main.cxx | 6 +-- .../clatchbuttonarraytest.cxx | 8 ++-- .../clatchbuttonarraytest.hxx | 9 ---- UnitTests/CListBox/clistbox_main.cxx | 48 +++++++++---------- UnitTests/CListBox/clistboxtest.cxx | 6 +-- UnitTests/CListBox/clistboxtest.hxx | 9 ---- UnitTests/CProgressBar/cprogressbar_main.cxx | 32 ++++++------- UnitTests/CProgressBar/cprogressbartest.cxx | 6 +-- UnitTests/CProgressBar/cprogressbartest.hxx | 9 ---- UnitTests/CRadioButton/cradiobutton_main.cxx | 30 ++++++------ UnitTests/CRadioButton/cradiobuttontest.cxx | 14 +++--- UnitTests/CRadioButton/cradiobuttontest.hxx | 9 ---- .../cscrollbarhorizontal_main.cxx | 32 ++++++------- .../cscrollbarhorizontaltest.cxx | 6 +-- .../cscrollbarhorizontaltest.hxx | 9 ---- .../cscrollbarvertical_main.cxx | 32 ++++++------- .../cscrollbarverticaltest.cxx | 6 +-- .../cscrollbarverticaltest.hxx | 9 ---- .../csliderhorizontal_main.cxx | 32 ++++++------- .../csliderhorizontaltest.cxx | 6 +-- .../csliderhorizontaltest.hxx | 9 ---- .../CSliderVertical/cslidervertical_main.cxx | 32 ++++++------- .../CSliderVertical/csliderverticaltest.cxx | 6 +-- .../CSliderVertical/csliderverticaltest.hxx | 9 ---- 42 files changed, 241 insertions(+), 368 deletions(-) diff --git a/UnitTests/CButtonArray/cbuttonarray_main.cxx b/UnitTests/CButtonArray/cbuttonarray_main.cxx index b9bb47a4b..b1a2cf41d 100644 --- a/UnitTests/CButtonArray/cbuttonarray_main.cxx +++ b/UnitTests/CButtonArray/cbuttonarray_main.cxx @@ -107,8 +107,8 @@ static void updateMemoryUsage(unsigned int previous, /* Show the change from the previous time */ - message("%s: Before: %8d After: %8d Change: %8d\n", - msg, previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); + printf("%s: Before: %8d After: %8d Change: %8d\n", + msg, previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); /* Set up for the next test */ @@ -321,7 +321,7 @@ int cbuttonarray_main(int argc, char *argv[]) delete test; updateMemoryUsage(g_mmPrevious, "After deleting the test"); updateMemoryUsage(g_mmInitial, "Final memory usage"); - message("Peak memory usage: %8d\n", g_mmPeak - g_mmInitial); + printf("Peak memory usage: %8d\n", g_mmPeak - g_mmInitial); return 0; } diff --git a/UnitTests/CButtonArray/cbuttonarraytest.cxx b/UnitTests/CButtonArray/cbuttonarraytest.cxx index c1ad0e7a4..1b029e311 100644 --- a/UnitTests/CButtonArray/cbuttonarraytest.cxx +++ b/UnitTests/CButtonArray/cbuttonarraytest.cxx @@ -103,7 +103,7 @@ bool CButtonArrayTest::connect(void) if (!setBackgroundColor(CONFIG_CBUTTONARRAYTEST_BGCOLOR)) { - message("CButtonArrayTest::connect: setBackgroundColor failed\n"); + printf("CButtonArrayTest::connect: setBackgroundColor failed\n"); } } @@ -157,7 +157,7 @@ bool CButtonArrayTest::createWindow(void) m_bgWindow = getBgWindow(m_widgetControl); if (!m_bgWindow) { - message("CButtonArrayTest::createGraphics: Failed to create CBgWindow instance\n"); + printf("CButtonArrayTest::createGraphics: Failed to create CBgWindow instance\n"); delete m_widgetControl; return false; } @@ -167,7 +167,7 @@ bool CButtonArrayTest::createWindow(void) bool success = m_bgWindow->open(); if (!success) { - message("CButtonArrayTest::createGraphics: Failed to open background window\n"); + printf("CButtonArrayTest::createGraphics: Failed to open background window\n"); delete m_bgWindow; m_bgWindow = (CBgWindow*)0; return false; @@ -185,7 +185,7 @@ CButtonArray *CButtonArrayTest::createButtonArray(void) struct nxgl_size_s windowSize; if (!m_bgWindow->getSize(&windowSize)) { - message("CButtonArrayTest::createGraphics: Failed to get window size\n"); + printf("CButtonArrayTest::createGraphics: Failed to get window size\n"); return (CButtonArray *)NULL; } diff --git a/UnitTests/CButtonArray/cbuttonarraytest.hxx b/UnitTests/CButtonArray/cbuttonarraytest.hxx index 1dc794a48..1bcbd0767 100644 --- a/UnitTests/CButtonArray/cbuttonarraytest.hxx +++ b/UnitTests/CButtonArray/cbuttonarraytest.hxx @@ -75,15 +75,6 @@ # define CONFIG_CBUTTONARRAYTEST_FONTCOLOR CONFIG_NXWIDGETS_DEFAULT_FONTCOLOR #endif -// If debug is enabled, use the debug function, syslog() instead -// of printf() so that the output is synchronized. - -#ifdef CONFIG_DEBUG -# define message lowsyslog -#else -# define message printf -#endif - // The geometry of the button array #define BUTTONARRAY_NCOLUMNS 4 diff --git a/UnitTests/CCheckBox/ccheckbox_main.cxx b/UnitTests/CCheckBox/ccheckbox_main.cxx index e2c4bc148..b0a74fc14 100644 --- a/UnitTests/CCheckBox/ccheckbox_main.cxx +++ b/UnitTests/CCheckBox/ccheckbox_main.cxx @@ -98,9 +98,9 @@ static void updateMemoryUsage(unsigned int previous, /* Show the change from the previous time */ - message("\n%s:\n", msg); - message(" Before: %8d After: %8d Change: %8d\n\n", - previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); + printf("\n%s:\n", msg); + printf(" Before: %8d After: %8d Change: %8d\n\n", + previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); /* Set up for the next test */ @@ -143,16 +143,16 @@ int ccheckbox_main(int argc, char *argv[]) // Create an instance of the checkbox test - message("ccheckbox_main: Create CCheckBoxTest instance\n"); + printf("ccheckbox_main: Create CCheckBoxTest instance\n"); CCheckBoxTest *test = new CCheckBoxTest(); updateMemoryUsage(g_mmprevious, "After creating CCheckBoxTest"); // Connect the NX server - message("ccheckbox_main: Connect the CCheckBoxTest instance to the NX server\n"); + printf("ccheckbox_main: Connect the CCheckBoxTest instance to the NX server\n"); if (!test->connect()) { - message("ccheckbox_main: Failed to connect the CCheckBoxTest instance to the NX server\n"); + printf("ccheckbox_main: Failed to connect the CCheckBoxTest instance to the NX server\n"); delete test; return 1; } @@ -160,10 +160,10 @@ int ccheckbox_main(int argc, char *argv[]) // Create a window to draw into - message("ccheckbox_main: Create a Window\n"); + printf("ccheckbox_main: Create a Window\n"); if (!test->createWindow()) { - message("ccheckbox_main: Failed to create a window\n"); + printf("ccheckbox_main: Failed to create a window\n"); delete test; return 1; } @@ -177,21 +177,21 @@ int ccheckbox_main(int argc, char *argv[]) // Now click the checkbox - message("ccheckbox_main: Click 1\n"); + printf("ccheckbox_main: Click 1\n"); test->clickCheckBox(); usleep(500*1000); test->showCheckBoxState(); updateMemoryUsage(g_mmprevious, "After click 1"); usleep(500*1000); - message("ccheckbox_main: Click 2\n"); + printf("ccheckbox_main: Click 2\n"); test->clickCheckBox(); usleep(500*1000); test->showCheckBoxState(); updateMemoryUsage(g_mmprevious, "After click 2"); usleep(500*1000); - message("ccheckbox_main: Click 3\n"); + printf("ccheckbox_main: Click 3\n"); test->clickCheckBox(); usleep(500*1000); test->showCheckBoxState(); @@ -200,10 +200,9 @@ int ccheckbox_main(int argc, char *argv[]) // Clean up and exit - message("ccheckbox_main: Clean-up and exit\n"); + printf("ccheckbox_main: Clean-up and exit\n"); delete test; updateMemoryUsage(g_mmprevious, "After deleting the test"); updateMemoryUsage(g_mmInitial, "Final memory usage"); return 0; } - diff --git a/UnitTests/CCheckBox/ccheckboxtest.cxx b/UnitTests/CCheckBox/ccheckboxtest.cxx index e9ccc7628..0f8fb46ad 100644 --- a/UnitTests/CCheckBox/ccheckboxtest.cxx +++ b/UnitTests/CCheckBox/ccheckboxtest.cxx @@ -108,7 +108,7 @@ bool CCheckBoxTest::connect(void) if (!setBackgroundColor(CONFIG_CCHECKBOXTEST_BGCOLOR)) { - message("CCheckBoxTest::connect: setBackgroundColor failed\n"); + printf("CCheckBoxTest::connect: setBackgroundColor failed\n"); } } @@ -172,7 +172,7 @@ bool CCheckBoxTest::createWindow(void) m_bgWindow = getBgWindow(m_widgetControl); if (!m_bgWindow) { - message("CCheckBoxTest::createWindow: Failed to create CBgWindow instance\n"); + printf("CCheckBoxTest::createWindow: Failed to create CBgWindow instance\n"); disconnect(); return false; } @@ -182,7 +182,7 @@ bool CCheckBoxTest::createWindow(void) bool success = m_bgWindow->open(); if (!success) { - message("CCheckBoxTest::createWindow: Failed to open background window\n"); + printf("CCheckBoxTest::createWindow: Failed to open background window\n"); disconnect(); return false; } @@ -282,16 +282,16 @@ void CCheckBoxTest::showCheckBoxState(void) switch (state) { case CCheckBox::CHECK_BOX_STATE_OFF: // Checkbox is unticked - message("CCheckBoxTest::showCheckBoxState Checkbox is in the unticked state\n"); + printf("CCheckBoxTest::showCheckBoxState Checkbox is in the unticked state\n"); break; case CCheckBox::CHECK_BOX_STATE_ON: // Checkbox is ticked - message("CCheckBoxTest::showCheckBoxState Check is in the ticked state\n"); + printf("CCheckBoxTest::showCheckBoxState Check is in the ticked state\n"); break; default: case CCheckBox::CHECK_BOX_STATE_MU: // Checkbox is in the third state - message("CCheckBoxTest::showCheckBoxState Checkbox is in the 3rd state\n"); + printf("CCheckBoxTest::showCheckBoxState Checkbox is in the 3rd state\n"); break; } } diff --git a/UnitTests/CCheckBox/ccheckboxtest.hxx b/UnitTests/CCheckBox/ccheckboxtest.hxx index 58099acdf..338be4fb2 100644 --- a/UnitTests/CCheckBox/ccheckboxtest.hxx +++ b/UnitTests/CCheckBox/ccheckboxtest.hxx @@ -69,15 +69,6 @@ # define CONFIG_CCHECKBOXTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR #endif -// If debug is enabled, use the debug function, syslog() instead -// of printf() so that the output is synchronized. - -#ifdef CONFIG_DEBUG -# define message lowsyslog -#else -# define message printf -#endif - ///////////////////////////////////////////////////////////////////////////// // Public Classes ///////////////////////////////////////////////////////////////////////////// diff --git a/UnitTests/CGlyphButton/cglyphbutton_main.cxx b/UnitTests/CGlyphButton/cglyphbutton_main.cxx index 9cf8a73f5..fb25c2172 100644 --- a/UnitTests/CGlyphButton/cglyphbutton_main.cxx +++ b/UnitTests/CGlyphButton/cglyphbutton_main.cxx @@ -97,9 +97,9 @@ static void updateMemoryUsage(unsigned int previous, /* Show the change from the previous time */ - message("\n%s:\n", msg); - message(" Before: %8d After: %8d Change: %8d\n\n", - previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); + printf("\n%s:\n", msg); + printf(" Before: %8d After: %8d Change: %8d\n\n", + previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); /* Set up for the next test */ @@ -142,16 +142,16 @@ int cglyphbutton_main(int argc, char *argv[]) // Create an instance of the font test - message("cglyphbutton_main: Create CGlyphButtonTest instance\n"); + printf("cglyphbutton_main: Create CGlyphButtonTest instance\n"); CGlyphButtonTest *test = new CGlyphButtonTest(); updateMemoryUsage(g_mmprevious, "After creating CGlyphButtonTest"); // Connect the NX server - message("cglyphbutton_main: Connect the CGlyphButtonTest instance to the NX server\n"); + printf("cglyphbutton_main: Connect the CGlyphButtonTest instance to the NX server\n"); if (!test->connect()) { - message("cglyphbutton_main: Failed to connect the CGlyphButtonTest instance to the NX server\n"); + printf("cglyphbutton_main: Failed to connect the CGlyphButtonTest instance to the NX server\n"); delete test; return 1; } @@ -159,10 +159,10 @@ int cglyphbutton_main(int argc, char *argv[]) // Create a window to draw into - message("cglyphbutton_main: Create a Window\n"); + printf("cglyphbutton_main: Create a Window\n"); if (!test->createWindow()) { - message("cglyphbutton_main: Failed to create a window\n"); + printf("cglyphbutton_main: Failed to create a window\n"); delete test; return 1; } @@ -173,7 +173,7 @@ int cglyphbutton_main(int argc, char *argv[]) CGlyphButton *button = test->createButton(&g_arrowDown, &g_arrowUp); if (!button) { - message("cglyphbutton_main: Failed to create a button\n"); + printf("cglyphbutton_main: Failed to create a button\n"); delete test; return 1; } @@ -181,21 +181,21 @@ int cglyphbutton_main(int argc, char *argv[]) // Show the button - message("cglyphbutton_main: Show the button\n"); + printf("cglyphbutton_main: Show the button\n"); test->showButton(button); updateMemoryUsage(g_mmprevious, "After showing the glyph button"); // Wait two seconds, then perform a simulated mouse click on the button sleep(2); - message("cglyphbutton_main: Click the button\n"); + printf("cglyphbutton_main: Click the button\n"); test->click(); updateMemoryUsage(g_mmprevious, "After clicking glyph button"); // Poll for the mouse click event (of course this can hang if something fails) bool clicked = test->poll(button); - message("cglyphbutton_main: Button is %s\n", clicked ? "clicked" : "released"); + printf("cglyphbutton_main: Button is %s\n", clicked ? "clicked" : "released"); // Wait a second, then release the mouse buttone @@ -206,7 +206,7 @@ int cglyphbutton_main(int argc, char *argv[]) // Poll for the mouse release event (of course this can hang if something fails) clicked = test->poll(button); - message("cglyphbutton_main: Button is %s\n", clicked ? "clicked" : "released"); + printf("cglyphbutton_main: Button is %s\n", clicked ? "clicked" : "released"); // Wait a few more seconds so that the tester can ponder the result @@ -214,7 +214,7 @@ int cglyphbutton_main(int argc, char *argv[]) // Clean up and exit - message("cglyphbutton_main: Clean-up and exit\n"); + printf("cglyphbutton_main: Clean-up and exit\n"); delete button; updateMemoryUsage(g_mmprevious, "After deleting the glyph button"); delete test; diff --git a/UnitTests/CGlyphButton/cglyphbuttontest.cxx b/UnitTests/CGlyphButton/cglyphbuttontest.cxx index 801da7289..61bea46fa 100644 --- a/UnitTests/CGlyphButton/cglyphbuttontest.cxx +++ b/UnitTests/CGlyphButton/cglyphbuttontest.cxx @@ -105,7 +105,7 @@ bool CGlyphButtonTest::connect(void) if (!setBackgroundColor(CONFIG_CGLYPHBUTTONTEST_BGCOLOR)) { - message("CGlyphButtonTest::connect: setBackgroundColor failed\n"); + printf("CGlyphButtonTest::connect: setBackgroundColor failed\n"); } } @@ -159,7 +159,7 @@ bool CGlyphButtonTest::createWindow(void) m_bgWindow = getBgWindow(m_widgetControl); if (!m_bgWindow) { - message("CGlyphButtonTest::createGraphics: Failed to create CBgWindow instance\n"); + printf("CGlyphButtonTest::createGraphics: Failed to create CBgWindow instance\n"); delete m_widgetControl; return false; } @@ -169,7 +169,7 @@ bool CGlyphButtonTest::createWindow(void) bool success = m_bgWindow->open(); if (!success) { - message("CGlyphButtonTest::createGraphics: Failed to open background window\n"); + printf("CGlyphButtonTest::createGraphics: Failed to open background window\n"); delete m_bgWindow; m_bgWindow = (CBgWindow*)0; return false; @@ -188,7 +188,7 @@ CGlyphButton *CGlyphButtonTest::createButton(FAR const struct SBitmap *clickGlyp struct nxgl_size_s windowSize; if (!m_bgWindow->getSize(&windowSize)) { - message("CGlyphButtonTest::createGraphics: Failed to get window size\n"); + printf("CGlyphButtonTest::createGraphics: Failed to get window size\n"); return (CGlyphButton *)NULL; } diff --git a/UnitTests/CGlyphButton/cglyphbuttontest.hxx b/UnitTests/CGlyphButton/cglyphbuttontest.hxx index 2c21d4cb1..a2751461e 100644 --- a/UnitTests/CGlyphButton/cglyphbuttontest.hxx +++ b/UnitTests/CGlyphButton/cglyphbuttontest.hxx @@ -76,15 +76,6 @@ # define CONFIG_CGLYPHBUTTONTEST_FONTCOLOR CONFIG_NXWIDGETS_DEFAULT_FONTCOLOR #endif -// If debug is enabled, use the debug function, syslog() instead -// of printf() so that the output is synchronized. - -#ifdef CONFIG_DEBUG -# define message lowsyslog -#else -# define message printf -#endif - // Helper macros #ifndef MAX diff --git a/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx b/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx index 24450fcfd..22dceb5da 100644 --- a/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx +++ b/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx @@ -98,9 +98,9 @@ static void updateMemoryUsage(unsigned int previous, /* Show the change from the previous time */ - message("\n%s:\n", msg); - message(" Before: %8d After: %8d Change: %8d\n\n", - previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); + printf("\n%s:\n", msg); + printf(" Before: %8d After: %8d Change: %8d\n\n", + previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); /* Set up for the next test */ @@ -143,16 +143,16 @@ int cglyphsliderhorizontal_main(int argc, char *argv[]) // Create an instance of the checkbox test - message("csliderhorizontal_main: Create CGlyphSliderHorizontalTest instance\n"); + printf("csliderhorizontal_main: Create CGlyphSliderHorizontalTest instance\n"); CGlyphSliderHorizontalTest *test = new CGlyphSliderHorizontalTest(); updateMemoryUsage(g_mmprevious, "After creating CGlyphSliderHorizontalTest"); // Connect the NX server - message("csliderhorizontal_main: Connect the CGlyphSliderHorizontalTest instance to the NX server\n"); + printf("csliderhorizontal_main: Connect the CGlyphSliderHorizontalTest instance to the NX server\n"); if (!test->connect()) { - message("csliderhorizontal_main: Failed to connect the CGlyphSliderHorizontalTest instance to the NX server\n"); + printf("csliderhorizontal_main: Failed to connect the CGlyphSliderHorizontalTest instance to the NX server\n"); delete test; return 1; } @@ -160,10 +160,10 @@ int cglyphsliderhorizontal_main(int argc, char *argv[]) // Create a window to draw into - message("csliderhorizontal_main: Create a Window\n"); + printf("csliderhorizontal_main: Create a Window\n"); if (!test->createWindow()) { - message("csliderhorizontal_main: Failed to create a window\n"); + printf("csliderhorizontal_main: Failed to create a window\n"); delete test; return 1; } @@ -171,11 +171,11 @@ int cglyphsliderhorizontal_main(int argc, char *argv[]) // Create a slider - message("csliderhorizontal_main: Create a Slider\n"); + printf("csliderhorizontal_main: Create a Slider\n"); CGlyphSliderHorizontal *slider = test->createSlider(); if (!slider) { - message("csliderhorizontal_main: Failed to create a slider\n"); + printf("csliderhorizontal_main: Failed to create a slider\n"); delete test; return 1; } @@ -187,9 +187,9 @@ int cglyphsliderhorizontal_main(int argc, char *argv[]) slider->setMinimumValue(0); slider->setMaximumValue(MAX_SLIDER); slider->setValue(0); - message("csliderhorizontal_main: Slider range %d->%d Initial value %d\n", - slider->getMinimumValue(), slider->getMaximumValue(), - slider->getValue()); + printf("csliderhorizontal_main: Slider range %d->%d Initial value %d\n", + slider->getMinimumValue(), slider->getMaximumValue(), + slider->getValue()); // Show the initial state of the checkbox @@ -201,7 +201,7 @@ int cglyphsliderhorizontal_main(int argc, char *argv[]) { slider->setValue(i); test->showSlider(slider); - message("csliderhorizontal_main: %d. New value %d\n", i, slider->getValue()); + printf("csliderhorizontal_main: %d. New value %d\n", i, slider->getValue()); usleep(1000 * 50); // The simulation needs this to let the X11 event loop run } updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After moving the slider up"); @@ -212,7 +212,7 @@ int cglyphsliderhorizontal_main(int argc, char *argv[]) { slider->setValue(i); test->showSlider(slider); - message("csliderhorizontal_main: %d. New value %d\n", i, slider->getValue()); + printf("csliderhorizontal_main: %d. New value %d\n", i, slider->getValue()); usleep(1000 * 50); // The simulation needs this to let the X11 event loop run } updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After moving the slider down"); @@ -220,7 +220,7 @@ int cglyphsliderhorizontal_main(int argc, char *argv[]) // Clean up and exit - message("csliderhorizontal_main: Clean-up and exit\n"); + printf("csliderhorizontal_main: Clean-up and exit\n"); delete slider; updateMemoryUsage(g_mmprevious, "After deleting the slider"); delete test; diff --git a/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx b/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx index 28f47af36..aaee77d8f 100644 --- a/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx +++ b/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx @@ -151,7 +151,7 @@ bool CGlyphSliderHorizontalTest::connect(void) if (!setBackgroundColor(CONFIG_CGLYPHSLIDERHORIZONTALTEST_BGCOLOR)) { - message("CGlyphSliderHorizontalTest::connect: setBackgroundColor failed\n"); + printf("CGlyphSliderHorizontalTest::connect: setBackgroundColor failed\n"); } } @@ -207,7 +207,7 @@ bool CGlyphSliderHorizontalTest::createWindow(void) m_bgWindow = getBgWindow(m_widgetControl); if (!m_bgWindow) { - message("CGlyphSliderHorizontalTest::createWindow: Failed to create CBgWindow instance\n"); + printf("CGlyphSliderHorizontalTest::createWindow: Failed to create CBgWindow instance\n"); disconnect(); return false; } @@ -217,7 +217,7 @@ bool CGlyphSliderHorizontalTest::createWindow(void) bool success = m_bgWindow->open(); if (!success) { - message("CGlyphSliderHorizontalTest::createWindow: Failed to open background window\n"); + printf("CGlyphSliderHorizontalTest::createWindow: Failed to open background window\n"); disconnect(); return false; } diff --git a/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx b/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx index 3311abe50..fa491720c 100644 --- a/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx +++ b/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx @@ -69,15 +69,6 @@ # define CONFIG_CGLYPHSLIDERHORIZONTALTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR #endif -// If debug is enabled, use the debug function, syslog() instead -// of printf() so that the output is synchronized. - -#ifdef CONFIG_DEBUG -# define message lowsyslog -#else -# define message printf -#endif - ///////////////////////////////////////////////////////////////////////////// // Public Classes ///////////////////////////////////////////////////////////////////////////// diff --git a/UnitTests/CImage/cimage_main.cxx b/UnitTests/CImage/cimage_main.cxx index 74bfd767f..b4d6fce65 100644 --- a/UnitTests/CImage/cimage_main.cxx +++ b/UnitTests/CImage/cimage_main.cxx @@ -86,13 +86,13 @@ extern "C" int cimage_main(int argc, char *argv[]); static void showMemoryUsage(FAR struct mallinfo *mmbefore, FAR struct mallinfo *mmafter) { - message("VARIABLE BEFORE AFTER\n"); - message("======== ======== ========\n"); - message("arena %8d %8d\n", mmbefore->arena, mmafter->arena); - message("ordblks %8d %8d\n", mmbefore->ordblks, mmafter->ordblks); - message("mxordblk %8d %8d\n", mmbefore->mxordblk, mmafter->mxordblk); - message("uordblks %8d %8d\n", mmbefore->uordblks, mmafter->uordblks); - message("fordblks %8d %8d\n", mmbefore->fordblks, mmafter->fordblks); + printf("VARIABLE BEFORE AFTER\n"); + printf("======== ======== ========\n"); + printf("arena %8d %8d\n", mmbefore->arena, mmafter->arena); + printf("ordblks %8d %8d\n", mmbefore->ordblks, mmafter->ordblks); + printf("mxordblk %8d %8d\n", mmbefore->mxordblk, mmafter->mxordblk); + printf("uordblks %8d %8d\n", mmbefore->uordblks, mmafter->uordblks); + printf("fordblks %8d %8d\n", mmbefore->fordblks, mmafter->fordblks); } ///////////////////////////////////////////////////////////////////////////// @@ -114,7 +114,7 @@ static void updateMemoryUsage(FAR struct mallinfo *previous, /* Show the change from the previous time */ - message("\n%s:\n", msg); + printf("\n%s:\n", msg); showMemoryUsage(previous, &mmcurrent); /* Set up for the next test */ @@ -157,16 +157,16 @@ int cimage_main(int argc, char *argv[]) // Create an instance of the font test - message("cimage_main: Create CImageTest instance\n"); + printf("cimage_main: Create CImageTest instance\n"); CImageTest *test = new CImageTest(); updateMemoryUsage(&g_mmprevious, "After creating CImageTest"); // Connect the NX server - message("cimage_main: Connect the CImageTest instance to the NX server\n"); + printf("cimage_main: Connect the CImageTest instance to the NX server\n"); if (!test->connect()) { - message("cimage_main: Failed to connect the CImageTest instance to the NX server\n"); + printf("cimage_main: Failed to connect the CImageTest instance to the NX server\n"); delete test; return 1; } @@ -174,10 +174,10 @@ int cimage_main(int argc, char *argv[]) // Create a window to draw into - message("cimage_main: Create a Window\n"); + printf("cimage_main: Create a Window\n"); if (!test->createWindow()) { - message("cimage_main: Failed to create a window\n"); + printf("cimage_main: Failed to create a window\n"); delete test; return 1; } @@ -193,7 +193,7 @@ int cimage_main(int argc, char *argv[]) CImage *image = test->createImage(static_cast(nuttxBitmap)); if (!image) { - message("cimage_main: Failed to create a image\n"); + printf("cimage_main: Failed to create a image\n"); delete test; return 1; } @@ -207,7 +207,7 @@ int cimage_main(int argc, char *argv[]) // Clean up and exit - message("cimage_main: Clean-up and exit\n"); + printf("cimage_main: Clean-up and exit\n"); delete image; updateMemoryUsage(&g_mmprevious, "After deleting CImage"); diff --git a/UnitTests/CImage/cimagetest.cxx b/UnitTests/CImage/cimagetest.cxx index 48814c4ce..c141b4fa5 100644 --- a/UnitTests/CImage/cimagetest.cxx +++ b/UnitTests/CImage/cimagetest.cxx @@ -104,7 +104,7 @@ bool CImageTest::connect(void) if (!setBackgroundColor(CONFIG_CIMAGETEST_BGCOLOR)) { - message("CImageTest::connect: setBackgroundColor failed\n"); + printf("CImageTest::connect: setBackgroundColor failed\n"); } } @@ -158,7 +158,7 @@ bool CImageTest::createWindow(void) m_bgWindow = getBgWindow(m_widgetControl); if (!m_bgWindow) { - message("CImageTest::createGraphics: Failed to create CBgWindow instance\n"); + printf("CImageTest::createGraphics: Failed to create CBgWindow instance\n"); delete m_widgetControl; return false; } @@ -168,7 +168,7 @@ bool CImageTest::createWindow(void) bool success = m_bgWindow->open(); if (!success) { - message("CImageTest::createGraphics: Failed to open background window\n"); + printf("CImageTest::createGraphics: Failed to open background window\n"); delete m_bgWindow; m_bgWindow = (CBgWindow*)0; return false; @@ -186,7 +186,7 @@ CImage *CImageTest::createImage(IBitmap *bitmap) struct nxgl_size_s windowSize; if (!m_bgWindow->getSize(&windowSize)) { - message("CImageTest::createGraphics: Failed to get window size\n"); + printf("CImageTest::createGraphics: Failed to get window size\n"); return (CImage *)NULL; } diff --git a/UnitTests/CImage/cimagetest.hxx b/UnitTests/CImage/cimagetest.hxx index 5b5901bb1..6bef55e4c 100644 --- a/UnitTests/CImage/cimagetest.hxx +++ b/UnitTests/CImage/cimagetest.hxx @@ -71,15 +71,6 @@ # define CONFIG_CIMAGETEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR #endif -// If debug is enabled, use the debug function, syslog() instead -// of printf() so that the output is synchronized. - -#ifdef CONFIG_DEBUG -# define message lowsyslog -#else -# define message printf -#endif - ///////////////////////////////////////////////////////////////////////////// // Public Classes ///////////////////////////////////////////////////////////////////////////// diff --git a/UnitTests/CKeypad/ckeypad_main.cxx b/UnitTests/CKeypad/ckeypad_main.cxx index c103da9ed..0056a8feb 100644 --- a/UnitTests/CKeypad/ckeypad_main.cxx +++ b/UnitTests/CKeypad/ckeypad_main.cxx @@ -97,8 +97,8 @@ static void updateMemoryUsage(unsigned int previous, /* Show the change from the previous time */ - message("%s: Before: %8d After: %8d Change: %8d\n", - msg, previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); + printf("%s: Before: %8d After: %8d Change: %8d\n", + msg, previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); /* Set up for the next test */ @@ -268,7 +268,7 @@ int ckeypad_main(int argc, char *argv[]) delete test; updateMemoryUsage(g_mmPrevious, "After deleting the test"); updateMemoryUsage(g_mmInitial, "Final memory usage"); - message("Peak memory usage: %8d\n", g_mmPeak - g_mmInitial); + printf("Peak memory usage: %8d\n", g_mmPeak - g_mmInitial); return 0; } diff --git a/UnitTests/CKeypad/ckeypadtest.cxx b/UnitTests/CKeypad/ckeypadtest.cxx index 62e01a93c..f6a1ca5e3 100644 --- a/UnitTests/CKeypad/ckeypadtest.cxx +++ b/UnitTests/CKeypad/ckeypadtest.cxx @@ -109,7 +109,7 @@ bool CKeypadTest::connect(void) if (!setBackgroundColor(CONFIG_CKEYPADTEST_BGCOLOR)) { - message("CKeypadTest::connect: setBackgroundColor failed\n"); + printf("CKeypadTest::connect: setBackgroundColor failed\n"); } } @@ -170,7 +170,7 @@ bool CKeypadTest::createWindow(void) m_bgWindow = getBgWindow(m_widgetControl); if (!m_bgWindow) { - message("CKeypadTest::createGraphics: Failed to create CBgWindow instance\n"); + printf("CKeypadTest::createGraphics: Failed to create CBgWindow instance\n"); delete m_widgetControl; return false; } @@ -180,7 +180,7 @@ bool CKeypadTest::createWindow(void) bool success = m_bgWindow->open(); if (!success) { - message("CKeypadTest::createGraphics: Failed to open background window\n"); + printf("CKeypadTest::createGraphics: Failed to open background window\n"); delete m_bgWindow; m_bgWindow = (CBgWindow*)0; return false; @@ -201,7 +201,7 @@ void CKeypadTest::setDisplaySize(void) struct nxgl_size_s windowSize; if (!m_bgWindow->getSize(&windowSize)) { - message("CKeypadTest::createGraphics: Failed to get window size\n"); + printf("CKeypadTest::createGraphics: Failed to get window size\n"); return; } @@ -248,7 +248,7 @@ CKeypad *CKeypadTest::createKeypad(void) struct nxgl_size_s windowSize; if (!m_bgWindow->getSize(&windowSize)) { - message("CKeypadTest::createGraphics: Failed to get window size\n"); + printf("CKeypadTest::createGraphics: Failed to get window size\n"); return (CKeypad *)NULL; } @@ -308,7 +308,7 @@ CTextBox *CKeypadTest::createTextBox(void) struct nxgl_size_s windowSize; if (!m_bgWindow->getSize(&windowSize)) { - message("CKeypadTest::createGraphics: Failed to get window size\n"); + printf("CKeypadTest::createGraphics: Failed to get window size\n"); return (CTextBox *)NULL; } diff --git a/UnitTests/CKeypad/ckeypadtest.hxx b/UnitTests/CKeypad/ckeypadtest.hxx index 12d7e18fa..200f40a1b 100644 --- a/UnitTests/CKeypad/ckeypadtest.hxx +++ b/UnitTests/CKeypad/ckeypadtest.hxx @@ -72,15 +72,6 @@ # define CONFIG_CKEYPADTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR #endif -// If debug is enabled, use the debug function, syslog() instead -// of printf() so that the output is synchronized. - -#ifdef CONFIG_DEBUG -# define message lowsyslog -#else -# define message printf -#endif - // This is the size of the keypad #define KEYPAD_NROWS 7 diff --git a/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx b/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx index 1b038412c..7b935a49c 100644 --- a/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx +++ b/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx @@ -133,8 +133,8 @@ static void updateMemoryUsage(unsigned int previous, /* Show the change from the previous time */ - message("%s: Before: %8d After: %8d Change: %8d\n", - msg, previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); + printf("%s: Before: %8d After: %8d Change: %8d\n", + msg, previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); /* Set up for the next test */ @@ -295,7 +295,7 @@ int clatchbuttonarray_main(int argc, char *argv[]) delete test; updateMemoryUsage(g_mmPrevious, "After deleting the test"); updateMemoryUsage(g_mmInitial, "Final memory usage"); - message("Peak memory usage: %8d\n", g_mmPeak - g_mmInitial); + printf("Peak memory usage: %8d\n", g_mmPeak - g_mmInitial); return 0; } diff --git a/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx b/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx index cf41c1608..0629bfdcc 100644 --- a/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx +++ b/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx @@ -103,7 +103,7 @@ bool CLatchButtonArrayTest::connect(void) if (!setBackgroundColor(CONFIG_CLATCHBUTTONARRAYTEST_BGCOLOR)) { - message("CLatchButtonArrayTest::connect: setBackgroundColor failed\n"); + printf("CLatchButtonArrayTest::connect: setBackgroundColor failed\n"); } } @@ -157,7 +157,7 @@ bool CLatchButtonArrayTest::createWindow(void) m_bgWindow = getBgWindow(m_widgetControl); if (!m_bgWindow) { - message("CLatchButtonArrayTest::createGraphics: Failed to create CBgWindow instance\n"); + printf("CLatchButtonArrayTest::createGraphics: Failed to create CBgWindow instance\n"); delete m_widgetControl; return false; } @@ -167,7 +167,7 @@ bool CLatchButtonArrayTest::createWindow(void) bool success = m_bgWindow->open(); if (!success) { - message("CLatchButtonArrayTest::createGraphics: Failed to open background window\n"); + printf("CLatchButtonArrayTest::createGraphics: Failed to open background window\n"); delete m_bgWindow; m_bgWindow = (CBgWindow*)0; return false; @@ -185,7 +185,7 @@ CLatchButtonArray *CLatchButtonArrayTest::createButtonArray(void) struct nxgl_size_s windowSize; if (!m_bgWindow->getSize(&windowSize)) { - message("CLatchButtonArrayTest::createGraphics: Failed to get window size\n"); + printf("CLatchButtonArrayTest::createGraphics: Failed to get window size\n"); return (CLatchButtonArray *)NULL; } diff --git a/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx b/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx index 80bf8fb71..43b5a7964 100644 --- a/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx +++ b/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx @@ -75,15 +75,6 @@ # define CONFIG_CLATCHBUTTONARRAYTEST_FONTCOLOR CONFIG_NXWIDGETS_DEFAULT_FONTCOLOR #endif -// If debug is enabled, use the debug function, syslog() instead -// of printf() so that the output is synchronized. - -#ifdef CONFIG_DEBUG -# define message lowsyslog -#else -# define message printf -#endif - // The geometry of the button array #define BUTTONARRAY_NCOLUMNS 4 diff --git a/UnitTests/CListBox/clistbox_main.cxx b/UnitTests/CListBox/clistbox_main.cxx index 5bbcb1da5..09938e0a2 100644 --- a/UnitTests/CListBox/clistbox_main.cxx +++ b/UnitTests/CListBox/clistbox_main.cxx @@ -133,8 +133,8 @@ static void updateMemoryUsage(unsigned int previous, /* Show the change from the previous time */ - message("%s: Before: %8d After: %8d Change: %8d\n", - msg, previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); + printf("%s: Before: %8d After: %8d Change: %8d\n", + msg, previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); /* Set up for the next test */ @@ -182,16 +182,16 @@ int clistbox_main(int argc, char *argv[]) // Create an instance of the listbox test - message("clistbox_main: Create CListBoxTest instance\n"); + printf("clistbox_main: Create CListBoxTest instance\n"); CListBoxTest *test = new CListBoxTest(); updateMemoryUsage(g_mmPrevious, "After creating CListBoxTest"); // Connect the NX server - message("clistbox_main: Connect the CListBoxTest instance to the NX server\n"); + printf("clistbox_main: Connect the CListBoxTest instance to the NX server\n"); if (!test->connect()) { - message("clistbox_main: Failed to connect the CListBoxTest instance to the NX server\n"); + printf("clistbox_main: Failed to connect the CListBoxTest instance to the NX server\n"); delete test; return 1; } @@ -199,10 +199,10 @@ int clistbox_main(int argc, char *argv[]) // Create a window to draw into - message("clistbox_main: Create a Window\n"); + printf("clistbox_main: Create a Window\n"); if (!test->createWindow()) { - message("clistbox_main: Failed to create a window\n"); + printf("clistbox_main: Failed to create a window\n"); delete test; return 1; } @@ -210,11 +210,11 @@ int clistbox_main(int argc, char *argv[]) // Create a listbox - message("clistbox_main: Create a ListBox\n"); + printf("clistbox_main: Create a ListBox\n"); CListBox *listbox = test->createListBox(); if (!listbox) { - message("clistbox_main: Failed to create a listbox\n"); + printf("clistbox_main: Failed to create a listbox\n"); delete test; return 1; } @@ -228,12 +228,12 @@ int clistbox_main(int argc, char *argv[]) // Now add items to the list box (in reverse alphabetical order) - message("clistbox_main: Add options to the ListBox\n"); + printf("clistbox_main: Add options to the ListBox\n"); for (int i = NOPTIONS - 1; i >= 0; i--) { listbox->addOption(g_options[i],i); test->showListBox(listbox); - message("clistbox_main: %d. New option %s\n", i, g_options[i]); + printf("clistbox_main: %d. New option %s\n", i, g_options[i]); usleep(500000); // The simulation needs this to let the X11 event loop run } updateMemoryUsage(g_mmPrevious, "clistbox_main: After adding the listbox items"); @@ -241,7 +241,7 @@ int clistbox_main(int argc, char *argv[]) // Sort the list box - message("clistbox_main: Sort the ListBox\n"); + printf("clistbox_main: Sort the ListBox\n"); listbox->sort(); test->showListBox(listbox); updateMemoryUsage(g_mmPrevious, "clistbox_main: After sorting the listbox"); @@ -253,16 +253,16 @@ int clistbox_main(int argc, char *argv[]) int nOptions; while ((nOptions = listbox->getOptionCount()) > 0) { - message("clistbox_main: Option count: %d\n", nOptions); + printf("clistbox_main: Option count: %d\n", nOptions); if (nOptions <= 5) { - message("clistbox_main: Selecting all remaining options\n"); + printf("clistbox_main: Selecting all remaining options\n"); listbox->selectAllOptions(); test->showListBox(listbox); updateMemoryUsage(g_mmPrevious, "clistbox_main: After selecting all options"); sleep(1); - message("clistbox_main: Removing all remaining options\n"); + printf("clistbox_main: Removing all remaining options\n"); listbox->removeAllOptions(); updateMemoryUsage(g_mmPrevious, "clistbox_main: After removing all options"); test->showListBox(listbox); @@ -271,37 +271,37 @@ int clistbox_main(int argc, char *argv[]) { int selected[5]; - message("clistbox_main: Selecting five options\n"); + printf("clistbox_main: Selecting five options\n"); for (int i = 0; i < 5; i++) { selected[i] = ((nOptions - 1) * rand()) / MAX_RAND; - message("clistbox_main: Selecting option %d\n", selected[i]); + printf("clistbox_main: Selecting option %d\n", selected[i]); listbox->removeOption(selected[i]); test->showListBox(listbox); usleep(500000); } updateMemoryUsage(g_mmPrevious, "clistbox_main: After selecting five options"); - message("clistbox_main: De-selecting options\n"); + printf("clistbox_main: De-selecting options\n"); int index; int count = 0; while ((index = listbox->getSelectedIndex()) >= 0) { - message("clistbox_main: De-selecting option %d\n", index); + printf("clistbox_main: De-selecting option %d\n", index); listbox->deselectOption(index); test->showListBox(listbox); count++; usleep(500000); } - message("clistbox_main: %s: %d options de-selected\n", + printf("clistbox_main: %s: %d options de-selected\n", count == 5 ? "OK" : "ERROR", count); updateMemoryUsage(g_mmPrevious, "clistbox_main: After de-selecting options"); - message("clistbox_main: Removing the selected options\n"); + printf("clistbox_main: Removing the selected options\n"); for (int i = 0; i < 5; i++) { - message("clistbox_main: Removing option %d\n", selected[i]); + printf("clistbox_main: Removing option %d\n", selected[i]); listbox->removeOption(selected[i]); test->showListBox(listbox); usleep(500000); @@ -315,13 +315,13 @@ int clistbox_main(int argc, char *argv[]) // Clean up and exit - message("clistbox_main: Clean-up and exit\n"); + printf("clistbox_main: Clean-up and exit\n"); delete listbox; updateMemoryUsage(g_mmPrevious, "After deleting the listbox"); delete test; updateMemoryUsage(g_mmPrevious, "After deleting the test"); updateMemoryUsage(g_mmInitial, "Final memory usage"); - message("Peak memory usage: %8d\n", g_mmPeak - g_mmInitial); + printf("Peak memory usage: %8d\n", g_mmPeak - g_mmInitial); return 0; } diff --git a/UnitTests/CListBox/clistboxtest.cxx b/UnitTests/CListBox/clistboxtest.cxx index cd41dacc7..92c784573 100644 --- a/UnitTests/CListBox/clistboxtest.cxx +++ b/UnitTests/CListBox/clistboxtest.cxx @@ -105,7 +105,7 @@ bool CListBoxTest::connect(void) if (!setBackgroundColor(CONFIG_CLISTBOXTEST_BGCOLOR)) { - message("CListBoxTest::connect: setBackgroundColor failed\n"); + printf("CListBoxTest::connect: setBackgroundColor failed\n"); } } @@ -161,7 +161,7 @@ bool CListBoxTest::createWindow(void) m_bgWindow = getBgWindow(m_widgetControl); if (!m_bgWindow) { - message("CListBoxTest::createWindow: Failed to create CBgWindow instance\n"); + printf("CListBoxTest::createWindow: Failed to create CBgWindow instance\n"); disconnect(); return false; } @@ -171,7 +171,7 @@ bool CListBoxTest::createWindow(void) bool success = m_bgWindow->open(); if (!success) { - message("CListBoxTest::createWindow: Failed to open background window\n"); + printf("CListBoxTest::createWindow: Failed to open background window\n"); disconnect(); return false; } diff --git a/UnitTests/CListBox/clistboxtest.hxx b/UnitTests/CListBox/clistboxtest.hxx index dfe179503..d7c51421b 100644 --- a/UnitTests/CListBox/clistboxtest.hxx +++ b/UnitTests/CListBox/clistboxtest.hxx @@ -69,15 +69,6 @@ # define CONFIG_CLISTBOXTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR #endif -// If debug is enabled, use the debug function, syslog() instead -// of printf() so that the output is synchronized. - -#ifdef CONFIG_DEBUG -# define message lowsyslog -#else -# define message printf -#endif - ///////////////////////////////////////////////////////////////////////////// // Public Classes ///////////////////////////////////////////////////////////////////////////// diff --git a/UnitTests/CProgressBar/cprogressbar_main.cxx b/UnitTests/CProgressBar/cprogressbar_main.cxx index 4343d887c..746866ee5 100644 --- a/UnitTests/CProgressBar/cprogressbar_main.cxx +++ b/UnitTests/CProgressBar/cprogressbar_main.cxx @@ -98,9 +98,9 @@ static void updateMemoryUsage(unsigned int previous, /* Show the change from the previous time */ - message("\n%s:\n", msg); - message(" Before: %8d After: %8d Change: %8d\n\n", - previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); + printf("\n%s:\n", msg); + printf(" Before: %8d After: %8d Change: %8d\n\n", + previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); /* Set up for the next test */ @@ -143,16 +143,16 @@ int cprogressbar_main(int argc, char *argv[]) // Create an instance of the checkbox test - message("cprogressbar_main: Create CProgressBarTest instance\n"); + printf("cprogressbar_main: Create CProgressBarTest instance\n"); CProgressBarTest *test = new CProgressBarTest(); updateMemoryUsage(g_mmprevious, "After creating CProgressBarTest"); // Connect the NX server - message("cprogressbar_main: Connect the CProgressBarTest instance to the NX server\n"); + printf("cprogressbar_main: Connect the CProgressBarTest instance to the NX server\n"); if (!test->connect()) { - message("cprogressbar_main: Failed to connect the CProgressBarTest instance to the NX server\n"); + printf("cprogressbar_main: Failed to connect the CProgressBarTest instance to the NX server\n"); delete test; return 1; } @@ -160,10 +160,10 @@ int cprogressbar_main(int argc, char *argv[]) // Create a window to draw into - message("cprogressbar_main: Create a Window\n"); + printf("cprogressbar_main: Create a Window\n"); if (!test->createWindow()) { - message("cprogressbar_main: Failed to create a window\n"); + printf("cprogressbar_main: Failed to create a window\n"); delete test; return 1; } @@ -171,11 +171,11 @@ int cprogressbar_main(int argc, char *argv[]) // Create a progress bar - message("cprogressbar_main: Create a ProgressBar\n"); + printf("cprogressbar_main: Create a ProgressBar\n"); CProgressBar *bar = test->createProgressBar(); if (!bar) { - message("cprogressbar_main: Failed to create a progress bar\n"); + printf("cprogressbar_main: Failed to create a progress bar\n"); delete test; return 1; } @@ -187,9 +187,9 @@ int cprogressbar_main(int argc, char *argv[]) bar->setMaximumValue(MAX_PROGRESSBAR); bar->setValue(0); bar->hidePercentageText(); - message("cprogressbar_main: ProgressBar range %d->%d Initial value %d\n", - bar->getMinimumValue(), bar->getMaximumValue(), - bar->getValue()); + printf("cprogressbar_main: ProgressBar range %d->%d Initial value %d\n", + bar->getMinimumValue(), bar->getMaximumValue(), + bar->getValue()); // Show the initial state of the checkbox @@ -202,7 +202,7 @@ int cprogressbar_main(int argc, char *argv[]) { bar->setValue(i); test->showProgressBar(bar); - message("cprogressbar_main: %d. New value %d\n", i, bar->getValue()); + printf("cprogressbar_main: %d. New value %d\n", i, bar->getValue()); usleep(1000); // The simulation needs this to let the X11 event loop run } updateMemoryUsage(g_mmprevious, "cprogressbar_main: After moving the progress bar up #1"); @@ -219,7 +219,7 @@ int cprogressbar_main(int argc, char *argv[]) { bar->setValue(i); test->showProgressBar(bar); - message("cprogressbar_main: %d. New value %d\n", i, bar->getValue()); + printf("cprogressbar_main: %d. New value %d\n", i, bar->getValue()); usleep(1000); // The simulation needs this to let the X11 event loop run } updateMemoryUsage(g_mmprevious, "cprogressbar_main: After moving the progress bar up #2"); @@ -227,7 +227,7 @@ int cprogressbar_main(int argc, char *argv[]) // Clean up and exit - message("cprogressbar_main: Clean-up and exit\n"); + printf("cprogressbar_main: Clean-up and exit\n"); delete bar; updateMemoryUsage(g_mmprevious, "After deleting the progress bar"); delete test; diff --git a/UnitTests/CProgressBar/cprogressbartest.cxx b/UnitTests/CProgressBar/cprogressbartest.cxx index 60821d751..2e1108fd9 100644 --- a/UnitTests/CProgressBar/cprogressbartest.cxx +++ b/UnitTests/CProgressBar/cprogressbartest.cxx @@ -105,7 +105,7 @@ bool CProgressBarTest::connect(void) if (!setBackgroundColor(CONFIG_CPROGRESSBARTEST_BGCOLOR)) { - message("CProgressBarTest::connect: setBackgroundColor failed\n"); + printf("CProgressBarTest::connect: setBackgroundColor failed\n"); } } @@ -161,7 +161,7 @@ bool CProgressBarTest::createWindow(void) m_bgWindow = getBgWindow(m_widgetControl); if (!m_bgWindow) { - message("CProgressBarTest::createWindow: Failed to create CBgWindow instance\n"); + printf("CProgressBarTest::createWindow: Failed to create CBgWindow instance\n"); disconnect(); return false; } @@ -171,7 +171,7 @@ bool CProgressBarTest::createWindow(void) bool success = m_bgWindow->open(); if (!success) { - message("CProgressBarTest::createWindow: Failed to open background window\n"); + printf("CProgressBarTest::createWindow: Failed to open background window\n"); disconnect(); return false; } diff --git a/UnitTests/CProgressBar/cprogressbartest.hxx b/UnitTests/CProgressBar/cprogressbartest.hxx index 2223d8081..3d1f3c527 100644 --- a/UnitTests/CProgressBar/cprogressbartest.hxx +++ b/UnitTests/CProgressBar/cprogressbartest.hxx @@ -69,15 +69,6 @@ # define CONFIG_CPROGRESSBARTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR #endif -// If debug is enabled, use the debug function, syslog() instead -// of printf() so that the output is synchronized. - -#ifdef CONFIG_DEBUG -# define message lowsyslog -#else -# define message printf -#endif - ///////////////////////////////////////////////////////////////////////////// // Public Classes ///////////////////////////////////////////////////////////////////////////// diff --git a/UnitTests/CRadioButton/cradiobutton_main.cxx b/UnitTests/CRadioButton/cradiobutton_main.cxx index f2dc30844..bbb400404 100644 --- a/UnitTests/CRadioButton/cradiobutton_main.cxx +++ b/UnitTests/CRadioButton/cradiobutton_main.cxx @@ -98,9 +98,9 @@ static void updateMemoryUsage(unsigned int previous, /* Show the change from the previous time */ - message("\n%s:\n", msg); - message(" Before: %8d After: %8d Change: %8d\n\n", - previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); + printf("\n%s:\n", msg); + printf(" Before: %8d After: %8d Change: %8d\n\n", + previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); /* Set up for the next test */ @@ -143,16 +143,16 @@ int cradiobutton_main(int argc, char *argv[]) // Create an instance of the radio button test - message("cradiobutton_main: Create CRadioButtonTest instance\n"); + printf("cradiobutton_main: Create CRadioButtonTest instance\n"); CRadioButtonTest *test = new CRadioButtonTest(); updateMemoryUsage(g_mmprevious, "After creating CRadioButtonTest"); // Connect the NX server - message("cradiobutton_main: Connect the CRadioButtonTest instance to the NX server\n"); + printf("cradiobutton_main: Connect the CRadioButtonTest instance to the NX server\n"); if (!test->connect()) { - message("cradiobutton_main: Failed to connect the CRadioButtonTest instance to the NX server\n"); + printf("cradiobutton_main: Failed to connect the CRadioButtonTest instance to the NX server\n"); delete test; return 1; } @@ -160,10 +160,10 @@ int cradiobutton_main(int argc, char *argv[]) // Create a window to draw into - message("cradiobutton_main: Create a Window\n"); + printf("cradiobutton_main: Create a Window\n"); if (!test->createWindow()) { - message("cradiobutton_main: Failed to create a window\n"); + printf("cradiobutton_main: Failed to create a window\n"); delete test; return 1; } @@ -174,7 +174,7 @@ int cradiobutton_main(int argc, char *argv[]) CRadioButton *button1 = test->newRadioButton(); if (!button1) { - message("cradiobutton_main: Failed to create radio button 1\n"); + printf("cradiobutton_main: Failed to create radio button 1\n"); delete test; return 1; } @@ -183,7 +183,7 @@ int cradiobutton_main(int argc, char *argv[]) CRadioButton *button2 = test->newRadioButton(); if (!button2) { - message("cradiobutton_main: Failed to create radio button 2\n"); + printf("cradiobutton_main: Failed to create radio button 2\n"); delete test; return 1; } @@ -192,7 +192,7 @@ int cradiobutton_main(int argc, char *argv[]) CRadioButton *button3 = test->newRadioButton(); if (!button3) { - message("cradiobutton_main: Failed to create radio button 3\n"); + printf("cradiobutton_main: Failed to create radio button 3\n"); delete test; return 1; } @@ -206,21 +206,21 @@ int cradiobutton_main(int argc, char *argv[]) // Now push some buttons - message("cradiobutton_main: Pushing button 1\n"); + printf("cradiobutton_main: Pushing button 1\n"); test->pushButton(button1); usleep(500*1000); test->showButtonState(); updateMemoryUsage(g_mmprevious, "After pushing button 1"); usleep(500*1000); - message("cradiobutton_main: Pushing button 2\n"); + printf("cradiobutton_main: Pushing button 2\n"); test->pushButton(button2); usleep(500*1000); test->showButtonState(); updateMemoryUsage(g_mmprevious, "After pushing button 2"); usleep(500*1000); - message("cradiobutton_main: Pushing button 3\n"); + printf("cradiobutton_main: Pushing button 3\n"); test->pushButton(button3); usleep(500*1000); test->showButtonState(); @@ -229,7 +229,7 @@ int cradiobutton_main(int argc, char *argv[]) // Clean up and exit - message("cradiobutton_main: Clean-up and exit\n"); + printf("cradiobutton_main: Clean-up and exit\n"); delete test; updateMemoryUsage(g_mmprevious, "After deleting the test"); updateMemoryUsage(g_mmInitial, "Final memory usage"); diff --git a/UnitTests/CRadioButton/cradiobuttontest.cxx b/UnitTests/CRadioButton/cradiobuttontest.cxx index 5c1d2966e..bfcdd1c9f 100644 --- a/UnitTests/CRadioButton/cradiobuttontest.cxx +++ b/UnitTests/CRadioButton/cradiobuttontest.cxx @@ -112,7 +112,7 @@ bool CRadioButtonTest::connect(void) if (!setBackgroundColor(CONFIG_CRADIOBUTTONTEST_BGCOLOR)) { - message("CRadioButtonTest::connect: setBackgroundColor failed\n"); + printf("CRadioButtonTest::connect: setBackgroundColor failed\n"); } } @@ -174,7 +174,7 @@ bool CRadioButtonTest::createWindow(void) m_bgWindow = getBgWindow(m_widgetControl); if (!m_bgWindow) { - message("CRadioButtonTest::createGraphics: Failed to create CBgWindow instance\n"); + printf("CRadioButtonTest::createGraphics: Failed to create CBgWindow instance\n"); delete m_widgetControl; return false; } @@ -184,7 +184,7 @@ bool CRadioButtonTest::createWindow(void) bool success = m_bgWindow->open(); if (!success) { - message("CRadioButtonTest::createGraphics: Failed to open background window\n"); + printf("CRadioButtonTest::createGraphics: Failed to open background window\n"); delete m_bgWindow; m_bgWindow = (CBgWindow*)0; return false; @@ -202,7 +202,7 @@ CRadioButton *CRadioButtonTest::newRadioButton(void) struct nxgl_size_s windowSize; if (!m_bgWindow->getSize(&windowSize)) { - message("CRadioButtonTest::newRadioButton: Failed to get window size\n"); + printf("CRadioButtonTest::newRadioButton: Failed to get window size\n"); return (CRadioButton *)NULL; } @@ -219,7 +219,7 @@ CRadioButton *CRadioButtonTest::newRadioButton(void) m_radioButtonGroup = new CRadioButtonGroup(m_widgetControl, groupX, groupY); if (!m_radioButtonGroup) { - message("CRadioButtonTest::newRadioButton: Failed to create the radio button group\n"); + printf("CRadioButtonTest::newRadioButton: Failed to create the radio button group\n"); return (CRadioButton *)NULL; } } @@ -296,10 +296,10 @@ void CRadioButtonTest::showButtonState(void) int index = m_radioButtonGroup->getSelectedIndex(); if (index < 0) { - message("CRadioButtonTest::showButtonState No button is pressed\n"); + printf("CRadioButtonTest::showButtonState No button is pressed\n"); } else { - message("CRadioButtonTest::showButtonState button%d is selected\n", index+1); + printf("CRadioButtonTest::showButtonState button%d is selected\n", index+1); } } diff --git a/UnitTests/CRadioButton/cradiobuttontest.hxx b/UnitTests/CRadioButton/cradiobuttontest.hxx index 3f81371db..a7464a1c9 100644 --- a/UnitTests/CRadioButton/cradiobuttontest.hxx +++ b/UnitTests/CRadioButton/cradiobuttontest.hxx @@ -70,15 +70,6 @@ # define CONFIG_CRADIOBUTTONTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR #endif -// If debug is enabled, use the debug function, syslog() instead -// of printf() so that the output is synchronized. - -#ifdef CONFIG_DEBUG -# define message lowsyslog -#else -# define message printf -#endif - ///////////////////////////////////////////////////////////////////////////// // Public Classes ///////////////////////////////////////////////////////////////////////////// diff --git a/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx b/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx index f9c322299..da919612c 100644 --- a/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx +++ b/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx @@ -98,9 +98,9 @@ static void updateMemoryUsage(unsigned int previous, /* Show the change from the previous time */ - message("\n%s:\n", msg); - message(" Before: %8d After: %8d Change: %8d\n\n", - previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); + printf("\n%s:\n", msg); + printf(" Before: %8d After: %8d Change: %8d\n\n", + previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); /* Set up for the next test */ @@ -143,16 +143,16 @@ int cscrollbarhorizontal_main(int argc, char *argv[]) // Create an instance of the checkbox test - message("cscrollbarhorizontal_main: Create CScrollbarHorizontalTest instance\n"); + printf("cscrollbarhorizontal_main: Create CScrollbarHorizontalTest instance\n"); CScrollbarHorizontalTest *test = new CScrollbarHorizontalTest(); updateMemoryUsage(g_mmprevious, "After creating CScrollbarHorizontalTest"); // Connect the NX server - message("cscrollbarhorizontal_main: Connect the CScrollbarHorizontalTest instance to the NX server\n"); + printf("cscrollbarhorizontal_main: Connect the CScrollbarHorizontalTest instance to the NX server\n"); if (!test->connect()) { - message("cscrollbarhorizontal_main: Failed to connect the CScrollbarHorizontalTest instance to the NX server\n"); + printf("cscrollbarhorizontal_main: Failed to connect the CScrollbarHorizontalTest instance to the NX server\n"); delete test; return 1; } @@ -160,10 +160,10 @@ int cscrollbarhorizontal_main(int argc, char *argv[]) // Create a window to draw into - message("cscrollbarhorizontal_main: Create a Window\n"); + printf("cscrollbarhorizontal_main: Create a Window\n"); if (!test->createWindow()) { - message("cscrollbarhorizontal_main: Failed to create a window\n"); + printf("cscrollbarhorizontal_main: Failed to create a window\n"); delete test; return 1; } @@ -171,11 +171,11 @@ int cscrollbarhorizontal_main(int argc, char *argv[]) // Create a scrollbar - message("cscrollbarhorizontal_main: Create a Scrollbar\n"); + printf("cscrollbarhorizontal_main: Create a Scrollbar\n"); CScrollbarHorizontal *scrollbar = test->createScrollbar(); if (!scrollbar) { - message("cscrollbarhorizontal_main: Failed to create a scrollbar\n"); + printf("cscrollbarhorizontal_main: Failed to create a scrollbar\n"); delete test; return 1; } @@ -186,9 +186,9 @@ int cscrollbarhorizontal_main(int argc, char *argv[]) scrollbar->setMinimumValue(0); scrollbar->setMaximumValue(MAX_SCROLLBAR); scrollbar->setValue(0); - message("cscrollbarhorizontal_main: Scrollbar range %d->%d Initial value %d\n", - scrollbar->getMinimumValue(), scrollbar->getMaximumValue(), - scrollbar->getValue()); + printf("cscrollbarhorizontal_main: Scrollbar range %d->%d Initial value %d\n", + scrollbar->getMinimumValue(), scrollbar->getMaximumValue(), + scrollbar->getValue()); // Show the initial state of the checkbox @@ -201,7 +201,7 @@ int cscrollbarhorizontal_main(int argc, char *argv[]) { scrollbar->setValue(i); test->showScrollbar(scrollbar); - message("cscrollbarhorizontal_main: %d. New value %d\n", i, scrollbar->getValue()); + printf("cscrollbarhorizontal_main: %d. New value %d\n", i, scrollbar->getValue()); usleep(1000); // The simulation needs this to let the X11 event loop run } updateMemoryUsage(g_mmprevious, "cscrollbarhorizontal_main: After moving the scrollbar up"); @@ -212,7 +212,7 @@ int cscrollbarhorizontal_main(int argc, char *argv[]) { scrollbar->setValue(i); test->showScrollbar(scrollbar); - message("cscrollbarhorizontal_main: %d. New value %d\n", i, scrollbar->getValue()); + printf("cscrollbarhorizontal_main: %d. New value %d\n", i, scrollbar->getValue()); usleep(1000); // The simulation needs this to let the X11 event loop run } updateMemoryUsage(g_mmprevious, "cscrollbarhorizontal_main: After moving the scrollbar down"); @@ -220,7 +220,7 @@ int cscrollbarhorizontal_main(int argc, char *argv[]) // Clean up and exit - message("cscrollbarhorizontal_main: Clean-up and exit\n"); + printf("cscrollbarhorizontal_main: Clean-up and exit\n"); delete scrollbar; updateMemoryUsage(g_mmprevious, "After deleting the scrollbar"); delete test; diff --git a/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx b/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx index 06673f080..42571a574 100644 --- a/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx +++ b/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx @@ -105,7 +105,7 @@ bool CScrollbarHorizontalTest::connect(void) if (!setBackgroundColor(CONFIG_CSCROLLBARHORIZONTALTEST_BGCOLOR)) { - message("CScrollbarHorizontalTest::connect: setBackgroundColor failed\n"); + printf("CScrollbarHorizontalTest::connect: setBackgroundColor failed\n"); } } @@ -161,7 +161,7 @@ bool CScrollbarHorizontalTest::createWindow(void) m_bgWindow = getBgWindow(m_widgetControl); if (!m_bgWindow) { - message("CScrollbarHorizontalTest::createWindow: Failed to create CBgWindow instance\n"); + printf("CScrollbarHorizontalTest::createWindow: Failed to create CBgWindow instance\n"); disconnect(); return false; } @@ -171,7 +171,7 @@ bool CScrollbarHorizontalTest::createWindow(void) bool success = m_bgWindow->open(); if (!success) { - message("CScrollbarHorizontalTest::createWindow: Failed to open background window\n"); + printf("CScrollbarHorizontalTest::createWindow: Failed to open background window\n"); disconnect(); return false; } diff --git a/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx b/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx index 30f66ca45..7047eb861 100644 --- a/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx +++ b/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx @@ -69,15 +69,6 @@ # define CONFIG_CSCROLLBARHORIZONTALTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR #endif -// If debug is enabled, use the debug function, syslog() instead -// of printf() so that the output is synchronized. - -#ifdef CONFIG_DEBUG -# define message lowsyslog -#else -# define message printf -#endif - ///////////////////////////////////////////////////////////////////////////// // Public Classes ///////////////////////////////////////////////////////////////////////////// diff --git a/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx b/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx index 2bcb3f0d1..64bc5e732 100644 --- a/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx +++ b/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx @@ -98,9 +98,9 @@ static void updateMemoryUsage(unsigned int previous, /* Show the change from the previous time */ - message("\n%s:\n", msg); - message(" Before: %8d After: %8d Change: %8d\n\n", - previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); + printf("\n%s:\n", msg); + printf(" Before: %8d After: %8d Change: %8d\n\n", + previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); /* Set up for the next test */ @@ -143,16 +143,16 @@ int cscrollbarvertical_main(int argc, char *argv[]) // Create an instance of the checkbox test - message("cscrollbarvertical_main: Create CScrollbarVerticalTest instance\n"); + printf("cscrollbarvertical_main: Create CScrollbarVerticalTest instance\n"); CScrollbarVerticalTest *test = new CScrollbarVerticalTest(); updateMemoryUsage(g_mmprevious, "After creating CScrollbarVerticalTest"); // Connect the NX server - message("cscrollbarvertical_main: Connect the CScrollbarVerticalTest instance to the NX server\n"); + printf("cscrollbarvertical_main: Connect the CScrollbarVerticalTest instance to the NX server\n"); if (!test->connect()) { - message("cscrollbarvertical_main: Failed to connect the CScrollbarVerticalTest instance to the NX server\n"); + printf("cscrollbarvertical_main: Failed to connect the CScrollbarVerticalTest instance to the NX server\n"); delete test; return 1; } @@ -160,10 +160,10 @@ int cscrollbarvertical_main(int argc, char *argv[]) // Create a window to draw into - message("cscrollbarvertical_main: Create a Window\n"); + printf("cscrollbarvertical_main: Create a Window\n"); if (!test->createWindow()) { - message("cscrollbarvertical_main: Failed to create a window\n"); + printf("cscrollbarvertical_main: Failed to create a window\n"); delete test; return 1; } @@ -171,11 +171,11 @@ int cscrollbarvertical_main(int argc, char *argv[]) // Create a scrollbar - message("cscrollbarvertical_main: Create a Scrollbar\n"); + printf("cscrollbarvertical_main: Create a Scrollbar\n"); CScrollbarVertical *scrollbar = test->createScrollbar(); if (!scrollbar) { - message("cscrollbarvertical_main: Failed to create a scrollbar\n"); + printf("cscrollbarvertical_main: Failed to create a scrollbar\n"); delete test; return 1; } @@ -186,9 +186,9 @@ int cscrollbarvertical_main(int argc, char *argv[]) scrollbar->setMinimumValue(0); scrollbar->setMaximumValue(MAX_SCROLLBAR); scrollbar->setValue(0); - message("cscrollbarvertical_main: Scrollbar range %d->%d Initial value %d\n", - scrollbar->getMinimumValue(), scrollbar->getMaximumValue(), - scrollbar->getValue()); + printf("cscrollbarvertical_main: Scrollbar range %d->%d Initial value %d\n", + scrollbar->getMinimumValue(), scrollbar->getMaximumValue(), + scrollbar->getValue()); // Show the initial state of the checkbox @@ -201,7 +201,7 @@ int cscrollbarvertical_main(int argc, char *argv[]) { scrollbar->setValue(i); test->showScrollbar(scrollbar); - message("cscrollbarvertical_main: %d. New value %d\n", i, scrollbar->getValue()); + printf("cscrollbarvertical_main: %d. New value %d\n", i, scrollbar->getValue()); usleep(1000); // The simulation needs this to let the X11 event loop run } updateMemoryUsage(g_mmprevious, "cscrollbarvertical_main: After moving the scrollbar up"); @@ -212,7 +212,7 @@ int cscrollbarvertical_main(int argc, char *argv[]) { scrollbar->setValue(i); test->showScrollbar(scrollbar); - message("cscrollbarvertical_main: %d. New value %d\n", i, scrollbar->getValue()); + printf("cscrollbarvertical_main: %d. New value %d\n", i, scrollbar->getValue()); usleep(5000); // The simulation needs this to let the X11 event loop run } updateMemoryUsage(g_mmprevious, "cscrollbarvertical_main: After moving the scrollbar down"); @@ -220,7 +220,7 @@ int cscrollbarvertical_main(int argc, char *argv[]) // Clean up and exit - message("cscrollbarvertical_main: Clean-up and exit\n"); + printf("cscrollbarvertical_main: Clean-up and exit\n"); delete scrollbar; updateMemoryUsage(g_mmprevious, "After deleting the scrollbar"); delete test; diff --git a/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx b/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx index df317adcd..cb642a992 100644 --- a/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx +++ b/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx @@ -105,7 +105,7 @@ bool CScrollbarVerticalTest::connect(void) if (!setBackgroundColor(CONFIG_CSCROLLBARVERTICALTEST_BGCOLOR)) { - message("CScrollbarVerticalTest::connect: setBackgroundColor failed\n"); + printf("CScrollbarVerticalTest::connect: setBackgroundColor failed\n"); } } @@ -161,7 +161,7 @@ bool CScrollbarVerticalTest::createWindow(void) m_bgWindow = getBgWindow(m_widgetControl); if (!m_bgWindow) { - message("CScrollbarVerticalTest::createWindow: Failed to create CBgWindow instance\n"); + printf("CScrollbarVerticalTest::createWindow: Failed to create CBgWindow instance\n"); disconnect(); return false; } @@ -171,7 +171,7 @@ bool CScrollbarVerticalTest::createWindow(void) bool success = m_bgWindow->open(); if (!success) { - message("CScrollbarVerticalTest::createWindow: Failed to open background window\n"); + printf("CScrollbarVerticalTest::createWindow: Failed to open background window\n"); disconnect(); return false; } diff --git a/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx b/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx index 6323b0f26..2a87449db 100644 --- a/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx +++ b/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx @@ -69,15 +69,6 @@ # define CONFIG_CSCROLLBARVERTICALTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR #endif -// If debug is enabled, use the debug function, syslog() instead -// of printf() so that the output is synchronized. - -#ifdef CONFIG_DEBUG -# define message lowsyslog -#else -# define message printf -#endif - ///////////////////////////////////////////////////////////////////////////// // Public Classes ///////////////////////////////////////////////////////////////////////////// diff --git a/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx b/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx index fc57ab98c..0d63ed20a 100644 --- a/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx +++ b/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx @@ -98,9 +98,9 @@ static void updateMemoryUsage(unsigned int previous, /* Show the change from the previous time */ - message("\n%s:\n", msg); - message(" Before: %8d After: %8d Change: %8d\n\n", - previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); + printf("\n%s:\n", msg); + printf(" Before: %8d After: %8d Change: %8d\n\n", + previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); /* Set up for the next test */ @@ -143,16 +143,16 @@ int csliderhorizontal_main(int argc, char *argv[]) // Create an instance of the checkbox test - message("csliderhorizontal_main: Create CSliderHorizontalTest instance\n"); + printf("csliderhorizontal_main: Create CSliderHorizontalTest instance\n"); CSliderHorizontalTest *test = new CSliderHorizontalTest(); updateMemoryUsage(g_mmprevious, "After creating CSliderHorizontalTest"); // Connect the NX server - message("csliderhorizontal_main: Connect the CSliderHorizontalTest instance to the NX server\n"); + printf("csliderhorizontal_main: Connect the CSliderHorizontalTest instance to the NX server\n"); if (!test->connect()) { - message("csliderhorizontal_main: Failed to connect the CSliderHorizontalTest instance to the NX server\n"); + printf("csliderhorizontal_main: Failed to connect the CSliderHorizontalTest instance to the NX server\n"); delete test; return 1; } @@ -160,10 +160,10 @@ int csliderhorizontal_main(int argc, char *argv[]) // Create a window to draw into - message("csliderhorizontal_main: Create a Window\n"); + printf("csliderhorizontal_main: Create a Window\n"); if (!test->createWindow()) { - message("csliderhorizontal_main: Failed to create a window\n"); + printf("csliderhorizontal_main: Failed to create a window\n"); delete test; return 1; } @@ -171,11 +171,11 @@ int csliderhorizontal_main(int argc, char *argv[]) // Create a slider - message("csliderhorizontal_main: Create a Slider\n"); + printf("csliderhorizontal_main: Create a Slider\n"); CSliderHorizontal *slider = test->createSlider(); if (!slider) { - message("csliderhorizontal_main: Failed to create a slider\n"); + printf("csliderhorizontal_main: Failed to create a slider\n"); delete test; return 1; } @@ -186,9 +186,9 @@ int csliderhorizontal_main(int argc, char *argv[]) slider->setMinimumValue(0); slider->setMaximumValue(MAX_SLIDER); slider->setValue(0); - message("csliderhorizontal_main: Slider range %d->%d Initial value %d\n", - slider->getMinimumValue(), slider->getMaximumValue(), - slider->getValue()); + printf("csliderhorizontal_main: Slider range %d->%d Initial value %d\n", + slider->getMinimumValue(), slider->getMaximumValue(), + slider->getValue()); // Show the initial state of the checkbox @@ -201,7 +201,7 @@ int csliderhorizontal_main(int argc, char *argv[]) { slider->setValue(i); test->showSlider(slider); - message("csliderhorizontal_main: %d. New value %d\n", i, slider->getValue()); + printf("csliderhorizontal_main: %d. New value %d\n", i, slider->getValue()); usleep(1000); // The simulation needs this to let the X11 event loop run } updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After moving the slider up"); @@ -212,7 +212,7 @@ int csliderhorizontal_main(int argc, char *argv[]) { slider->setValue(i); test->showSlider(slider); - message("csliderhorizontal_main: %d. New value %d\n", i, slider->getValue()); + printf("csliderhorizontal_main: %d. New value %d\n", i, slider->getValue()); usleep(1000); // The simulation needs this to let the X11 event loop run } updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After moving the slider down"); @@ -220,7 +220,7 @@ int csliderhorizontal_main(int argc, char *argv[]) // Clean up and exit - message("csliderhorizontal_main: Clean-up and exit\n"); + printf("csliderhorizontal_main: Clean-up and exit\n"); delete slider; updateMemoryUsage(g_mmprevious, "After deleting the slider"); delete test; diff --git a/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx b/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx index 1687448db..581478841 100644 --- a/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx +++ b/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx @@ -105,7 +105,7 @@ bool CSliderHorizontalTest::connect(void) if (!setBackgroundColor(CONFIG_CSLIDERHORIZONTALTEST_BGCOLOR)) { - message("CSliderHorizontalTest::connect: setBackgroundColor failed\n"); + printf("CSliderHorizontalTest::connect: setBackgroundColor failed\n"); } } @@ -161,7 +161,7 @@ bool CSliderHorizontalTest::createWindow(void) m_bgWindow = getBgWindow(m_widgetControl); if (!m_bgWindow) { - message("CSliderHorizontalTest::createWindow: Failed to create CBgWindow instance\n"); + printf("CSliderHorizontalTest::createWindow: Failed to create CBgWindow instance\n"); disconnect(); return false; } @@ -171,7 +171,7 @@ bool CSliderHorizontalTest::createWindow(void) bool success = m_bgWindow->open(); if (!success) { - message("CSliderHorizontalTest::createWindow: Failed to open background window\n"); + printf("CSliderHorizontalTest::createWindow: Failed to open background window\n"); disconnect(); return false; } diff --git a/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx b/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx index fd333af5c..8d5db0772 100644 --- a/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx +++ b/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx @@ -69,15 +69,6 @@ # define CONFIG_CSLIDERHORIZONTALTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR #endif -// If debug is enabled, use the debug function, syslog() instead -// of printf() so that the output is synchronized. - -#ifdef CONFIG_DEBUG -# define message lowsyslog -#else -# define message printf -#endif - ///////////////////////////////////////////////////////////////////////////// // Public Classes ///////////////////////////////////////////////////////////////////////////// diff --git a/UnitTests/CSliderVertical/cslidervertical_main.cxx b/UnitTests/CSliderVertical/cslidervertical_main.cxx index cc106cbf0..966ecb85d 100644 --- a/UnitTests/CSliderVertical/cslidervertical_main.cxx +++ b/UnitTests/CSliderVertical/cslidervertical_main.cxx @@ -98,9 +98,9 @@ static void updateMemoryUsage(unsigned int previous, /* Show the change from the previous time */ - message("\n%s:\n", msg); - message(" Before: %8d After: %8d Change: %8d\n\n", - previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); + printf("\n%s:\n", msg); + printf(" Before: %8d After: %8d Change: %8d\n\n", + previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); /* Set up for the next test */ @@ -143,16 +143,16 @@ int cslidervertical_main(int argc, char *argv[]) // Create an instance of the checkbox test - message("cslidervertical_main: Create CSliderVerticalTest instance\n"); + printf("cslidervertical_main: Create CSliderVerticalTest instance\n"); CSliderVerticalTest *test = new CSliderVerticalTest(); updateMemoryUsage(g_mmprevious, "After creating CSliderVerticalTest"); // Connect the NX server - message("cslidervertical_main: Connect the CSliderVerticalTest instance to the NX server\n"); + printf("cslidervertical_main: Connect the CSliderVerticalTest instance to the NX server\n"); if (!test->connect()) { - message("cslidervertical_main: Failed to connect the CSliderVerticalTest instance to the NX server\n"); + printf("cslidervertical_main: Failed to connect the CSliderVerticalTest instance to the NX server\n"); delete test; return 1; } @@ -160,10 +160,10 @@ int cslidervertical_main(int argc, char *argv[]) // Create a window to draw into - message("cslidervertical_main: Create a Window\n"); + printf("cslidervertical_main: Create a Window\n"); if (!test->createWindow()) { - message("cslidervertical_main: Failed to create a window\n"); + printf("cslidervertical_main: Failed to create a window\n"); delete test; return 1; } @@ -171,11 +171,11 @@ int cslidervertical_main(int argc, char *argv[]) // Create a slider - message("cslidervertical_main: Create a Slider\n"); + printf("cslidervertical_main: Create a Slider\n"); CSliderVertical *slider = test->createSlider(); if (!slider) { - message("cslidervertical_main: Failed to create a slider\n"); + printf("cslidervertical_main: Failed to create a slider\n"); delete test; return 1; } @@ -186,9 +186,9 @@ int cslidervertical_main(int argc, char *argv[]) slider->setMinimumValue(0); slider->setMaximumValue(MAX_SLIDER); slider->setValue(0); - message("cslidervertical_main: Slider range %d->%d Initial value %d\n", - slider->getMinimumValue(), slider->getMaximumValue(), - slider->getValue()); + printf("cslidervertical_main: Slider range %d->%d Initial value %d\n", + slider->getMinimumValue(), slider->getMaximumValue(), + slider->getValue()); // Show the initial state of the checkbox @@ -201,7 +201,7 @@ int cslidervertical_main(int argc, char *argv[]) { slider->setValue(i); test->showSlider(slider); - message("cslidervertical_main: %d. New value %d\n", i, slider->getValue()); + printf("cslidervertical_main: %d. New value %d\n", i, slider->getValue()); usleep(1000); // The simulation needs this to let the X11 event loop run } updateMemoryUsage(g_mmprevious, "cslidervertical_main: After moving the slider up"); @@ -212,7 +212,7 @@ int cslidervertical_main(int argc, char *argv[]) { slider->setValue(i); test->showSlider(slider); - message("cslidervertical_main: %d. New value %d\n", i, slider->getValue()); + printf("cslidervertical_main: %d. New value %d\n", i, slider->getValue()); usleep(1000); // The simulation needs this to let the X11 event loop run } updateMemoryUsage(g_mmprevious, "cslidervertical_main: After moving the slider down"); @@ -220,7 +220,7 @@ int cslidervertical_main(int argc, char *argv[]) // Clean up and exit - message("cslidervertical_main: Clean-up and exit\n"); + printf("cslidervertical_main: Clean-up and exit\n"); delete slider; updateMemoryUsage(g_mmprevious, "After deleting the slider"); delete test; diff --git a/UnitTests/CSliderVertical/csliderverticaltest.cxx b/UnitTests/CSliderVertical/csliderverticaltest.cxx index d0691c52d..1a41ae72e 100644 --- a/UnitTests/CSliderVertical/csliderverticaltest.cxx +++ b/UnitTests/CSliderVertical/csliderverticaltest.cxx @@ -106,7 +106,7 @@ bool CSliderVerticalTest::connect(void) if (!setBackgroundColor(CONFIG_CSLIDERVERTICALTEST_BGCOLOR)) { - message("CSliderVerticalTest::connect: setBackgroundColor failed\n"); + printf("CSliderVerticalTest::connect: setBackgroundColor failed\n"); } } @@ -162,7 +162,7 @@ bool CSliderVerticalTest::createWindow(void) m_bgWindow = getBgWindow(m_widgetControl); if (!m_bgWindow) { - message("CSliderVerticalTest::createWindow: Failed to create CBgWindow instance\n"); + printf("CSliderVerticalTest::createWindow: Failed to create CBgWindow instance\n"); disconnect(); return false; } @@ -172,7 +172,7 @@ bool CSliderVerticalTest::createWindow(void) bool success = m_bgWindow->open(); if (!success) { - message("CSliderVerticalTest::createWindow: Failed to open background window\n"); + printf("CSliderVerticalTest::createWindow: Failed to open background window\n"); disconnect(); return false; } diff --git a/UnitTests/CSliderVertical/csliderverticaltest.hxx b/UnitTests/CSliderVertical/csliderverticaltest.hxx index 6a893e395..04fd9627c 100644 --- a/UnitTests/CSliderVertical/csliderverticaltest.hxx +++ b/UnitTests/CSliderVertical/csliderverticaltest.hxx @@ -69,15 +69,6 @@ # define CONFIG_CSLIDERVERTICALTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR #endif -// If debug is enabled, use the debug function, syslog() instead -// of printf() so that the output is synchronized. - -#ifdef CONFIG_DEBUG -# define message lowsyslog -#else -# define message printf -#endif - ///////////////////////////////////////////////////////////////////////////// // Public Classes /////////////////////////////////////////////////////////////////////////////