From 1f8f8f3483e0d1600e4033ca0d2efd2e3020080b Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Thu, 5 Sep 2024 14:27:58 +0200 Subject: [PATCH] VCS: Unify displayName() * Uppercase first letter or whole name * Do not translate the name * Move implementation to declaration to immediately see all names in Find Usages Change-Id: I45f9b8bd8cfab46ab72548d22b140169880fe81f Reviewed-by: Orgad Shaneh Reviewed-by: Eike Ziller Reviewed-by: Oswald Buddenhagen --- src/plugins/bazaar/bazaarplugin.cpp | 7 +------ src/plugins/clearcase/clearcaseplugin.cpp | 7 +------ src/plugins/cvs/cvsplugin.cpp | 2 +- src/plugins/fossil/fossilplugin.cpp | 7 +------ src/plugins/git/gitplugin.cpp | 7 +------ src/plugins/mercurial/mercurialplugin.cpp | 7 +------ src/plugins/perforce/perforceplugin.cpp | 2 +- src/plugins/subversion/subversionplugin.cpp | 7 +------ 8 files changed, 8 insertions(+), 38 deletions(-) diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp index f200c36b682..e1a9d0dce75 100644 --- a/src/plugins/bazaar/bazaarplugin.cpp +++ b/src/plugins/bazaar/bazaarplugin.cpp @@ -128,7 +128,7 @@ class BazaarPluginPrivate final : public VersionControlBase public: BazaarPluginPrivate(); - QString displayName() const final; + QString displayName() const final { return "Bazaar"; } Utils::Id id() const final; bool isVcsFileOrDirectory(const Utils::FilePath &filePath) const final; @@ -855,11 +855,6 @@ void BazaarPluginPrivate::updateActions(VersionControlBase::ActionState as) repoAction->setEnabled(repoEnabled); } -QString BazaarPluginPrivate::displayName() const -{ - return Tr::tr("Bazaar"); -} - Utils::Id BazaarPluginPrivate::id() const { return Utils::Id(VcsBase::Constants::VCS_ID_BAZAAR); diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index 5116cd1978c..ea7963a0b5c 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -119,7 +119,7 @@ public: ~ClearCasePluginPrivate() final; // IVersionControl - QString displayName() const final; + QString displayName() const final { return "ClearCase"; } Id id() const final; bool isVcsFileOrDirectory(const FilePath &filePath) const final; @@ -2302,11 +2302,6 @@ void ClearCasePluginPrivate::sync(QPromise &promise, QStringList files) ccSync.run(promise, files); } -QString ClearCasePluginPrivate::displayName() const -{ - return QLatin1String("ClearCase"); -} - Id ClearCasePluginPrivate::id() const { return Constants::VCS_ID_CLEARCASE; diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index 4d6a8e51789..78839306581 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/src/plugins/cvs/cvsplugin.cpp @@ -158,7 +158,7 @@ public: ~CvsPluginPrivate() final; // IVersionControl - QString displayName() const final { return QLatin1String("cvs"); } + QString displayName() const final { return "CVS"; } Utils::Id id() const final; bool isVcsFileOrDirectory(const Utils::FilePath &filePath) const final; diff --git a/src/plugins/fossil/fossilplugin.cpp b/src/plugins/fossil/fossilplugin.cpp index 9d8e68efa00..6401f58b658 100644 --- a/src/plugins/fossil/fossilplugin.cpp +++ b/src/plugins/fossil/fossilplugin.cpp @@ -73,7 +73,7 @@ public: FossilPluginPrivate(); // IVersionControl - QString displayName() const final; + QString displayName() const final { return "Fossil"; } Id id() const final; bool isVcsFileOrDirectory(const FilePath &filePath) const final; @@ -778,11 +778,6 @@ void FossilPluginPrivate::updateActions(VersionControlBase::ActionState as) repoAction->setEnabled(repoEnabled); } -QString FossilPluginPrivate::displayName() const -{ - return Tr::tr("Fossil"); -} - Id FossilPluginPrivate::id() const { return Id(Constants::VCS_ID_FOSSIL); diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index a7240ffcaf3..7afe9fcfac7 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -147,7 +147,7 @@ public: ~GitPluginPrivate() final; // IVersionControl - QString displayName() const final; + QString displayName() const final { return "Git"; } Id id() const final; bool isVcsFileOrDirectory(const FilePath &filePath) const final; @@ -1735,11 +1735,6 @@ void GitPluginPrivate::updateRepositoryBrowserAction() m_repositoryBrowserAction->setEnabled(repositoryEnabled && hasRepositoryBrowserCmd); } -QString GitPluginPrivate::displayName() const -{ - return QLatin1String("Git"); -} - Id GitPluginPrivate::id() const { return Id(VcsBase::Constants::VCS_ID_GIT); diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp index 29193f5c336..23f8abffa14 100644 --- a/src/plugins/mercurial/mercurialplugin.cpp +++ b/src/plugins/mercurial/mercurialplugin.cpp @@ -58,7 +58,7 @@ public: MercurialPluginPrivate(); // IVersionControl - QString displayName() const final; + QString displayName() const final { return "Mercurial"; } Utils::Id id() const final; bool isVcsFileOrDirectory(const FilePath &filePath) const final; @@ -640,11 +640,6 @@ void MercurialPluginPrivate::updateActions(VersionControlBase::ActionState as) repoAction->setEnabled(repoEnabled); } -QString MercurialPluginPrivate::displayName() const -{ - return Tr::tr("Mercurial"); -} - Utils::Id MercurialPluginPrivate::id() const { return {VcsBase::Constants::VCS_ID_MERCURIAL}; diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index a9c14748ea9..eb153552dcd 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -151,7 +151,7 @@ public: PerforcePluginPrivate(); // IVersionControl - QString displayName() const final { return {"perforce"}; } + QString displayName() const final { return "Perforce"; } Id id() const final { return VcsBase::Constants::VCS_ID_PERFORCE; } bool isVcsFileOrDirectory(const FilePath &filePath) const final; diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index 2339893fcd4..cac2176f1be 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -133,7 +133,7 @@ public: ~SubversionPluginPrivate() final; // IVersionControl - QString displayName() const final; + QString displayName() const final { return "Subversion"; } Utils::Id id() const final; bool isVcsFileOrDirectory(const FilePath &filePath) const final; @@ -1050,11 +1050,6 @@ bool SubversionPluginPrivate::checkSVNSubDir(const QDir &directory) const return false; } -QString SubversionPluginPrivate::displayName() const -{ - return QLatin1String("subversion"); -} - Utils::Id SubversionPluginPrivate::id() const { return Utils::Id(VcsBase::Constants::VCS_ID_SUBVERSION);