Skip to content

Conversation

@wjyrich
Copy link
Contributor

@wjyrich wjyrich commented Jul 16, 2025

  1. Fixed incorrect calculation of position when removing elements from m_data
  2. Changed from using m_data.end() to m_data.begin() for proper position determination
  3. This ensures correct row removal behavior in the model's data management
  4. Prevents potential crashes or incorrect model states due to invalid position calculations

fix: 修复 DockGlobalElementModel 中的迭代器位置计算问题

  1. 修复了从 m_data 中移除元素时位置计算错误的问题
  2. 将 m_data.end() 改为使用 m_data.begin() 以正确确定位置
  3. 确保模型数据管理中的正确行移除行为
  4. 防止由于无效位置计算导致的潜在崩溃或模型状态错误

Pms: BUG-318455 BUG-319543

Summary by Sourcery

Bug Fixes:

  • Use m_data.begin() instead of m_data.end() to compute removal position, preventing invalid row removal and potential crashes

1. Fixed incorrect calculation of position when removing elements from
m_data
2. Changed from using m_data.end() to m_data.begin() for proper position
determination
3. This ensures correct row removal behavior in the model's data
management
4. Prevents potential crashes or incorrect model states due to invalid
position calculations

fix: 修复 DockGlobalElementModel 中的迭代器位置计算问题

1. 修复了从 m_data 中移除元素时位置计算错误的问题
2. 将 m_data.end() 改为使用 m_data.begin() 以正确确定位置
3. 确保模型数据管理中的正确行移除行为
4. 防止由于无效位置计算导致的潜在崩溃或模型状态错误

Pms: BUG-318455 BUG-319543
@sourcery-ai
Copy link

sourcery-ai bot commented Jul 16, 2025

Reviewer's Guide

Refines the row removal logic in DockGlobalElementModel by recalculating the element index using m_data.begin() rather than m_data.end(), ensuring accurate removal of entries and preventing invalid iterator-based positions.

Sequence diagram for corrected row removal in DockGlobalElementModel

sequenceDiagram
    participant Model as DockGlobalElementModel
    participant Data as m_data
    participant Qt as QtView
    Model->>Data: Find iterator 'it' for element
    Model->>Model: Calculate pos = it - m_data.begin()
    Model->>Qt: beginRemoveRows(pos, pos)
    Model->>Data: remove(pos)
    Model->>Qt: endRemoveRows()
Loading

Class diagram for DockGlobalElementModel row removal logic

classDiagram
    class DockGlobalElementModel {
        - m_data
        - m_appsModel
        + DockGlobalElementModel(QAbstractItemModel *appsModel, DockGlobalElementModel *parent)
        + removeRow()
    }
    class m_data {
        <<container>>
    }
    DockGlobalElementModel --> m_data : manages
    DockGlobalElementModel --> QAbstractItemModel : uses
Loading

File-Level Changes

Change Details Files
Fixed iterator-based index calculation for row removal
  • Replaced subtraction from m_data.end() with subtraction from m_data.begin() to derive the correct position
  • Passed the corrected index into beginRemoveRows/endRemoveRows calls
  • Removed the element from m_data using the validated position
panels/dock/taskmanager/dockglobalelementmodel.cpp

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@deepin-ci-robot
Copy link

deepin pr auto review

关键摘要:

  • 代码中的迭代器减法操作可能存在逻辑错误,应该使用 std::distance 函数来计算索引位置。

是否建议立即修改:

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @wjyrich - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: BLumia, wjyrich

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@wjyrich
Copy link
Contributor Author

wjyrich commented Jul 16, 2025

/forcemerge

@deepin-bot
Copy link

deepin-bot bot commented Jul 16, 2025

This pr force merged! (status: blocked)

@deepin-bot deepin-bot bot merged commit c6c67f4 into linuxdeepin:master Jul 16, 2025
7 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants