2004-02-06 Andrew Cagney <cagney@redhat.com>

	* tui/tui-source.h: Do not include "defs.h".
	(struct tui_win_info): Declare.
	(tui_set_source_content_nil): Declare.
	* tui/tui-data.h (struct tui_win_info): Rename _TuiWinInfo.
	(union tui_line_or_address): Rename _TuiLineOrAddress.
	* tui/tui-winsource.h: Update copyright.  Include "tui-data.h".
	(tui_update_source_window): Rename tuiUpdateSourceWindow.
	(tui_update_source_window_as_is): Rename
	tuiUpdateSourceWindowAsIs.
	(tui_update_source_windows_with_addr): Rename
	tuiUpdateSourceWindowsWithAddr.
	(tui_update_source_windows_with_line): Rename
	tuiUpdateSourceWindowsWithLine.
	(tui_clear_source_content): Rename tuiClearSourceContent.
	(tui_erase_source_content): Rename tuiEraseSourceContent.
	(tui_set_source_content_nil): Rename tuiSetSourceContentNil.
	(tui_show_source_content): Rename tuiShowSourceContent.
	(tui_horizontal_source_scroll): Rename tuiHorizontalSourceScroll.
	(tui_set_exec_info_content): Rename tuiSetExecInfoContent.
	(tui_show_exec_info_content): Rename tuiShowExecInfoContent.
	(tui_erase_exec_info_content): Rename tuiEraseExecInfoContent.
	(tui_clear_exec_info_content): Rename tuiClearExecInfoContent.
	(tui_update_exec_info): Rename tuiUpdateExecInfo.
	(tui_set_is_exec_point_at): Rename tuiSetIsExecPointAt.
	(tui_alloc_source_buffer): Rename tuiAllocSourceBuffer.
	(tui_line_is_displayed): Rename tuiLineIsDisplayed.
	(tui_addr_is_displayed): Rename tuiAddrIsDisplayed.
	(struct tui_win_info): Declare.
	* tui/tui-stack.c: Update references.
	* tui/tui-layout.c, tui/tui-winsource.c: Ditto.
	* tui/tui-win.c, tui/tui-source.c: Ditto.
	* tui/tui.c, tui/tui-disasm.c: Ditto.

1 files changed, 4 insertions, 4 deletions

diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index 249f5d7..fad4e37 100644
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -248,7 +248,7 @@ tui_set_layout (enum tui_layout_type layoutType,
 		   newLayout == DISASSEM_DATA_COMMAND))
 		tuiDisplayAllData ();
 
-	      tuiUpdateSourceWindowsWithAddr (addr);
+	      tui_update_source_windows_with_addr (addr);
 	    }
 	  if (regsPopulate)
 	    {
@@ -799,7 +799,7 @@ _showSourceDisassemCommand (void)
 	{
 	  TuiGenWinInfoPtr locator = locatorWinInfoPtr ();
 
-	  tuiShowSourceContent (srcWin);
+	  tui_show_source_content (srcWin);
 	  if (m_winPtrIsNull (disassemWin))
 	    {
 	      _makeDisassemWindow (&disassemWin, asmHeight, srcHeight - 1);
@@ -843,7 +843,7 @@ _showSourceDisassemCommand (void)
 	      disassemWin->detail.sourceInfo.hasLocator = TRUE;
 	      m_beVisible (locator);
 	      tui_show_locator_content ();
-	      tuiShowSourceContent (disassemWin);
+	      tui_show_source_content (disassemWin);
 
 	      if (m_winPtrIsNull (cmdWin))
 		_makeCommandWindow (&cmdWin,
@@ -1114,7 +1114,7 @@ _showSourceOrDisassemAndCommand (TuiLayoutType layoutType)
 	  (*winInfoPtr)->detail.sourceInfo.hasLocator = TRUE;
 	  m_beVisible (locator);
 	  tui_show_locator_content ();
-	  tuiShowSourceContent (*winInfoPtr);
+	  tui_show_source_content (*winInfoPtr);
 
 	  if (m_winPtrIsNull (cmdWin))
 	    {