Skip to content

Conversation

@hillwoodroc
Copy link
Contributor

@hillwoodroc hillwoodroc commented Dec 4, 2025

Qt 6.10 no longer accepts QDBusReply as an argument to QString::arg(). Passing a QDBusReply directly results in a template substitution failure with enable_if.

This fix extracts the actual value using .value() before passing it to QString::arg(), restoring compatibility with Qt 6.10 and preserving existing logic.

Summary by Sourcery

Bug Fixes:

  • Fix incompatibility with Qt 6.10 by extracting the process ID value from the QDBusReply before passing it to QString::arg().

@deepin-ci-robot
Copy link

Hi @hillwoodroc. Thanks for your PR.

I'm waiting for a linuxdeepin member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@sourcery-ai
Copy link

sourcery-ai bot commented Dec 4, 2025

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Adapts a QString::arg() call to be compatible with Qt 6.10 by extracting the numeric value from a QDBusReply before formatting the string, preserving existing behavior while fixing a template substitution failure.

Sequence diagram for SessionManager::SetLocked QDBusReply value extraction

sequenceDiagram
    participant SessionManager
    participant QDBusConnection
    participant QDBusConnectionInterface
    participant QDBusReply_unsigned_int as QDBusReply_unsigned_int
    participant QString

    SessionManager->>QDBusConnection: connection()
    QDBusConnection-->>SessionManager: QDBusConnection

    SessionManager->>QDBusConnection: interface()
    QDBusConnection-->>SessionManager: QDBusConnectionInterface

    SessionManager->>QDBusConnectionInterface: servicePid(message().service())
    QDBusConnectionInterface-->>SessionManager: QDBusReply_unsigned_int

    SessionManager->>QDBusReply_unsigned_int: value()
    QDBusReply_unsigned_int-->>SessionManager: unsigned_int_pid

    SessionManager->>QString: QString("/proc/%1/cmdline").arg(unsigned_int_pid)
    QString-->>SessionManager: cmdLine (QString)
Loading

File-Level Changes

Change Details Files
Make QString::arg call compatible with Qt 6.10 by passing a plain value instead of a QDBusReply object.
  • Change the argument to QString::arg() from a QDBusReply to the result of calling .value() on that reply
  • Keep the resulting /proc path construction logic unchanged apart from the type fix
src/dde-session/impl/sessionmanager.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

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 there - I've reviewed your changes - here's some feedback:

  • Consider checking the QDBusReply from servicePid() for validity (e.g., reply.isValid()) before calling .value(), so that you can handle or log error cases instead of silently using a default-constructed value when the DBus call fails.
Prompt for AI Agents
Please address the comments from this code review:

## Overall Comments
- Consider checking the QDBusReply from servicePid() for validity (e.g., reply.isValid()) before calling .value(), so that you can handle or log error cases instead of silently using a default-constructed value when the DBus call fails.

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-bot
Copy link

deepin-bot bot commented Dec 4, 2025

TAG Bot

New tag: 2.0.11
DISTRIBUTION: unstable
Suggest: synchronizing this PR through rebase #177

Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR fixes a compilation issue with Qt 6.10 where QDBusReply<T> can no longer be directly passed to QString::arg() due to template substitution failures. The fix extracts the actual value using .value() before passing it to the formatting function.

Key Changes:

  • Modified SetLocked() method to call .value() on the QDBusReply<unsigned int> returned by servicePid() before using it in QString::arg()

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Qt 6.10.1 no longer accepts QDBusReply<T> as an argument to QString::arg().
Passing a QDBusReply<unsigned int> directly results in a template
substitution failure with enable_if<false>.

This fix extracts the actual value using .value() before passing it
to QString::arg(), restoring compatibility with Qt 6.10.1 and preserving
existing logic.
@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: hillwoodroc, zccrs

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

@zccrs zccrs merged commit 8d9927d into linuxdeepin:master Dec 5, 2025
15 of 16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants