From 78f1b8ec21cc63ac4ec913aa2271e962ba327bac Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Tue, 18 Jun 2024 15:40:50 +0200 Subject: [PATCH] Fix typos Signed-off-by: Sven Strickroth --- src/TortoiseProc/ColumnManager.h | 4 ++-- src/TortoiseProc/GitLogListBase.cpp | 6 +++--- src/TortoiseProc/refloglist.cpp | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/TortoiseProc/ColumnManager.h b/src/TortoiseProc/ColumnManager.h index 8c3c012ac..3ee53ee5a 100644 --- a/src/TortoiseProc/ColumnManager.h +++ b/src/TortoiseProc/ColumnManager.h @@ -1,6 +1,6 @@ // TortoiseGit - a Windows shell extension for easy version control -// Copyright (C) 2016, 2019-2020, 2023 - TortoiseGit +// Copyright (C) 2016, 2019-2020, 2023-2024 - TortoiseGit // Copyright (C) 2003-2008, 2014 - TortoiseSVN // This program is free software; you can redistribute it and/or @@ -43,7 +43,7 @@ public: /// registry access - void ReadSettings(DWORD defaultColumns, DWORD hideColumns, const CString& containerName, DWORD version, int maxsize, int* withlist = nullptr); + void ReadSettings(DWORD defaultColumns, DWORD hideColumns, const CString& containerName, DWORD version, int maxsize, int* widthlist = nullptr); void WriteSettings() const; /// read column definitions diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp index e3b11b673..d2e6946d0 100644 --- a/src/TortoiseProc/GitLogListBase.cpp +++ b/src/TortoiseProc/GitLogListBase.cpp @@ -336,7 +336,7 @@ void CGitLogListBase::InsertGitColumn() auto iconItemBorder = CDPIAware::Instance().ScaleX(GetSafeHwnd(), ICONITEMBORDER); auto columnWidth = CDPIAware::Instance().ScaleX(GetSafeHwnd(), ICONITEMBORDER + 16 * 4); - static int with[] = + static int columnWidths[] = { columnWidth, columnWidth, @@ -353,7 +353,7 @@ void CGitLogListBase::InsertGitColumn() columnWidth, columnWidth, }; - static_assert(_countof(normal) == _countof(with)); + static_assert(_countof(normal) == _countof(columnWidths)); m_dwDefaultColumns = GIT_LOG_GRAPH|GIT_LOG_ACTIONS|GIT_LOG_MESSAGE|GIT_LOG_AUTHOR|GIT_LOG_DATE; DWORD hideColumns = 0; @@ -385,7 +385,7 @@ void CGitLogListBase::InsertGitColumn() m_ColumnManager.SetNames(normal, _countof(normal)); constexpr int columnVersion = 6; // adjust when changing number/names/etc. of columns - m_ColumnManager.ReadSettings(m_dwDefaultColumns, hideColumns, m_ColumnRegKey + L"loglist", columnVersion, _countof(normal), with); + m_ColumnManager.ReadSettings(m_dwDefaultColumns, hideColumns, m_ColumnRegKey + L"loglist", columnVersion, _countof(normal), columnWidths); m_ColumnManager.SetRightAlign(LOGLIST_ID); if (!(hideColumns & GIT_LOG_ACTIONS)) diff --git a/src/TortoiseProc/refloglist.cpp b/src/TortoiseProc/refloglist.cpp index deafa0480..9c76239ac 100644 --- a/src/TortoiseProc/refloglist.cpp +++ b/src/TortoiseProc/refloglist.cpp @@ -49,7 +49,7 @@ void CRefLogList::InsertRefLogColumn() }; auto columnWidth = CDPIAware::Instance().ScaleX(GetSafeHwnd(), ICONITEMBORDER + 16 * 4); - static int with[] = + static int columnWidths[] = { columnWidth, columnWidth, @@ -57,14 +57,14 @@ void CRefLogList::InsertRefLogColumn() CDPIAware::Instance().ScaleX(GetSafeHwnd(), LOGLIST_MESSAGE_MIN), columnWidth, }; - static_assert(_countof(normal) == _countof(with)); + static_assert(_countof(normal) == _countof(columnWidths)); m_dwDefaultColumns = 0xFFFF; SetRedraw(false); m_ColumnManager.SetNames(normal, _countof(normal)); constexpr int columnVersion = 6; // adjust when changing number/names/etc. of columns - m_ColumnManager.ReadSettings(m_dwDefaultColumns, 0, m_ColumnRegKey + L"loglist", columnVersion, _countof(normal), with); + m_ColumnManager.ReadSettings(m_dwDefaultColumns, 0, m_ColumnRegKey + L"loglist", columnVersion, _countof(normal), columnWidths); SetRedraw(true); } -- 2.11.4.GIT