Cleaned the code and handled file binaries properly.

git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@259 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a

1 files changed, 10 insertions, 10 deletions

diff --git a/src/gtkext/gtkgraphview.c b/src/gtkext/gtkgraphview.c
index 8366c1f..6ce6060 100644
--- a/src/gtkext/gtkgraphview.c
+++ b/src/gtkext/gtkgraphview.c
@@ -87,7 +87,7 @@ static void gtk_graph_view_scroll(GtkGraphView *);
 static void gtk_graph_view_reset(GtkGraphView *);
 
 /* Liste d'éléments du graphique à placer. */
-static GtkViewPanel **gtk_graph_view_load_nodes(GtkGraphView *, GOpenidaBinary *, vmpa_t, vmpa_t);
+static GtkViewPanel **gtk_graph_view_load_nodes(GtkGraphView *, GLoadedBinary *, vmpa_t, vmpa_t);
 
 
 
@@ -319,7 +319,7 @@ static void gtk_graph_view_define_main_address(GtkGraphView *view, vmpa_t addr)
     {
         gtk_graph_view_reset(view);
 
-        format = g_openida_binary_get_format(GTK_VIEW_PANEL(view)->binary);
+        format = g_loaded_binary_get_format(GTK_VIEW_PANEL(view)->binary);
         routines = g_binary_format_get_routines(G_BIN_FORMAT(format), &routines_count);
 
         for (i = 0; i < routines_count; i++)
@@ -533,7 +533,7 @@ static void gtk_graph_view_reset(GtkGraphView *view)
 *                                                                             *
 ******************************************************************************/
 
-static GtkViewPanel **gtk_graph_view_load_nodes(GtkGraphView *view, GOpenidaBinary *binary, vmpa_t start, vmpa_t end)
+static GtkViewPanel **gtk_graph_view_load_nodes(GtkGraphView *view, GLoadedBinary *binary, vmpa_t start, vmpa_t end)
 {
     GtkViewPanel **result;                  /* Liste à retourner           */
     size_t *count;                          /* Nombre d'éléments créés.    */
@@ -551,11 +551,11 @@ static GtkViewPanel **gtk_graph_view_load_nodes(GtkGraphView *view, GOpenidaBina
     count = &view->childs_count;
     *count = 0;
 
-    list = g_openida_binary_get_instructions(binary);
-    buffer = g_openida_binary_get_disassembled_buffer(binary);
+    list = g_loaded_binary_get_instructions(binary);
+    buffer = g_loaded_binary_get_disassembled_buffer(binary);
 
-    addr = g_openida_binary_display_addresses_in_text(binary);
-    code = g_openida_binary_display_code_in_text(binary);
+    addr = g_loaded_binary_display_addresses_in_text(binary);
+    code = g_loaded_binary_display_code_in_text(binary);
 
     first = start;
     last = first;
@@ -718,7 +718,7 @@ static void gtk_graph_view_define_main_address(GtkGraphView *, vmpa_t);
 static bool gtk_graph_view_get_address_coordinates(const GtkGraphView *, vmpa_t, gint *, gint *);
 
 /* Définit la liste complète des éléments du futur graphique. */
-static GtkBinView **gtk_graph_view_load_nodes(GtkGraphView *, GOpenidaBinary *, GRenderingLine *, GRenderingLine *);
+static GtkBinView **gtk_graph_view_load_nodes(GtkGraphView *, GLoadedBinary *, GRenderingLine *, GRenderingLine *);
 
 /* Prend note de la fin d'une construction d'une visualisation. */
 static void notify_graph_view(GtkBinView *, GtkGraphView *);
@@ -870,7 +870,7 @@ static void gtk_graph_view_define_main_address(GtkGraphView *view, vmpa_t addr)
     {
         gtk_graph_view_reset(view);
 
-        format = g_openida_binary_get_format(GTK_BIN_VIEW(view)->binary);
+        format = g_loaded_binary_get_format(GTK_BIN_VIEW(view)->binary);
         routines = g_binary_format_get_routines(G_BIN_FORMAT(format), &routines_count);
 
         for (i = 0; i < routines_count; i++)
@@ -954,7 +954,7 @@ static bool gtk_graph_view_get_address_coordinates(const GtkGraphView *view, vmp
 *                                                                             *
 ******************************************************************************/
 
-static GtkBinView **gtk_graph_view_load_nodes(GtkGraphView *view, GOpenidaBinary *binary, GRenderingLine *first, GRenderingLine *last)
+static GtkBinView **gtk_graph_view_load_nodes(GtkGraphView *view, GLoadedBinary *binary, GRenderingLine *first, GRenderingLine *last)
 {
 #if 0
     GtkBinView **result;                    /* Liste à retourner           */