From 35df237df24bf24f44800a45af26a09cf1d09f16 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 5 Aug 2024 23:47:58 +0300 Subject: [PATCH] Git: Minor cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I577be16b310566700f5d70d0f372e90094ff835e Reviewed-by: André Hartmann --- src/plugins/git/gitclient.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index b7f14ec910b..ce05c3c8c8f 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -61,7 +61,7 @@ const char GIT_DIRECTORY[] = ".git"; const char HEAD[] = "HEAD"; const char CHERRY_PICK_HEAD[] = "CHERRY_PICK_HEAD"; -[[maybe_unused]] const char BRANCHES_PREFIX[] = "Branches: "; +const char BRANCHES_PREFIX[] = "Branches: "; const char stashNamePrefix[] = "stash@{"; const char noColorOption[] = "--no-color"; const char colorOption[] = "--color=always"; @@ -467,7 +467,7 @@ ShowController::ShowController(IDocument *document, const QString &id) const auto updateDescription = [this](const ReloadStorage &storage) { QString desc = storage.m_header; if (!storage.m_branches.isEmpty()) - desc.append("Branches: " + storage.m_branches + '\n'); + desc.append(BRANCHES_PREFIX + storage.m_branches + '\n'); if (!storage.m_precedes.isEmpty()) desc.append("Precedes: " + storage.m_precedes + '\n'); QStringList follows; @@ -963,7 +963,7 @@ FilePaths GitClient::unmanagedFiles(const FilePaths &filePaths) const return filePaths; const auto toAbs = [&wd](const QString &fp) { return wd.absoluteFilePath(fp); }; const QStringList managedFilePaths = - Utils::transform(result.cleanedStdOut().split('\0', Qt::SkipEmptyParts), toAbs); + Utils::transform(result.cleanedStdOut().split(QChar('\0'), Qt::SkipEmptyParts), toAbs); const QStringList absPaths = Utils::transform(it.value(), toAbs); const QStringList filtered = Utils::filtered(absPaths, [&managedFilePaths](const QString &fp) { return !managedFilePaths.contains(fp);