sync: from linuxdeepin/qt5integration#77
Merged
18202781743 merged 1 commit intomasterfrom May 26, 2025
Merged
Conversation
Synchronize source files from linuxdeepin/qt5integration. Source-pull-request: linuxdeepin/qt5integration#268
Contributor
Author
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: deepin-ci-robot The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Contributor
Author
deepin pr auto review代码审查意见:
综合以上意见,修改后的代码可能如下: QPixmap QSvgIconEngine::pixmap(const QSize &size, QIcon::Mode mode,
const QTransform &transform) {
// ... 其他代码 ...
QString cacheFile;
const QFileInfo svgFileInfo(svgFile);
// ostree管理的源文件 lastModified 被重置为1970-01-01,qt认为是无效时间,无法设置到缓存文件中
if (Q_LIKELY(!svgFile.startsWith(":/") && svgFileInfo.exists() && svgFileInfo.lastModified().isValid())) {
static const QString &cachePath = getIconCachePath();
if (Q_LIKELY(!cachePath.isEmpty())) {
cacheFile = cachePath + "/" + svgFile;
}
}
const QFileInfo cacheFileInfo(cacheFile);
if (Q_LIKELY(cacheFileInfo.exists())) {
if (Q_UNLIKELY(svgFileInfo.lastModified() != cacheFileInfo.lastModified())) {
// clear invalid cache file
QFile::remove(cacheFile);
}
}
// ... 其他代码 ...
}以上修改提高了代码的可读性、性能和一致性,并处理了潜在的逻辑错误。 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Synchronize source files from linuxdeepin/qt5integration.
Source-pull-request: linuxdeepin/qt5integration#268