Replaced all BLC_* constants by the new DLC_* values.

4 files changed, 18 insertions, 16 deletions

diff --git a/src/analysis/binary.c b/src/analysis/binary.c
index c671827..7957f2e 100644
--- a/src/analysis/binary.c
+++ b/src/analysis/binary.c
@@ -1670,9 +1670,9 @@ static bool g_loaded_binary_analyze(GLoadedBinary *binary, bool connect, bool ca
 
     has_virt = g_arch_processor_has_virtual_space(binary->proc);
 
-    g_display_options_set(binary->options[BVW_HEX], 0, false);
-    g_display_options_set(binary->options[BVW_BLOCK], BLC_VIRTUAL, has_virt);
-    g_display_options_set(binary->options[BVW_GRAPH], BLC_VIRTUAL, has_virt);
+    g_display_options_set(binary->options[BVW_HEX], HLC_PHYSICAL, false);
+    g_display_options_set(binary->options[BVW_BLOCK], DLC_VIRTUAL, has_virt);
+    g_display_options_set(binary->options[BVW_GRAPH], DLC_VIRTUAL, has_virt);
 
     /* Phase de désassemblage pur */
 
diff --git a/src/analysis/db/items/comment.c b/src/analysis/db/items/comment.c
index a4a62b0..4b22502 100644
--- a/src/analysis/db/items/comment.c
+++ b/src/analysis/db/items/comment.c
@@ -40,6 +40,7 @@
 #include "../../../common/extstr.h"
 #include "../../../glibext/gbinarycursor.h"
 #include "../../../glibext/linegen-int.h"
+#include "../../../gtkext/gtkblockdisplay.h"
 
 
 
@@ -1458,7 +1459,7 @@ static void g_db_comment_print(GDbComment *comment, GBufferLine *line, size_t in
 
         assert(count == comment->count);
 
-        g_buffer_line_append_text(line, BLC_COMMENTS, SL(lines[repeat]), RTT_COMMENT, NULL);
+        g_buffer_line_append_text(line, DLC_COMMENTS, SL(lines[repeat]), RTT_COMMENT, NULL);
 
         for (i = 0; i < count; i++)
             free(lines[i]);
diff --git a/src/analysis/disass/block.c b/src/analysis/disass/block.c
index f0bee99..a141d68 100644
--- a/src/analysis/disass/block.c
+++ b/src/analysis/disass/block.c
@@ -577,7 +577,7 @@ static char *g_basic_block_build_tooltip(const GBasicBlock *block)
             g_buffer_cache_append(cache, G_LINE_GENERATOR(symbol), BLF_NONE);
 
             line = g_buffer_cache_find_line_by_index(cache, 0);
-            name = g_buffer_line_get_text(line, BLC_ASSEMBLY_LABEL, BLC_COUNT, true);
+            name = g_buffer_line_get_text(line, DLC_ASSEMBLY_LABEL, DLC_COUNT, true);
             g_object_unref(G_OBJECT(line));
 
             g_object_unref(G_OBJECT(cache));
@@ -690,7 +690,7 @@ static char *g_basic_block_build_tooltip(const GBasicBlock *block)
 
                     if (line != NULL)
                     {
-                        info = g_buffer_line_get_text(line, BLC_ASSEMBLY_HEAD, BLC_COUNT, true);
+                        info = g_buffer_line_get_text(line, DLC_ASSEMBLY_HEAD, DLC_COUNT, true);
                         g_object_unref(G_OBJECT(line));
                     }
 
@@ -746,7 +746,7 @@ static char *g_basic_block_build_tooltip(const GBasicBlock *block)
 
                     if (line != NULL)
                     {
-                        info = g_buffer_line_get_text(line, BLC_ASSEMBLY, BLC_COUNT, true);
+                        info = g_buffer_line_get_text(line, DLC_ASSEMBLY, DLC_COUNT, true);
                         g_object_unref(G_OBJECT(line));
                     }
 
diff --git a/src/analysis/routine.c b/src/analysis/routine.c
index 82f30f8..aca47ee 100644
--- a/src/analysis/routine.c
+++ b/src/analysis/routine.c
@@ -39,6 +39,7 @@
 #include "../common/extstr.h"
 #include "../core/params.h"
 #include "../glibext/gbinarycursor.h"
+#include "../gtkext/gtkblockdisplay.h"
 
 
 
@@ -940,7 +941,7 @@ void g_binary_routine_output_info(const GBinRoutine *routine, GLangOutput *lang,
 
     g_data_type_output(routine->ret_type, lang, line, true, false);
 
-    g_buffer_line_append_text(line, BLC_LAST_USED, " ", 1, RTT_COMMENT, NULL);
+    g_buffer_line_append_text(line, DLC_LAST_USED, " ", 1, RTT_COMMENT, NULL);
 
     /* Nom de la routine */
 
@@ -952,22 +953,22 @@ void g_binary_routine_output_info(const GBinRoutine *routine, GLangOutput *lang,
         len = 3;
     }
 
-    g_buffer_line_append_text(line, BLC_LAST_USED, name, len, RTT_COMMENT, NULL);
+    g_buffer_line_append_text(line, DLC_LAST_USED, name, len, RTT_COMMENT, NULL);
 
     /* Arguments éventuels... */
 
-    g_buffer_line_append_text(line, BLC_LAST_USED, "(", 1, RTT_COMMENT, NULL);
+    g_buffer_line_append_text(line, DLC_LAST_USED, "(", 1, RTT_COMMENT, NULL);
 
     for (i = 0; i < routine->args_count; i++)
     {
         if (i > 0)
-            g_buffer_line_append_text(line, BLC_LAST_USED, ", ", 2, RTT_COMMENT, NULL);
+            g_buffer_line_append_text(line, DLC_LAST_USED, ", ", 2, RTT_COMMENT, NULL);
 
         g_binary_variable_output(routine->args[i], lang, line, true, false);
 
     }
 
-    g_buffer_line_append_text(line, BLC_LAST_USED, ")", 1, RTT_COMMENT, NULL);
+    g_buffer_line_append_text(line, DLC_LAST_USED, ")", 1, RTT_COMMENT, NULL);
 
     //g_lang_output_end_routine_prototype(lang, buffer, line);
 
@@ -1000,7 +1001,7 @@ void g_binary_routine_print_code(const GBinRoutine *routine, GLangOutput *lang,
 
     line = g_lang_output_start_routine_prototype(lang, buffer, routine->ret_type);
 
-    g_buffer_line_append_text(line, BLC_ASSEMBLY_HEAD, " ", 1, RTT_RAW, NULL);
+    g_buffer_line_append_text(line, DLC_ASSEMBLY_HEAD, " ", 1, RTT_RAW, NULL);
 
     /* Nom de la routine */
 
@@ -1012,7 +1013,7 @@ void g_binary_routine_print_code(const GBinRoutine *routine, GLangOutput *lang,
         len = 3;
     }
 
-    g_buffer_line_append_text(line, BLC_ASSEMBLY_HEAD, name, len, RTT_COMMENT, NULL);
+    g_buffer_line_append_text(line, DLC_ASSEMBLY_HEAD, name, len, RTT_COMMENT, NULL);
 
 
 
@@ -1158,7 +1159,7 @@ char *g_binary_routine_build_tooltip(const GBinRoutine *routine, const GLoadedBi
 
                     if (line != NULL)
                     {
-                        info = g_buffer_line_get_text(line, BLC_ASSEMBLY_HEAD, BLC_COUNT, true);
+                        info = g_buffer_line_get_text(line, DLC_ASSEMBLY_HEAD, DLC_COUNT, true);
                         g_object_unref(G_OBJECT(line));
                     }
 
@@ -1214,7 +1215,7 @@ char *g_binary_routine_build_tooltip(const GBinRoutine *routine, const GLoadedBi
 
                     if (line != NULL)
                     {
-                        info = g_buffer_line_get_text(line, BLC_ASSEMBLY, BLC_COUNT, true);
+                        info = g_buffer_line_get_text(line, DLC_ASSEMBLY, DLC_COUNT, true);
                         g_object_unref(G_OBJECT(line));
                     }