From patchwork Fri Aug 16 16:15:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 34147 Received: (qmail 74395 invoked by alias); 16 Aug 2019 16:15:52 -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 73960 invoked by uid 89); 16 Aug 2019 16:15:26 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-19.4 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: gateway23.websitewelcome.com Received: from gateway23.websitewelcome.com (HELO gateway23.websitewelcome.com) (192.185.50.108) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 16 Aug 2019 16:15:15 +0000 Received: from cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway23.websitewelcome.com (Postfix) with ESMTP id D7D8A175AF for ; Fri, 16 Aug 2019 11:15:13 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id yesjh8Y1udnCeyesjhYWqr; Fri, 16 Aug 2019 11:15:13 -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=jhwWKQgSbFDRYEJthzYuJ5nvwIlcZkqmecarqWJFxnE=; b=ckjPyB8DjyVnDQjBgPVhF2m5Zm TZoW42uulZq5I+jzHH6AInfsXkTFXOGsZMKcox1zYV6SOPKhQOVWwNWhmeUquLxAOtJeA6aEKjjGB MXE1PdJGggse/apLpQfEck/Gh; Received: from 97-122-178-82.hlrn.qwest.net ([97.122.178.82]:40466 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1hyesj-002SJK-LI; Fri, 16 Aug 2019 11:15:13 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 1/9] Remove m_has_locator Date: Fri, 16 Aug 2019 10:15:03 -0600 Message-Id: <20190816161511.16162-2-tom@tromey.com> In-Reply-To: <20190816161511.16162-1-tom@tromey.com> References: <20190816161511.16162-1-tom@tromey.com> The previous patch removed the only use of m_has_locator, so this member can now be removed. gdb/ChangeLog 2019-08-16 Tom Tromey * tui/tui-winsource.h (struct tui_source_window_base) : Remove. * tui/tui-layout.c (show_source_disasm_command, show_data) (show_source_or_disasm_and_command): Update. --- gdb/ChangeLog | 7 +++++++ gdb/tui/tui-layout.c | 7 ------- gdb/tui/tui-winsource.h | 2 -- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index d81b8f9aa40..b7c5ed63c64 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -504,7 +504,6 @@ show_source_disasm_command (void) tui_term_width (), 0, 0); - TUI_SRC_WIN->m_has_locator = false; struct tui_locator_window *locator = tui_locator_win_info_ptr (); gdb_assert (locator != nullptr); @@ -520,8 +519,6 @@ show_source_disasm_command (void) tui_term_width (), 0, (src_height + asm_height) - 1); - TUI_SRC_WIN->m_has_locator = false; - TUI_DISASM_WIN->m_has_locator = true; TUI_DISASM_WIN->show_source_content (); if (TUI_CMD_WIN == NULL) @@ -565,8 +562,6 @@ show_data (enum tui_layout_type new_layout) tui_win_list[win_type] = new tui_disasm_window (); } - tui_source_window_base *base - = (tui_source_window_base *) tui_win_list[win_type]; tui_win_list[win_type]->resize (src_height, tui_term_width (), 0, @@ -578,7 +573,6 @@ show_data (enum tui_layout_type new_layout) TUI_CMD_WIN->resize (TUI_CMD_WIN->height, tui_term_width (), 0, total_height); - base->m_has_locator = true; current_layout = new_layout; } @@ -650,7 +644,6 @@ show_source_or_disasm_and_command (enum tui_layout_type layout_type) 0, 0); - win_info->m_has_locator = true; win_info->show_source_content (); if (TUI_CMD_WIN == NULL) diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h index 7304e726a76..a4167f50d7a 100644 --- a/gdb/tui/tui-winsource.h +++ b/gdb/tui/tui-winsource.h @@ -138,8 +138,6 @@ public: /* Erase the source content. */ virtual void erase_source_content () = 0; - /* Does the locator belong to this window? */ - bool m_has_locator = false; /* Execution information window. */ struct tui_exec_info_window *execution_info; /* Used for horizontal scroll. */