Make unittest conform to CMP (#597)

Update unittest README

1 files changed, 14 insertions, 14 deletions

diff --git a/test/unittest_unicode.cxx b/test/unittest_unicode.cxx
index 65cea5628..0f6865a6b 100644
--- a/test/unittest_unicode.cxx
+++ b/test/unittest_unicode.cxx
@@ -45,7 +45,7 @@ static const char *helptext =
   "be visible and not touching. All the above should be unaffected "
   "by different font sizes and font settings.";
 
-class UnicodeBoxTest : public Fl_Group {
+class Ut_Unicode_Box_Test : public Fl_Group {
   Fl_Text_Buffer      *textbuffer;
   Fl_Text_Display     *textdisplay;
   Fl_Multiline_Input  *multilineinput;
@@ -53,20 +53,20 @@ class UnicodeBoxTest : public Fl_Group {
   Fl_Hor_Value_Slider *fontsize_slider;
 
   // Font choice callback
-  void FontChoice_CB2() {
+  void font_choice_cb2() {
     switch ( font_choice->value() ) {
       case 0: textdisplay->textfont(FL_COURIER); break;
       case 1: textdisplay->textfont(FL_SCREEN); break;
     }
     parent()->redraw();
   }
-  static void FontChoice_CB(Fl_Widget*, void *userdata) {
-    UnicodeBoxTest *o = (UnicodeBoxTest*)userdata;
-    o->FontChoice_CB2();
+  static void foant_choice_cb(Fl_Widget*, void *userdata) {
+    Ut_Unicode_Box_Test *o = (Ut_Unicode_Box_Test*)userdata;
+    o->font_choice_cb2();
   }
 
   // Slider callback - apply new font size to widgets
-  void FontSizeSlider_CB2() {
+  void font_size_slider_cb2() {
     // Get font size from slider value, apply to widgets
     int fontsize = (int)fontsize_slider->value();
     textdisplay->textsize(fontsize);
@@ -74,17 +74,17 @@ class UnicodeBoxTest : public Fl_Group {
     multilineinput->position(0);                // keep scrolled to top
     parent()->redraw();
   }
-  static void FontSizeSlider_CB(Fl_Widget*, void *userdata) {
-    UnicodeBoxTest *o = (UnicodeBoxTest*)userdata;
-    o->FontSizeSlider_CB2();
+  static void font_size_slider_cb(Fl_Widget*, void *userdata) {
+    Ut_Unicode_Box_Test *o = (Ut_Unicode_Box_Test*)userdata;
+    o->font_size_slider_cb2();
   }
 
 public:
   static Fl_Widget *create() {
-    return new UnicodeBoxTest(TESTAREA_X, TESTAREA_Y, TESTAREA_W, TESTAREA_H);
+    return new Ut_Unicode_Box_Test(UT_TESTAREA_X, UT_TESTAREA_Y, UT_TESTAREA_W, UT_TESTAREA_H);
   }
 
-  UnicodeBoxTest(int x, int y, int w, int h) : Fl_Group(x, y, w, h) {
+  Ut_Unicode_Box_Test(int x, int y, int w, int h) : Fl_Group(x, y, w, h) {
     // Fl_Text_Display
     textbuffer = new Fl_Text_Buffer();
     textbuffer->text(utf8_box_test);
@@ -104,16 +104,16 @@ public:
     font_choice->add("FL_COURIER");
     font_choice->add("FL_SCREEN");
     font_choice->value(0);
-    font_choice->callback(FontChoice_CB, (Fl_Widget*)this);
+    font_choice->callback(foant_choice_cb, (Fl_Widget*)this);
     // Font size slider
     fontsize_slider = new Fl_Hor_Value_Slider(x+150, y+h-50, 200, 25, "Font size");
     fontsize_slider->align(FL_ALIGN_LEFT);
     fontsize_slider->range(1.0, 50.0);
     fontsize_slider->step(1.0);
     fontsize_slider->value(14.0);
-    fontsize_slider->callback(FontSizeSlider_CB, (Fl_Widget*)this);
+    fontsize_slider->callback(font_size_slider_cb, (Fl_Widget*)this);
     end();
   }
 };
 
-UnitTest unicode_font_test(kUnicodeBoxTest, "Unicode Boxes", UnicodeBoxTest::create);
+UnitTest unicode_font_test(UT_TEST_UNICODE, "Unicode Boxes", Ut_Unicode_Box_Test::create);