Removed cruft

dlib/gui_widgets/base_widgets.h

@@ -690,7 +690,7 @@ namespace dlib
 
             long x, y;
             tooltip_window win;
-            timer<tooltip>::kernel_2a tt_timer;
+            timer<tooltip> tt_timer;
 
         };
         friend struct data;
@@ -1410,10 +1410,10 @@ namespace dlib
         long max_pos; 
         long js;
 
-        timer<scroll_bar>::kernel_2a b1_timer;
-        timer<scroll_bar>::kernel_2a b2_timer;
-        timer<scroll_bar>::kernel_2a top_filler_timer;
-        timer<scroll_bar>::kernel_2a bottom_filler_timer;
+        timer<scroll_bar> b1_timer;
+        timer<scroll_bar> b2_timer;
+        timer<scroll_bar> top_filler_timer;
+        timer<scroll_bar> bottom_filler_timer;
         long delayed_pos;
         scoped_ptr<scroll_bar_style> style;
 

dlib/gui_widgets/widgets.h

@@ -653,7 +653,7 @@ namespace dlib
 
         scoped_ptr<text_field_style> style;
 
-        timer<text_field>::kernel_2a t;
+        timer<text_field> t;
 
         popup_menu_region right_click_menu;
 
@@ -1049,7 +1049,7 @@ namespace dlib
 
         scoped_ptr<text_box_style> style;
 
-        timer<text_box>::kernel_2a t;
+        timer<text_box> t;
 
         popup_menu_region right_click_menu;
 
@@ -3188,7 +3188,7 @@ namespace dlib
         long cursor_pos;
         bool show_cursor;
         bool recent_cursor_move;
-        timer<text_grid>::kernel_2a cursor_timer;
+        timer<text_grid> cursor_timer;
         rgb_pixel border_color_;
         any_function<void(unsigned long, unsigned long)> text_modified_handler;
     };

dlib/test/gui/main.cpp

@@ -124,7 +124,7 @@ private:
     {
         draggable::on_window_resized();
     }
-    timer<color_box>::kernel_1a t;
+    timer<color_box> t;
 };
 
 

dlib/test/timer.cpp

@@ -59,7 +59,7 @@ namespace
     )
     /*!
         requires
-            - timer_t is an implementation of timer/timer_kernel_abstract.h is instantiated 
+            - timer_t is an implementation of dlib/timer/timer_abstract.h is instantiated 
               timer_test_helper
         ensures
             - runs tests on timer_t for compliance with the specs 
@@ -94,7 +94,7 @@ namespace
     )
     /*!
         requires
-            - timer_t is an implementation of timer/timer_kernel_abstract.h is instantiated 
+            - timer_t is an implementation of dlib/timer/timer_abstract.h is instantiated 
               timer_test_helper
         ensures
             - runs tests on timer_t for compliance with the specs 
@@ -315,15 +315,15 @@ namespace
         void perform_test (
         )
         {
-            dlog << LINFO << "testing kernel_1a with test_timer";
-            timer_test<timer<timer_test_helper>::kernel_1a>  ();
-            dlog << LINFO << "testing kernel_1a with test_timer2";
-            timer_test2<timer<timer_test_helper>::kernel_1a>  ();
-
-            dlog << LINFO << "testing kernel_2a with test_timer";
-            timer_test<timer<timer_test_helper>::kernel_2a>  ();
-            dlog << LINFO << "testing kernel_2a with test_timer2";
-            timer_test2<timer<timer_test_helper>::kernel_2a>  ();
+            dlog << LINFO << "testing timer_heavy with test_timer";
+            timer_test<timer_heavy<timer_test_helper> >  ();
+            dlog << LINFO << "testing timer_heavy with test_timer2";
+            timer_test2<timer_heavy<timer_test_helper> >  ();
+
+            dlog << LINFO << "testing timer with test_timer";
+            timer_test<timer<timer_test_helper> >  ();
+            dlog << LINFO << "testing timer with test_timer2";
+            timer_test2<timer<timer_test_helper> >  ();
         }
     } a;
 

dlib/timeout/timeout.h

@@ -181,7 +181,7 @@ namespace dlib
             t.stop();
         }
 
-        dlib::timer<timeout>::kernel_2a t;
+        dlib::timer<timeout> t;
         bind* b;
 
         // restricted functions