feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

GitPlugin: Drop unneeded namespace specifiers

Browse Source 
We have using namespace in this file.

Change-Id: I6e9f1259c917c446e52c5e407ec2139cc29c7216
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-09-06 17:04:24 +02:00
parent 51f493c1c8
commit 2f093aec66
1 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/plugins/git/gitplugin.cpp
View File

@@ -85,7 +85,7 @@ namespace Internal {
using GitClientMemberFunc = void (GitClient::*)(const FilePath &) const; using GitClientMemberFunc = void (GitClient::*)(const FilePath &) const;
class GitTopicCache : public Core::IVersionControl::TopicCache class GitTopicCache : public IVersionControl::TopicCache
{ {
public: public:
GitTopicCache(GitClient *client) : GitTopicCache(GitClient *client) :
@@ -203,7 +203,7 @@ const VcsBaseEditorParameters rebaseEditorParameters {
// GitPlugin // GitPlugin
class GitPluginPrivate final : public VcsBase::VcsBasePluginPrivate class GitPluginPrivate final : public VcsBasePluginPrivate
{ {
Q_OBJECT Q_OBJECT
@@ -213,7 +213,7 @@ public:
// IVersionControl // IVersionControl
QString displayName() const final; QString displayName() const final;
Utils::Id id() const final; Id id() const final;
bool isVcsFileOrDirectory(const FilePath &filePath) const final; bool isVcsFileOrDirectory(const FilePath &filePath) const final;
@@ -234,7 +234,7 @@ public:
QString vcsTopic(const FilePath &directory) final; QString vcsTopic(const FilePath &directory) final;
VcsCommand *createInitialCheckoutCommand(const QString &url, VcsCommand *createInitialCheckoutCommand(const QString &url,
const Utils::FilePath &baseDirectory, const FilePath &baseDirectory,
const QString &localName, const QString &localName,
const QStringList &extraArgs) final; const QStringList &extraArgs) final;
@@ -261,7 +261,7 @@ public:
RepoUrl getRepoUrl(const QString &location) const override; RepoUrl getRepoUrl(const QString &location) const override;
Utils::FilePaths additionalToolsPath() const final; FilePaths additionalToolsPath() const final;
bool isCommitEditorOpen() const; bool isCommitEditorOpen() const;
void startCommit(CommitType commitType = SimpleCommit); void startCommit(CommitType commitType = SimpleCommit);
@@ -272,7 +272,7 @@ public:
void initRepository(); void initRepository();
void startRebaseFromCommit(const FilePath &workingDirectory, QString commit); void startRebaseFromCommit(const FilePath &workingDirectory, QString commit);
void updateActions(VcsBase::VcsBasePluginPrivate::ActionState) override; void updateActions(VcsBasePluginPrivate::ActionState) override;
bool submitEditorAboutToClose() override; bool submitEditorAboutToClose() override;
void diffCurrentFile(); void diffCurrentFile();
@@ -287,7 +287,7 @@ public:
void resetRepository(); void resetRepository();
void recoverDeletedFiles(); void recoverDeletedFiles();
void startRebase(); void startRebase();
void startChangeRelatedAction(const Utils::Id &id); void startChangeRelatedAction(const Id &id);
void stageFile(); void stageFile();
void unstageFile(); void unstageFile();
void gitkForCurrentFile(); void gitkForCurrentFile();
@@ -313,41 +313,41 @@ public:
void updateContinueAndAbortCommands(); void updateContinueAndAbortCommands();
void delayedPushToGerrit(); void delayedPushToGerrit();
Core::Command *createCommand(QAction *action, Core::ActionContainer *ac, Utils::Id id, Command *createCommand(QAction *action, ActionContainer *ac, Id id,
const Core::Context &context, bool addToLocator, const Context &context, bool addToLocator,
const std::function<void()> &callback, const QKeySequence &keys); const std::function<void()> &callback, const QKeySequence &keys);
Utils::ParameterAction *createParameterAction(Core::ActionContainer *ac, ParameterAction *createParameterAction(ActionContainer *ac,
const QString &defaultText, const QString &parameterText, const QString &defaultText, const QString &parameterText,
Utils::Id id, const Core::Context &context, bool addToLocator, Id id, const Context &context, bool addToLocator,
const std::function<void()> &callback, const std::function<void()> &callback,
const QKeySequence &keys = QKeySequence()); const QKeySequence &keys = QKeySequence());
QAction *createFileAction(Core::ActionContainer *ac, QAction *createFileAction(ActionContainer *ac,
const QString &defaultText, const QString &parameterText, const QString &defaultText, const QString &parameterText,
Utils::Id id, const Core::Context &context, bool addToLocator, Id id, const Context &context, bool addToLocator,
const std::function<void()> &callback, const std::function<void()> &callback,
const QKeySequence &keys = QKeySequence()); const QKeySequence &keys = QKeySequence());
QAction *createProjectAction(Core::ActionContainer *ac, QAction *createProjectAction(ActionContainer *ac,
const QString &defaultText, const QString &parameterText, const QString &defaultText, const QString &parameterText,
Utils::Id id, const Core::Context &context, bool addToLocator, Id id, const Context &context, bool addToLocator,
void (GitPluginPrivate::*func)(), void (GitPluginPrivate::*func)(),
const QKeySequence &keys = QKeySequence()); const QKeySequence &keys = QKeySequence());
QAction *createRepositoryAction(Core::ActionContainer *ac, const QString &text, Utils::Id id, QAction *createRepositoryAction(ActionContainer *ac, const QString &text, Id id,
const Core::Context &context, bool addToLocator, const Context &context, bool addToLocator,
const std::function<void()> &callback, const std::function<void()> &callback,
const QKeySequence &keys = QKeySequence()); const QKeySequence &keys = QKeySequence());
QAction *createRepositoryAction(Core::ActionContainer *ac, const QString &text, Utils::Id id, QAction *createRepositoryAction(ActionContainer *ac, const QString &text, Id id,
const Core::Context &context, bool addToLocator, const Context &context, bool addToLocator,
GitClientMemberFunc, const QKeySequence &keys = QKeySequence()); GitClientMemberFunc, const QKeySequence &keys = QKeySequence());
QAction *createChangeRelatedRepositoryAction(const QString &text, Utils::Id id, QAction *createChangeRelatedRepositoryAction(const QString &text, Id id,
const Core::Context &context); const Context &context);
void updateRepositoryBrowserAction(); void updateRepositoryBrowserAction();
Core::IEditor *openSubmitEditor(const QString &fileName, const CommitData &cd); IEditor *openSubmitEditor(const QString &fileName, const CommitData &cd);
void cleanCommitMessageFile(); void cleanCommitMessageFile();
void cleanRepository(const FilePath &directory); void cleanRepository(const FilePath &directory);
void applyPatch(const FilePath &workingDirectory, QString file = QString()); void applyPatch(const FilePath &workingDirectory, QString file = QString());
@@ -356,7 +356,7 @@ public:
void onApplySettings();; void onApplySettings();;
Core::CommandLocator *m_commandLocator = nullptr; CommandLocator *m_commandLocator = nullptr;
QAction *m_menuAction = nullptr; QAction *m_menuAction = nullptr;
QAction *m_repositoryBrowserAction = nullptr; QAction *m_repositoryBrowserAction = nullptr;
@@ -373,10 +373,10 @@ public:
QAction *m_fixupCommitAction = nullptr; QAction *m_fixupCommitAction = nullptr;
QAction *m_interactiveRebaseAction = nullptr; QAction *m_interactiveRebaseAction = nullptr;
QVector<Utils::ParameterAction *> m_fileActions; QVector<ParameterAction *> m_fileActions;
QVector<Utils::ParameterAction *> m_projectActions; QVector<ParameterAction *> m_projectActions;
QVector<QAction *> m_repositoryActions; QVector<QAction *> m_repositoryActions;
Utils::ParameterAction *m_applyCurrentFilePatchAction = nullptr; ParameterAction *m_applyCurrentFilePatchAction = nullptr;
Gerrit::Internal::GerritPlugin *m_gerritPlugin = nullptr; Gerrit::Internal::GerritPlugin *m_gerritPlugin = nullptr;
GitSettings m_settings; GitSettings m_settings;
@@ -457,7 +457,7 @@ void GitPluginPrivate::onApplySettings()
m_settings.gitExecutable(&gitFoundOk, &errorMessage); m_settings.gitExecutable(&gitFoundOk, &errorMessage);
if (!gitFoundOk) { if (!gitFoundOk) {
QTimer::singleShot(0, this, [errorMessage] { QTimer::singleShot(0, this, [errorMessage] {
Core::AsynchronousMessageBox::warning(tr("Git Settings"), errorMessage); AsynchronousMessageBox::warning(tr("Git Settings"), errorMessage);
}); });
} }
} }
@@ -616,7 +616,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
dd = new GitPluginPrivate; dd = new GitPluginPrivate;
auto cmdContext = new QObject(this); auto cmdContext = new QObject(this);
connect(Core::ICore::instance(), &Core::ICore::coreOpened, cmdContext, [this, cmdContext, arguments] { connect(ICore::instance(), &ICore::coreOpened, cmdContext, [this, cmdContext, arguments] {
remoteCommand(arguments, QDir::currentPath(), {}); remoteCommand(arguments, QDir::currentPath(), {});
cmdContext->deleteLater(); cmdContext->deleteLater();
}); });
@@ -630,7 +630,7 @@ void GitPlugin::extensionsInitialized()
} }
GitPluginPrivate::GitPluginPrivate() GitPluginPrivate::GitPluginPrivate()
: VcsBase::VcsBasePluginPrivate(Context(Constants::GIT_CONTEXT)) : VcsBasePluginPrivate(Context(Constants::GIT_CONTEXT))
{ {
dd = this; dd = this;
@@ -959,7 +959,7 @@ GitPluginPrivate::GitPluginPrivate()
context, true, std::bind(&GitPluginPrivate::startMergeTool, this)); context, true, std::bind(&GitPluginPrivate::startMergeTool, this));
// -------------- // --------------
if (Utils::HostOsInfo::isWindowsHost()) { if (HostOsInfo::isWindowsHost()) {
gitToolsMenu->addSeparator(context); gitToolsMenu->addSeparator(context);
createRepositoryAction(gitToolsMenu, tr("Git Bash"), "Git.GitBash", createRepositoryAction(gitToolsMenu, tr("Git Bash"), "Git.GitBash",
@@ -1091,7 +1091,7 @@ void GitPluginPrivate::undoFileChanges(bool revertStaging)
} }
const VcsBasePluginState state = currentState(); const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return); QTC_ASSERT(state.hasFile(), return);
FileChangeBlocker fcb(Utils::FilePath::fromString(state.currentFile())); FileChangeBlocker fcb(FilePath::fromString(state.currentFile()));
m_gitClient.revertFiles({state.currentFile()}, revertStaging); m_gitClient.revertFiles({state.currentFile()}, revertStaging);
} }
@@ -1111,7 +1111,7 @@ class RebaseItemDelegate : public IconItemDelegate
{ {
public: public:
RebaseItemDelegate(LogChangeWidget *widget) RebaseItemDelegate(LogChangeWidget *widget)
: IconItemDelegate(widget, Utils::Icons::UNDO) : IconItemDelegate(widget, Icons::UNDO)
{ {
} }
@@ -1518,11 +1518,11 @@ void GitPluginPrivate::cleanRepository(const FilePath &directory)
QApplication::restoreOverrideCursor(); QApplication::restoreOverrideCursor();
if (!gotFiles) { if (!gotFiles) {
Core::AsynchronousMessageBox::warning(tr("Unable to Retrieve File List"), errorMessage); AsynchronousMessageBox::warning(tr("Unable to Retrieve File List"), errorMessage);
return; return;
} }
if (files.isEmpty() && ignoredFiles.isEmpty()) { if (files.isEmpty() && ignoredFiles.isEmpty()) {
Core::AsynchronousMessageBox::information(tr("Repository Clean"), AsynchronousMessageBox::information(tr("Repository Clean"),
tr("The repository is clean.")); tr("The repository is clean."));
return; return;
} }
@@ -1782,14 +1782,14 @@ QString GitPluginPrivate::displayName() const
return QLatin1String("Git"); return QLatin1String("Git");
} }
Utils::Id GitPluginPrivate::id() const Id GitPluginPrivate::id() const
{ {
return Utils::Id(VcsBase::Constants::VCS_ID_GIT); return Id(VcsBase::Constants::VCS_ID_GIT);
} }
bool GitPluginPrivate::isVcsFileOrDirectory(const FilePath &filePath) const bool GitPluginPrivate::isVcsFileOrDirectory(const FilePath &filePath) const
{ {
if (filePath.fileName().compare(".git", Utils::HostOsInfo::fileNameCaseSensitivity())) if (filePath.fileName().compare(".git", HostOsInfo::fileNameCaseSensitivity()))
return false; return false;
if (filePath.isDir()) if (filePath.isDir())
return true; return true;
@@ -1851,7 +1851,7 @@ bool GitPluginPrivate::vcsCreateRepository(const FilePath &directory)
QString GitPluginPrivate::vcsTopic(const FilePath &directory) QString GitPluginPrivate::vcsTopic(const FilePath &directory)
{ {
QString topic = Core::IVersionControl::vcsTopic(directory); QString topic = IVersionControl::vcsTopic(directory);
const QString commandInProgress = m_gitClient.commandInProgressDescription(directory); const QString commandInProgress = m_gitClient.commandInProgressDescription(directory);
if (!commandInProgress.isEmpty()) if (!commandInProgress.isEmpty())
topic += " (" + commandInProgress + ')'; topic += " (" + commandInProgress + ')';
@@ -1859,7 +1859,7 @@ QString GitPluginPrivate::vcsTopic(const FilePath &directory)
} }
VcsCommand *GitPluginPrivate::createInitialCheckoutCommand(const QString &url, VcsCommand *GitPluginPrivate::createInitialCheckoutCommand(const QString &url,
const Utils::FilePath &baseDirectory, const FilePath &baseDirectory,
const QString &localName, const QString &localName,
const QStringList &extraArgs) const QStringList &extraArgs)
{ {
@@ -2150,7 +2150,7 @@ void GitPlugin::testGitRemote_data()
.protocol("file") .protocol("file")
.path("/tmp/myrepo.git") .path("/tmp/myrepo.git")
.isLocal(true); .isLocal(true);
if (Utils::HostOsInfo::isWindowsHost()) { if (HostOsInfo::isWindowsHost()) {
QTest::newRow("local-absolute-path-unix") QTest::newRow("local-absolute-path-unix")
<< RemoteTest("c:/git/myrepo.git") << RemoteTest("c:/git/myrepo.git")
.protocol("file") .protocol("file")