@@ -50,16 +50,16 @@ struct LogWindow
5050 GtkTextTag *color_tags[LOG_COUNT];
5151 gint lines;
5252#ifdef DEBUG
53+ enum SearchDirection {
54+ SEARCH_BACKWARDS,
55+ SEARCH_FORWARDS
56+ };
57+
5358 GtkWidget *regexp_box;
54- #endif
5559 gint debug_value; /* *< Not used */
5660 GtkWidget *search_entry_box;
5761 gboolean highlight_all;
58- };
59-
60- enum LogWindowSearchDirection {
61- LOGWINDOW_SEARCH_BACKWARDS,
62- LOGWINDOW_SEARCH_FORWARDS
62+ #endif
6363};
6464
6565static LogWindow *logwindow = nullptr ;
@@ -222,7 +222,7 @@ static void search_activate_event(GtkEntry *, LogWindow *logwin)
222222 }
223223}
224224
225- template <LogWindowSearchDirection direction>
225+ template <LogWindow::SearchDirection direction>
226226static gboolean search_keypress_event_cb (GtkWidget *, GdkEventKey *, LogWindow *logwin)
227227{
228228 GtkTextIter start_find;
@@ -257,7 +257,7 @@ static gboolean search_keypress_event_cb(GtkWidget *, GdkEventKey *, LogWindow *
257257 }
258258 }
259259
260- auto text_iter_search = (direction == LOGWINDOW_SEARCH_BACKWARDS ) ? gtk_text_iter_backward_search : gtk_text_iter_forward_search;
260+ auto text_iter_search = (direction == LogWindow::SEARCH_BACKWARDS ) ? gtk_text_iter_backward_search : gtk_text_iter_forward_search;
261261
262262 GtkTextMark *cursor_mark = gtk_text_buffer_get_insert (buffer);
263263 gtk_text_buffer_get_iter_at_mark (buffer, &cursor_iter, cursor_mark);
@@ -268,7 +268,7 @@ static gboolean search_keypress_event_cb(GtkWidget *, GdkEventKey *, LogWindow *
268268
269269 gtk_text_buffer_apply_tag_by_name (buffer, " green_bg" , &start_match, &end_match);
270270
271- if (direction == LOGWINDOW_SEARCH_BACKWARDS )
271+ if (direction == LogWindow::SEARCH_BACKWARDS )
272272 {
273273 gtk_text_buffer_place_cursor (buffer, &start_match);
274274 }
@@ -422,7 +422,7 @@ static LogWindow *log_window_create(GdkRectangle log_window)
422422 gq_gtk_box_pack_start (GTK_BOX (search_box), backwards_button, FALSE , FALSE , 0 );
423423 gtk_widget_show (backwards_button);
424424 g_signal_connect (backwards_button, " button_release_event" ,
425- G_CALLBACK (search_keypress_event_cb<LOGWINDOW_SEARCH_BACKWARDS >), logwin);
425+ G_CALLBACK (search_keypress_event_cb<LogWindow::SEARCH_BACKWARDS >), logwin);
426426
427427 GtkWidget *forwards_button = gtk_button_new ();
428428 gtk_button_set_image (GTK_BUTTON (forwards_button),
@@ -431,7 +431,7 @@ static LogWindow *log_window_create(GdkRectangle log_window)
431431 gq_gtk_box_pack_start (GTK_BOX (search_box), forwards_button, FALSE , FALSE , 0 );
432432 gtk_widget_show (forwards_button);
433433 g_signal_connect (forwards_button, " button_release_event" ,
434- G_CALLBACK (search_keypress_event_cb<LOGWINDOW_SEARCH_FORWARDS >), logwin);
434+ G_CALLBACK (search_keypress_event_cb<LogWindow::SEARCH_FORWARDS >), logwin);
435435
436436 GtkWidget *all_button = gtk_toggle_button_new ();
437437 gtk_button_set_image (GTK_BUTTON (all_button),
0 commit comments