anjuta r4108 - in trunk: . libanjuta/interfaces plugins/debug-manager plugins/gdb

From: sgranjoux svn gnome org
To: svn-commits-list gnome org
Subject: anjuta r4108 - in trunk: . libanjuta/interfaces plugins/debug-manager plugins/gdb
Date: Sun, 3 Aug 2008 19:19:31 +0000 (UTC)
Author: sgranjoux
Date: Sun Aug  3 19:19:31 2008
New Revision: 4108
URL: http://svn.gnome.org/viewvc/anjuta?rev=4108&view=rev

Log:
	* libanjuta/interfaces/libanjuta.idl,
	plugins/gdb/plugin.c,
	plugins/debug-manager/command.c,
	plugins/debug-manager/queue.c:
	Avoid using the same function name in interfaces implemented
	by the same object to avoid trouble with bindings


Modified:
   trunk/ChangeLog
   trunk/libanjuta/interfaces/libanjuta.idl
   trunk/plugins/debug-manager/command.c
   trunk/plugins/debug-manager/queue.c
   trunk/plugins/gdb/plugin.c

Modified: trunk/libanjuta/interfaces/libanjuta.idl
==============================================================================
--- trunk/libanjuta/interfaces/libanjuta.idl	(original)
+++ trunk/libanjuta/interfaces/libanjuta.idl	Sun Aug  3 19:19:31 2008
@@ -3843,7 +3843,7 @@
 		}
 
 		/**
-		* ianjuta_debugger_breakpoint_implement:
+		* ianjuta_debugger_breakpoint_implement_breakpoint:
 		* @obj: Self
 		* @err: Error propagation and reporting.
 		* 
@@ -3852,10 +3852,10 @@
 		* Returns: A OR of IAnjutaDebuggerBreakpointMethod
 		* corresponding to all implemented optional methods.
 		*/
-		gint implement ();
+		gint implement_breakpoint ();
 		
 		/**
-		* ianjuta_debugger_breakpoint_set_at_line:
+		* ianjuta_debugger_breakpoint_set_breakpoint_at_line:
 		* @obj: Self
 		* @file: File containing the breakpoint
 		* @line: Line number where is the breakpoint
@@ -3868,11 +3868,11 @@
 		* Returns: TRUE if the request succeed and the callback is called. If 
 		* FALSE, the callback will not be called.
 		*/
-		gboolean set_at_line (const gchar* file, guint line, IAnjutaDebuggerCallback callback, gpointer user_data);
+		gboolean set_breakpoint_at_line (const gchar* file, guint line, IAnjutaDebuggerCallback callback, gpointer user_data);
 
 	
 		/**
-		* ianjuta_debugger_breakpoint_set_at_address:
+		* ianjuta_debugger_breakpoint_set_breakpoint_at_address:
 		* @obj: Self
 		* @address: Address of the breakpoint
 		* @callback: Callback to call when the breakpoint has been set
@@ -3885,10 +3885,10 @@
 		* Returns: TRUE if the request succeed and the callback is called. If 
 		* FALSE, the callback will not be called.
 		*/
-		gboolean set_at_address (gulong address, IAnjutaDebuggerCallback callback, gpointer user_data);
+		gboolean set_breakpoint_at_address (gulong address, IAnjutaDebuggerCallback callback, gpointer user_data);
 	
 		/**
-		* ianjuta_debugger_breakpoint_set_at_function:
+		* ianjuta_debugger_breakpoint_set_breakpoint_at_function:
 		* @obj: Self
 		* @file: File containing the breakpoint
 		* @function: Function name where the breakpoint is put
@@ -3902,10 +3902,10 @@
 		* Returns: TRUE if the request succeed and the callback is called. If 
 		* FALSE, the callback will not be called.
 		*/
-		gboolean set_at_function (const gchar* file, const gchar* function, IAnjutaDebuggerCallback callback, gpointer user_data);
+		gboolean set_breakpoint_at_function (const gchar* file, const gchar* function, IAnjutaDebuggerCallback callback, gpointer user_data);
 	
 		/**
-		* ianjuta_debugger_breakpoint_clear:
+		* ianjuta_debugger_breakpoint_clear_breakpoint:
 		* @obj: Self
 		* @id: Breakpoint identification number
 		* @callback: Callback to call when the breakpoint has been cleared
@@ -3918,10 +3918,10 @@
 		* Returns: TRUE if the request succeed and the callback is called. If 
 		* FALSE, the callback will not be called.
 		*/
-		gboolean clear (guint id, IAnjutaDebuggerCallback callback, gpointer user_data);
+		gboolean clear_breakpoint (guint id, IAnjutaDebuggerCallback callback, gpointer user_data);
 
 		/**
-		* ianjuta_debugger_breakpoint_list:
+		* ianjuta_debugger_breakpoint_list_breakpoint:
 		* @obj: Self
 		* @callback: Callback to call with the list of breakpoints
 		* @user_data: User data that is passed back to the callback
@@ -3933,10 +3933,10 @@
 		* Returns: TRUE if the request succeed and the callback is called. If 
 		* FALSE, the callback will not be called.
 		*/
-		gboolean list (IAnjutaDebuggerCallback callback, gpointer user_data);
+		gboolean list_breakpoint (IAnjutaDebuggerCallback callback, gpointer user_data);
 
 		/**
-		* ianjuta_debugger_breakpoint_enable:
+		* ianjuta_debugger_breakpoint_enable_breakpoint:
 		* @obj: Self
 		* @id: Breakpoint identification number
 		* @enable: TRUE to enable the breakpoint, FALSE to disable it
@@ -3949,10 +3949,10 @@
 		* Returns: TRUE if the request succeed and the callback is called. If 
 		* FALSE, the callback will not be called.
 		*/
-		gboolean enable (guint id, gboolean enable, IAnjutaDebuggerCallback callback, gpointer user_data);
+		gboolean enable_breakpoint (guint id, gboolean enable, IAnjutaDebuggerCallback callback, gpointer user_data);
 	
 		/**
-		* ianjuta_debugger_breakpoint_ignore:
+		* ianjuta_debugger_breakpoint_ignore_breakpoint:
 		* @obj: Self
 		* @id: Breakpoint identification number
 		* @ignore: Number of time a breakpoint must be ignored
@@ -3966,10 +3966,10 @@
 		* Returns: TRUE if the request succeed and the callback is called. If 
 		* FALSE, the callback will not be called.
 		*/
-		gboolean ignore (guint id, guint ignore, IAnjutaDebuggerCallback callback, gpointer user_data);
+		gboolean ignore_breakpoint (guint id, guint ignore, IAnjutaDebuggerCallback callback, gpointer user_data);
 	
 		/**
-		* ianjuta_debugger_breakpoint_condition:
+		* ianjuta_debugger_breakpoint_condition_breakpoint:
 		* @obj: Self
 		* @id: Breakpoint identification number
 		* @condition: fixme
@@ -3984,7 +3984,7 @@
 		* Returns: TRUE if the request succeed and the callback is called. If 
 		* FALSE, the callback will not be called.
 		*/
-		gboolean condition (guint id, const gchar* condition, IAnjutaDebuggerCallback callback, gpointer user_data);
+		gboolean condition_breakpoint (guint id, const gchar* condition, IAnjutaDebuggerCallback callback, gpointer user_data);
 	}
 
 	/**
@@ -4126,7 +4126,7 @@
 		}
 
 		/**
-		* ianjuta_debugger_register_list:
+		* ianjuta_debugger_register_list_register:
 		* @obj: Self
 		* @callback: Callback to call with the register list
 		* @user_data: User data that is passed back to the callback
@@ -4138,10 +4138,10 @@
 		* Returns: TRUE if the request succeed and the callback is
 		* called. If FALSE, the callback will not be called.
 		*/
-		gboolean list (IAnjutaDebuggerCallback callback, gpointer user_data);
+		gboolean list_register (IAnjutaDebuggerCallback callback, gpointer user_data);
 
 		/**
-		* ianjuta_debugger_register_update:
+		* ianjuta_debugger_register_update_register:
 		* @obj: Self
 		* @callback: Callback call with the list of all modified registers
 		* @user_data: User data that is passed back to the callback
@@ -4153,10 +4153,10 @@
 		* Returns: TRUE if the request succeed and the callback is
 		* called. If FALSE, the callback will not be called.
 		*/
-		gboolean update (IAnjutaDebuggerCallback callback, gpointer user_data);
+		gboolean update_register (IAnjutaDebuggerCallback callback, gpointer user_data);
 
 		/**
-		* ianjuta_debugger_register_write:
+		* ianjuta_debugger_register_write_register:
 		* @obj: Self
 		* @value: Modified register with a new value
 		* @err: Error propagation and reporting.
@@ -4165,7 +4165,7 @@
 		*
 		* Returns: TRUE if the request succeed.
 		*/
-		gboolean write (Data *value);
+		gboolean write_register (Data *value);
 	}
 	
 	/**
@@ -4247,7 +4247,7 @@
 		gboolean disassemble (gulong address, guint length, IAnjutaDebuggerCallback callback, gpointer user_data);
 
 		/**
-		* ianjuta_debugger_instruction_step_in:
+		* ianjuta_debugger_instruction_step_in_instruction:
 		* @obj: Self
 		* @err: Error propagation and reporting.
 		* 
@@ -4256,10 +4256,10 @@
 		* Returns: TRUE if the request succeed and the callback is called. If 
 		* FALSE, the callback will not be called.
 		*/
-		gboolean step_in ();
+		gboolean step_in_instruction ();
 	
 		/**
-		* ianjuta_debugger_instruction_step_over:
+		* ianjuta_debugger_instruction_step_over_instruction:
 		* @obj: Self
 		* @err: Error propagation and reporting.
 		* 
@@ -4269,7 +4269,7 @@
 		* Returns: TRUE if the request succeed and the callback is called. If 
 		* FALSE, the callback will not be called.
 		*/
-		gboolean step_over ();
+		gboolean step_over_instruction ();
 	
 		/**
 		* ianjuta_debugger_instruction_run_to_address:

Modified: trunk/plugins/debug-manager/command.c
==============================================================================
--- trunk/plugins/debug-manager/command.c	(original)
+++ trunk/plugins/debug-manager/command.c	Sun Aug  3 19:19:31 2008
@@ -1190,10 +1190,10 @@
 		ret = ianjuta_debugger_instruction_run_to_address (IANJUTA_DEBUGGER_INSTRUCTION (debugger), cmd->data.pos.address, err);	
 		break;
 	case STEPI_IN_COMMAND:
-		ret = ianjuta_debugger_instruction_step_in (IANJUTA_DEBUGGER_INSTRUCTION (debugger), err);	
+		ret = ianjuta_debugger_instruction_step_in_instruction (IANJUTA_DEBUGGER_INSTRUCTION (debugger), err);	
 		break;
 	case STEPI_OVER_COMMAND:
-		ret = ianjuta_debugger_instruction_step_over (IANJUTA_DEBUGGER_INSTRUCTION (debugger), err);	
+		ret = ianjuta_debugger_instruction_step_over_instruction (IANJUTA_DEBUGGER_INSTRUCTION (debugger), err);	
 		break;
 	case EXIT_COMMAND:
 		ret = ianjuta_debugger_exit (debugger, err);	
@@ -1202,18 +1202,18 @@
 		ret = ianjuta_debugger_interrupt (debugger, err);	
 		break;
 	case ENABLE_BREAK_COMMAND:
-		ret = ianjuta_debugger_breakpoint_enable (IANJUTA_DEBUGGER_BREAKPOINT (debugger), cmd->data.brk.id, cmd->data.brk.enable, callback, queue, err);	
+		ret = ianjuta_debugger_breakpoint_enable_breakpoint (IANJUTA_DEBUGGER_BREAKPOINT (debugger), cmd->data.brk.id, cmd->data.brk.enable, callback, queue, err);	
 		break;
 	case IGNORE_BREAK_COMMAND:
-		ret = ianjuta_debugger_breakpoint_ignore (IANJUTA_DEBUGGER_BREAKPOINT (debugger), cmd->data.brk.id, cmd->data.brk.ignore, callback, queue, err);	
+		ret = ianjuta_debugger_breakpoint_ignore_breakpoint (IANJUTA_DEBUGGER_BREAKPOINT (debugger), cmd->data.brk.id, cmd->data.brk.ignore, callback, queue, err);	
 		break;
 	case REMOVE_BREAK_COMMAND:
-		ret = ianjuta_debugger_breakpoint_clear (IANJUTA_DEBUGGER_BREAKPOINT (debugger), cmd->data.brk.id, callback, queue, err);	
+		ret = ianjuta_debugger_breakpoint_clear_breakpoint (IANJUTA_DEBUGGER_BREAKPOINT (debugger), cmd->data.brk.id, callback, queue, err);	
 		break;
 	case BREAK_LINE_COMMAND:
 		if (dma_command_is_breakpoint_pending (cmd))
 		{	
-			ret = ianjuta_debugger_breakpoint_set_at_line (IANJUTA_DEBUGGER_BREAKPOINT (debugger), cmd->data.pos.file, cmd->data.pos.line, callback, queue, err);	
+			ret = ianjuta_debugger_breakpoint_set_breakpoint_at_line (IANJUTA_DEBUGGER_BREAKPOINT (debugger), cmd->data.pos.file, cmd->data.pos.line, callback, queue, err);	
 		}
 		else
 		{
@@ -1223,7 +1223,7 @@
 	case BREAK_FUNCTION_COMMAND:
 		if (dma_command_is_breakpoint_pending (cmd))
 		{	
-			ret = ianjuta_debugger_breakpoint_set_at_function (IANJUTA_DEBUGGER_BREAKPOINT (debugger), cmd->data.pos.file, cmd->data.pos.function, callback, queue, err);	
+			ret = ianjuta_debugger_breakpoint_set_breakpoint_at_function (IANJUTA_DEBUGGER_BREAKPOINT (debugger), cmd->data.pos.file, cmd->data.pos.function, callback, queue, err);	
 		}
 		else
 		{
@@ -1233,7 +1233,7 @@
 	case BREAK_ADDRESS_COMMAND:
 		if (dma_command_is_breakpoint_pending (cmd))
 		{	
-			ret = ianjuta_debugger_breakpoint_set_at_address (IANJUTA_DEBUGGER_BREAKPOINT (debugger), cmd->data.pos.address, callback, queue, err);	
+			ret = ianjuta_debugger_breakpoint_set_breakpoint_at_address (IANJUTA_DEBUGGER_BREAKPOINT (debugger), cmd->data.pos.address, callback, queue, err);	
 		}
 		else
 		{
@@ -1241,10 +1241,10 @@
 		}
 		break;
 	case CONDITION_BREAK_COMMAND:
-		ret = ianjuta_debugger_breakpoint_condition (IANJUTA_DEBUGGER_BREAKPOINT (debugger), cmd->data.brk.id, cmd->data.brk.condition, callback, queue, err);	
+		ret = ianjuta_debugger_breakpoint_condition_breakpoint (IANJUTA_DEBUGGER_BREAKPOINT (debugger), cmd->data.brk.id, cmd->data.brk.condition, callback, queue, err);	
 		break;
 	case LIST_BREAK_COMMAND:
-		ret = ianjuta_debugger_breakpoint_list (IANJUTA_DEBUGGER_BREAKPOINT (debugger), callback, queue, err);	
+		ret = ianjuta_debugger_breakpoint_list_breakpoint (IANJUTA_DEBUGGER_BREAKPOINT (debugger), callback, queue, err);	
 		break;
 	case INSPECT_COMMAND:
 		ret = ianjuta_debugger_inspect (debugger, cmd->data.watch.name, callback, queue, err);
@@ -1298,16 +1298,16 @@
 		ret = ianjuta_debugger_list_frame (debugger, callback, queue, err);	
 		break;
 	case LIST_REGISTER_COMMAND:
-		ret = ianjuta_debugger_register_list (IANJUTA_DEBUGGER_REGISTER (debugger), callback, queue, err);	
+		ret = ianjuta_debugger_register_list_register (IANJUTA_DEBUGGER_REGISTER (debugger), callback, queue, err);	
 		break;
 	case UPDATE_REGISTER_COMMAND:
-		ret = ianjuta_debugger_register_update (IANJUTA_DEBUGGER_REGISTER (debugger), callback, queue, err);	
+		ret = ianjuta_debugger_register_update_register (IANJUTA_DEBUGGER_REGISTER (debugger), callback, queue, err);	
 		break;
 	case WRITE_REGISTER_COMMAND:
 		reg.num = cmd->data.watch.id;
 	    reg.name = cmd->data.watch.name;
 	    reg.value = cmd->data.watch.value;
-		ret = ianjuta_debugger_register_write (IANJUTA_DEBUGGER_REGISTER (debugger), &reg, err);	
+		ret = ianjuta_debugger_register_write_register (IANJUTA_DEBUGGER_REGISTER (debugger), &reg, err);	
 		break;
 	case INSPECT_MEMORY_COMMAND:
 		ret = ianjuta_debugger_memory_inspect (IANJUTA_DEBUGGER_MEMORY (debugger), cmd->data.mem.address, cmd->data.mem.length, callback, queue, err);	

Modified: trunk/plugins/debug-manager/queue.c
==============================================================================
--- trunk/plugins/debug-manager/queue.c	(original)
+++ trunk/plugins/debug-manager/queue.c	Sun Aug  3 19:19:31 2008
@@ -579,7 +579,7 @@
 		self->support |= IANJUTA_IS_DEBUGGER_BREAKPOINT(self->debugger) ? HAS_BREAKPOINT : 0;
 		if (IANJUTA_IS_DEBUGGER_BREAKPOINT (self->debugger))
 		{
-			self->support |= ianjuta_debugger_breakpoint_implement (IANJUTA_DEBUGGER_BREAKPOINT (self->debugger), NULL) * HAS_BREAKPOINT * 2;
+			self->support |= ianjuta_debugger_breakpoint_implement_breakpoint (IANJUTA_DEBUGGER_BREAKPOINT (self->debugger), NULL) * HAS_BREAKPOINT * 2;
 		}			
 		/* Check if variable interface is available */
 		self->support |= IANJUTA_IS_DEBUGGER_VARIABLE(self->debugger) ? HAS_VARIABLE : 0;

Modified: trunk/plugins/gdb/plugin.c
==============================================================================
--- trunk/plugins/gdb/plugin.c	(original)
+++ trunk/plugins/gdb/plugin.c	Sun Aug  3 19:19:31 2008
@@ -897,15 +897,15 @@
 static void
 idebugger_breakpoint_iface_init (IAnjutaDebuggerBreakpointIface *iface)
 {
-	iface->implement = idebugger_breakpoint_implement;
-	iface->set_at_line = idebugger_breakpoint_add_at_line;
-	iface->clear = idebugger_breakpoint_remove;
-	iface->list = idebugger_breakpoint_list;
-	iface->set_at_address = idebugger_breakpoint_add_at_address;
-	iface->set_at_function = idebugger_breakpoint_add_at_function;
-	iface->enable = idebugger_breakpoint_enable;
-	iface->ignore = idebugger_breakpoint_ignore;
-	iface->condition = idebugger_breakpoint_condition;
+	iface->implement_breakpoint = idebugger_breakpoint_implement;
+	iface->set_breakpoint_at_line = idebugger_breakpoint_add_at_line;
+	iface->clear_breakpoint = idebugger_breakpoint_remove;
+	iface->list_breakpoint = idebugger_breakpoint_list;
+	iface->set_breakpoint_at_address = idebugger_breakpoint_add_at_address;
+	iface->set_breakpoint_at_function = idebugger_breakpoint_add_at_function;
+	iface->enable_breakpoint = idebugger_breakpoint_enable;
+	iface->ignore_breakpoint = idebugger_breakpoint_ignore;
+	iface->condition_breakpoint = idebugger_breakpoint_condition;
 }
 
 /* Implementation of IAnjutaDebuggerRegister interface
@@ -944,9 +944,9 @@
 static void
 idebugger_register_iface_init (IAnjutaDebuggerRegisterIface *iface)
 {
-	iface->list = idebugger_register_list;
-	iface->update = idebugger_register_update;
-	iface->write = idebugger_register_write;
+	iface->list_register = idebugger_register_list;
+	iface->update_register = idebugger_register_update;
+	iface->write_register = idebugger_register_write;
 }
 
 /* Implementation of IAnjutaDebuggerMemory interface
@@ -1015,8 +1015,8 @@
 idebugger_instruction_iface_init (IAnjutaDebuggerInstructionIface *iface)
 {
 	iface->disassemble = idebugger_instruction_disassemble;
-	iface->step_in = idebugger_instruction_step_in;
-	iface->step_over = idebugger_instruction_step_over;
+	iface->step_in_instruction = idebugger_instruction_step_in;
+	iface->step_over_instruction = idebugger_instruction_step_over;
 	iface->run_to_address = idebugger_instruction_run_to_address;
 }
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]