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

Core/Utils: Migrate further to Utils::Id

Browse Source 
The coreplugin/id.h header is kept for downstream for now.

Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-06-26 13:59:38 +02:00
parent 4924392620
commit 430a33dcd9
655 changed files with 2115 additions and 2093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/changeselectiondialog.cpp
View File

@@ -52,7 +52,7 @@ using namespace Utils;
namespace Git {
namespace Internal {
ChangeSelectionDialog::ChangeSelectionDialog(const QString &workingDirectory, Core::Id id,
ChangeSelectionDialog::ChangeSelectionDialog(const QString &workingDirectory, Utils::Id id,
QWidget *parent) :
QDialog(parent), m_ui(new Ui::ChangeSelectionDialog)
{

5
src/plugins/git/changeselectiondialog.h
View File

@@ -25,9 +25,8 @@
#pragma once
#include <coreplugin/id.h>
#include <utils/fileutils.h>
#include <utils/id.h>
#include <QDialog>
#include <QProcessEnvironment>
@@ -55,7 +54,7 @@ class ChangeSelectionDialog : public QDialog
{
Q_OBJECT
public:
ChangeSelectionDialog(const QString &workingDirectory, Core::Id id, QWidget *parent);
ChangeSelectionDialog(const QString &workingDirectory, Utils::Id id, QWidget *parent);
~ChangeSelectionDialog() override;
QString change() const;

1
src/plugins/git/gitclient.cpp
View File

@@ -38,7 +38,6 @@
#include <coreplugin/coreconstants.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/icore.h>
#include <coreplugin/id.h>
#include <coreplugin/idocument.h>
#include <coreplugin/iversioncontrol.h>
#include <coreplugin/vcsmanager.h>

4
src/plugins/git/giteditor.cpp
View File

@@ -262,7 +262,7 @@ void GitEditorWidget::applyDiffChunk(const DiffChunk& chunk, bool revert)
void GitEditorWidget::init()
{
VcsBaseEditorWidget::init();
Core::Id editorId = textDocument()->id();
Utils::Id editorId = textDocument()->id();
if (editorId == Git::Constants::GIT_COMMIT_TEXT_EDITOR_ID)
textDocument()->setSyntaxHighlighter(new GitSubmitHighlighter);
else if (editorId == Git::Constants::GIT_REBASE_EDITOR_ID)
@@ -287,7 +287,7 @@ void GitEditorWidget::addDiffActions(QMenu *menu, const DiffChunk &chunk)
void GitEditorWidget::aboutToOpen(const QString &fileName, const QString &realFileName)
{
Q_UNUSED(realFileName)
Core::Id editorId = textDocument()->id();
Utils::Id editorId = textDocument()->id();
if (editorId == Git::Constants::GIT_COMMIT_TEXT_EDITOR_ID
|| editorId == Git::Constants::GIT_REBASE_EDITOR_ID) {
QFileInfo fi(fileName);

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

@@ -48,7 +48,6 @@
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h>
#include <coreplugin/id.h>
#include <coreplugin/idocument.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/editormanager/ieditor.h>
@@ -234,7 +233,7 @@ public:
// IVersionControl
QString displayName() const final;
Core::Id id() const final;
Utils::Id id() const final;
bool isVcsFileOrDirectory(const Utils::FilePath &fileName) const final;
@@ -308,7 +307,7 @@ public:
void resetRepository();
void recoverDeletedFiles();
void startRebase();
void startChangeRelatedAction(const Core::Id &id);
void startChangeRelatedAction(const Utils::Id &id);
void stageFile();
void unstageFile();
void gitkForCurrentFile();
@@ -335,37 +334,37 @@ public:
void updateContinueAndAbortCommands();
void delayedPushToGerrit();
Core::Command *createCommand(QAction *action, Core::ActionContainer *ac, Core::Id id,
Core::Command *createCommand(QAction *action, Core::ActionContainer *ac, Utils::Id id,
const Core::Context &context, bool addToLocator,
const std::function<void()> &callback, const QKeySequence &keys);
Utils::ParameterAction *createParameterAction(Core::ActionContainer *ac,
const QString &defaultText, const QString &parameterText,
Core::Id id, const Core::Context &context, bool addToLocator,
Utils::Id id, const Core::Context &context, bool addToLocator,
const std::function<void()> &callback,
const QKeySequence &keys = QKeySequence());
QAction *createFileAction(Core::ActionContainer *ac,
const QString &defaultText, const QString &parameterText,
Core::Id id, const Core::Context &context, bool addToLocator,
Utils::Id id, const Core::Context &context, bool addToLocator,
const std::function<void()> &callback,
const QKeySequence &keys = QKeySequence());
QAction *createProjectAction(Core::ActionContainer *ac,
const QString &defaultText, const QString &parameterText,
Core::Id id, const Core::Context &context, bool addToLocator,
Utils::Id id, const Core::Context &context, bool addToLocator,
void (GitPluginPrivate::*func)(),
const QKeySequence &keys = QKeySequence());
QAction *createRepositoryAction(Core::ActionContainer *ac, const QString &text, Core::Id id,
QAction *createRepositoryAction(Core::ActionContainer *ac, const QString &text, Utils::Id id,
const Core::Context &context, bool addToLocator,
const std::function<void()> &callback,
const QKeySequence &keys = QKeySequence());
QAction *createRepositoryAction(Core::ActionContainer *ac, const QString &text, Core::Id id,
QAction *createRepositoryAction(Core::ActionContainer *ac, const QString &text, Utils::Id id,
const Core::Context &context, bool addToLocator,
GitClientMemberFunc, const QKeySequence &keys = QKeySequence());
QAction *createChangeRelatedRepositoryAction(const QString &text, Core::Id id,
QAction *createChangeRelatedRepositoryAction(const QString &text, Utils::Id id,
const Core::Context &context);
void updateRepositoryBrowserAction();
@@ -1812,9 +1811,9 @@ QString GitPluginPrivate::displayName() const
return QLatin1String("Git");
}
Core::Id GitPluginPrivate::id() const
Utils::Id GitPluginPrivate::id() const
{
return Core::Id(VcsBase::Constants::VCS_ID_GIT);
return Utils::Id(VcsBase::Constants::VCS_ID_GIT);
}
bool GitPluginPrivate::isVcsFileOrDirectory(const Utils::FilePath &fileName) const

1
src/plugins/git/gitplugin.h
View File

@@ -27,7 +27,6 @@
#include "gitsettings.h"
#include <coreplugin/id.h>
#include <coreplugin/iversioncontrol.h>
#include <extensionsystem/iplugin.h>