From patchwork Sat Aug 3 13:29: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: 33929 Received: (qmail 94546 invoked by alias); 3 Aug 2019 13:29:32 -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 94533 invoked by uid 89); 3 Aug 2019 13:29:31 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.8 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: gateway20.websitewelcome.com Received: from gateway20.websitewelcome.com (HELO gateway20.websitewelcome.com) (192.185.63.14) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 03 Aug 2019 13:29:29 +0000 Received: from cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway20.websitewelcome.com (Postfix) with ESMTP id 7B966400CC7D9 for ; Sat, 3 Aug 2019 07:25:45 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id tu6Chg5HkdnCetu6Ch8XWK; Sat, 03 Aug 2019 08:29:28 -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=bNGL/MeK/V+o8LDenFGoOaK60QvsJCxe4SPxYca6Bac=; b=efieyTGqbC22ElMU5/nE8b6sHC nlbDTCd87qfRgKGn9ll6qbm0o4DaaUGpqjdmrIFjBbd8thpyVj+tTG2D7ijcmfSSTr0C9eK+19nTo Orxtt/viIovj3U2lT4n4FC3Dv; Received: from 97-122-178-82.hlrn.qwest.net ([97.122.178.82]:36980 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1htu6C-003nqS-BS; Sat, 03 Aug 2019 08:29:28 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 01/19] clear_detail can only be called on TUI source windows Date: Sat, 3 Aug 2019 07:29:07 -0600 Message-Id: <20190803132925.25074-2-tom@tromey.com> In-Reply-To: <20190803132925.25074-1-tom@tromey.com> References: <20190803132925.25074-1-tom@tromey.com> The clear_detail method can only be called on source windows, so remove definitions from the base of the class hierarchy, leaving only a single non-virtual method. gdb/ChangeLog 2019-08-03 Tom Tromey * tui/tui-winsource.h (struct tui_source_window_base) : No longer "override". * tui/tui-regs.h (struct tui_data_window) : Remove. * tui/tui-regs.c (tui_data_window::clear_detail): Remove. * tui/tui-data.h (struct tui_win_info) : Remove. * tui/tui-command.h (struct tui_cmd_window) : Remove. * tui/tui-command.c (tui_cmd_window::clear_detail): Remove. --- gdb/ChangeLog | 11 +++++++++++ gdb/tui/tui-command.c | 8 -------- gdb/tui/tui-command.h | 2 -- gdb/tui/tui-data.h | 3 --- gdb/tui/tui-regs.c | 10 ---------- gdb/tui/tui-regs.h | 1 - gdb/tui/tui-winsource.h | 2 +- 7 files changed, 12 insertions(+), 25 deletions(-) diff --git a/gdb/tui/tui-command.c b/gdb/tui/tui-command.c index 5af3484b9ec..034abd57982 100644 --- a/gdb/tui/tui-command.c +++ b/gdb/tui/tui-command.c @@ -30,14 +30,6 @@ /* See tui-command.h. */ -void -tui_cmd_window::clear_detail () -{ - wmove (handle, 0, 0); -} - -/* See tui-command.h. */ - void tui_cmd_window::do_make_visible_with_new_height () { diff --git a/gdb/tui/tui-command.h b/gdb/tui/tui-command.h index d2a8ab1903a..af80b1449fa 100644 --- a/gdb/tui/tui-command.h +++ b/gdb/tui/tui-command.h @@ -35,8 +35,6 @@ struct tui_cmd_window : public tui_win_info DISABLE_COPY_AND_ASSIGN (tui_cmd_window); - void clear_detail () override; - void make_visible (bool visible) override { } diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index 214f728befe..5a7c487def4 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -249,9 +249,6 @@ public: { } - /* Clear the pertinent detail in the window. */ - virtual void clear_detail () = 0; - /* Called after all the TUI windows are refreshed, to let this window have a chance to update itself further. */ virtual void refresh_all () diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c index c13a5b15871..27654629181 100644 --- a/gdb/tui/tui-regs.c +++ b/gdb/tui/tui-regs.c @@ -520,16 +520,6 @@ tui_data_window::do_scroll_vertical (int num_to_scroll) /* See tui-regs.h. */ -void -tui_data_window::clear_detail () -{ - regs_content.clear (); - regs_column_count = 1; - display_regs = false; -} - -/* See tui-regs.h. */ - void tui_data_window::set_new_height (int height) { diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h index 06467299176..b2abfc2078d 100644 --- a/gdb/tui/tui-regs.h +++ b/gdb/tui/tui-regs.h @@ -53,7 +53,6 @@ struct tui_data_window : public tui_win_info DISABLE_COPY_AND_ASSIGN (tui_data_window); - void clear_detail () override; void refresh_all () override; void set_new_height (int height) override; diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h index ec44d1d2c02..9d7f0a7d774 100644 --- a/gdb/tui/tui-winsource.h +++ b/gdb/tui/tui-winsource.h @@ -67,7 +67,7 @@ protected: public: - void clear_detail () override; + void clear_detail (); void make_visible (bool visible) override; void refresh_window () override;