From patchwork Thu Jul 4 17:03:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 33593 Received: (qmail 114023 invoked by alias); 4 Jul 2019 17:04:23 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 108446 invoked by uid 89); 4 Jul 2019 17:03:48 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-19.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy= X-HELO: gateway22.websitewelcome.com Received: from gateway22.websitewelcome.com (HELO gateway22.websitewelcome.com) (192.185.46.194) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 04 Jul 2019 17:03:40 +0000 Received: from cm14.websitewelcome.com (cm14.websitewelcome.com [100.42.49.7]) by gateway22.websitewelcome.com (Postfix) with ESMTP id DE04A266A1 for ; Thu, 4 Jul 2019 12:03:35 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id j58xhGitt2qH7j58xhNqK4; Thu, 04 Jul 2019 12:03:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=AST7L8tsM4ZDdvcdjgq8QGGU29fpTQ2LICjfDY2WeSM=; b=kXnB+9kAJVLIRtZl/hqfNCMrwm SHnfh52bJArSIVaL2QcPPuxvhFQftmUG5IOM3frMciNksslLSv2Qcz35ztD5bAHV1jaD9170P52/q eeIGU4DnFoQv1oaxGKOi6KzGZ; Received: from 174-29-58-150.hlrn.qwest.net ([174.29.58.150]:34704 helo=bapiya.Home) by box5379.bluehost.com with esmtpa (Exim 4.92) (envelope-from ) id 1hj58x-002sNV-Ll; Thu, 04 Jul 2019 12:03:35 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 57/61] Move tui_source_window to tui-source.h Date: Thu, 4 Jul 2019 11:03:07 -0600 Message-Id: <20190704170311.15982-58-tom@tromey.com> In-Reply-To: <20190704170311.15982-1-tom@tromey.com> References: <20190704170311.15982-1-tom@tromey.com> This moves tui_source_window to tui-source.h. In this case there were no method definitions to be moved. 2019-07-04 Tom Tromey * tui/tui.c: Update. * tui/tui-source.h (struct tui_source_window): Move from tui-data.h. * tui/tui-layout.c: Update. * tui/tui-disasm.c: Update. * tui/tui-data.h (struct tui_source_window): Move to tui-source.h. --- gdb/ChangeLog | 10 ++++++++++ gdb/tui/tui-data.h | 31 +------------------------------ gdb/tui/tui-disasm.c | 1 + gdb/tui/tui-layout.c | 1 + gdb/tui/tui-source.h | 31 ++++++++++++++++++++++++++++++- gdb/tui/tui.c | 1 + 6 files changed, 44 insertions(+), 31 deletions(-) diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index 3446d51b8dc..0d984ad3b4c 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -27,6 +27,7 @@ #include "observable.h" struct tui_cmd_window; +struct tui_source_window; /* This is a point definition. */ struct tui_point @@ -382,36 +383,6 @@ public: std::vector content; }; -/* A TUI source window. */ - -struct tui_source_window : public tui_source_window_base -{ - tui_source_window (); - ~tui_source_window (); - - DISABLE_COPY_AND_ASSIGN (tui_source_window); - - const char *name () const override - { - return SRC_NAME; - } - - bool location_matches_p (struct bp_location *loc, int line_no) override; - - bool showing_source_p (const char *filename) const; - -protected: - - void do_scroll_vertical (int num_to_scroll) override; - -private: - - void style_changed (); - - /* A token used to register and unregister an observer. */ - gdb::observers::token m_observable; -}; - extern int tui_win_is_auxiliary (enum tui_win_type win_type); diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c index a644c287cab..effe8e74528 100644 --- a/gdb/tui/tui-disasm.c +++ b/gdb/tui/tui-disasm.c @@ -35,6 +35,7 @@ #include "tui/tui-stack.h" #include "tui/tui-file.h" #include "tui/tui-disasm.h" +#include "tui/tui-source.h" #include "progspace.h" #include "objfiles.h" diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index 2e67ed15238..a5709c595f3 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -37,6 +37,7 @@ #include "tui/tui-winsource.h" #include "tui/tui-disasm.h" #include "tui/tui-layout.h" +#include "tui/tui-source.h" #include "gdb_curses.h" /******************************* diff --git a/gdb/tui/tui-source.h b/gdb/tui/tui-source.h index fc129ab8f26..6faaa2e9e0f 100644 --- a/gdb/tui/tui-source.h +++ b/gdb/tui/tui-source.h @@ -25,7 +25,36 @@ #include "tui/tui-data.h" struct symtab; -struct tui_win_info; + +/* A TUI source window. */ + +struct tui_source_window : public tui_source_window_base +{ + tui_source_window (); + ~tui_source_window (); + + DISABLE_COPY_AND_ASSIGN (tui_source_window); + + const char *name () const override + { + return SRC_NAME; + } + + bool location_matches_p (struct bp_location *loc, int line_no) override; + + bool showing_source_p (const char *filename) const; + +protected: + + void do_scroll_vertical (int num_to_scroll) override; + +private: + + void style_changed (); + + /* A token used to register and unregister an observer. */ + gdb::observers::token m_observable; +}; extern enum tui_status tui_set_source_content (tui_source_window_base *, struct symtab *, diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c index 22de9a70b82..b15eb32af5e 100644 --- a/gdb/tui/tui.c +++ b/gdb/tui/tui.c @@ -31,6 +31,7 @@ #include "tui/tui-stack.h" #include "tui/tui-win.h" #include "tui/tui-winsource.h" +#include "tui/tui-source.h" #include "target.h" #include "frame.h" #include "breakpoint.h"