Use symtab_and_line when updating TUI windows

[deliverable/binutils-gdb.git] / gdb / tui / tui-source.h

diff --git a/gdb/tui/tui-source.h b/gdb/tui/tui-source.h
index 4233879094721bb4370a941fa8a6235cb93fc34d..beff9bc29a32ba73ccffd5b2406c15746708f2d4 100644 (file)
--- a/gdb/tui/tui-source.h
+++ b/gdb/tui/tui-source.h
@@ -31,8 +31,10 @@ struct symtab;
 
 struct tui_source_window : public tui_source_window_base
 {
-  tui_source_window ();
-  ~tui_source_window ();
+  tui_source_window ()
+    : tui_source_window_base (SRC_WIN)
+  {
+  }
 
   DISABLE_COPY_AND_ASSIGN (tui_source_window);
 
@@ -47,32 +49,28 @@ struct tui_source_window : public tui_source_window_base
 
   bool showing_source_p (const char *filename) const;
 
-  void maybe_update (struct frame_info *fi, symtab_and_line sal,
-                    int line_no, CORE_ADDR addr)
-    override;
+  void maybe_update (struct frame_info *fi, symtab_and_line sal) override;
+
+  void erase_source_content () override
+  {
+    do_erase_source_content (_("[ No Source Available ]"));
+  }
 
 protected:
 
   void do_scroll_vertical (int num_to_scroll) override;
 
-private:
+  bool set_contents (struct gdbarch *gdbarch,
+                    const struct symtab_and_line &sal) override;
 
-  void style_changed ();
+private:
 
   /* Answer whether a particular line number or address is displayed
      in the current source window.  */
   bool line_is_displayed (int line) const;
 
-  /* A token used to register and unregister an observer.  */
-  gdb::observers::token m_observable;
+  /* It is the resolved form as returned by symtab_to_fullname.  */
+  gdb::unique_xmalloc_ptr<char> m_fullname;
 };
 
-extern enum tui_status tui_set_source_content (tui_source_window_base *,
-                                              struct symtab *, 
-                                              int, int);
-extern void tui_show_symtab_source (tui_source_window_base *,
-                                   struct gdbarch *, struct symtab *,
-                                   struct tui_line_or_address,
-                                   int);
-
 #endif /* TUI_TUI_SOURCE_H */