Remove the ui_out_style_kind enum

[deliverable/binutils-gdb.git] / gdb / ui-out.h

diff --git a/gdb/ui-out.h b/gdb/ui-out.h
index 7041d9690e59854deaf8d133675797bfc5625c8d..6732f04671915bdede5b83de8df580c1e70b5819 100644 (file)
--- a/gdb/ui-out.h
+++ b/gdb/ui-out.h
@@ -26,6 +26,7 @@
 #include <vector>
 
 #include "gdbsupport/enum-flags.h"
+#include "ui-style.h"
 
 class ui_out_level;
 class ui_out_table;
@@ -67,22 +68,6 @@ enum ui_out_type
     ui_out_type_list
   };
 
-/* Possible kinds of styling.  */
-
-enum class ui_out_style_kind
-{
-  /* The default (plain) style.  */
-  DEFAULT,
-  /* File name.  */
-  FILE,
-  /* Function name.  */
-  FUNCTION,
-  /* Variable name.  */
-  VARIABLE,
-  /* Address.  */
-  ADDRESS
-};
-
 class ui_out
 {
  public:
@@ -115,10 +100,10 @@ class ui_out
   void field_core_addr (const char *fldname, struct gdbarch *gdbarch,
                        CORE_ADDR address);
   void field_string (const char *fldname, const char *string,
-                    ui_out_style_kind style = ui_out_style_kind::DEFAULT);
+                    const ui_file_style &style = ui_file_style ());
   void field_string (const char *fldname, const std::string &string);
   void field_stream (const char *fldname, string_file &stream,
-                    ui_out_style_kind style = ui_out_style_kind::DEFAULT);
+                    const ui_file_style &style = ui_file_style ());
   void field_skip (const char *fldname);
   void field_fmt (const char *fldname, const char *format, ...)
     ATTRIBUTE_PRINTF (3, 4);
@@ -169,7 +154,7 @@ class ui_out
                              const char *fldname) = 0;
   virtual void do_field_string (int fldno, int width, ui_align align,
                                const char *fldname, const char *string,
-                               ui_out_style_kind style) = 0;
+                               const ui_file_style &style) = 0;
   virtual void do_field_fmt (int fldno, int width, ui_align align,
                             const char *fldname, const char *format,
                             va_list args)