aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/vcsbase
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/vcsbase')
-rw-r--r--src/plugins/vcsbase/vcsbaseclient.cpp10
-rw-r--r--src/plugins/vcsbase/vcsbaseclient.h7
-rw-r--r--src/plugins/vcsbase/vcsbaseplugin.cpp1
-rw-r--r--src/plugins/vcsbase/wizard/vcscommandpage.cpp1
-rw-r--r--src/plugins/vcsbase/wizard/vcscommandpage.h4
-rw-r--r--src/plugins/vcsbase/wizard/vcsconfigurationpage.cpp1
-rw-r--r--src/plugins/vcsbase/wizard/vcsconfigurationpage.h4
-rw-r--r--src/plugins/vcsbase/wizard/vcsjsextension.cpp1
8 files changed, 14 insertions, 15 deletions
diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp
index cfffd2003ba..6b44848665b 100644
--- a/src/plugins/vcsbase/vcsbaseclient.cpp
+++ b/src/plugins/vcsbase/vcsbaseclient.cpp
@@ -217,7 +217,7 @@ int VcsBaseClientImpl::vcsTimeoutS() const
return m_clientSettings->vcsTimeoutS();
}
-VcsBaseEditorWidget *VcsBaseClientImpl::createVcsEditor(Core::Id kind, QString title,
+VcsBaseEditorWidget *VcsBaseClientImpl::createVcsEditor(Utils::Id kind, QString title,
const QString &source, QTextCodec *codec,
const char *registerDynamicProperty,
const QString &dynamicPropertyValue) const
@@ -352,7 +352,7 @@ VcsBaseEditorWidget *VcsBaseClient::annotate(
const QString vcsCmdString = vcsCommandString(AnnotateCommand);
QStringList args;
args << vcsCmdString << revisionSpec(revision) << extraOptions << file;
- const Core::Id kind = vcsEditorKind(AnnotateCommand);
+ const Utils::Id kind = vcsEditorKind(AnnotateCommand);
const QString id = VcsBaseEditor::getSource(workingDir, QStringList(file));
const QString title = vcsEditorTitle(vcsCmdString, id);
const QString source = VcsBaseEditor::getSource(workingDir, file);
@@ -371,7 +371,7 @@ void VcsBaseClient::diff(const QString &workingDir, const QStringList &files,
const QStringList &extraOptions)
{
const QString vcsCmdString = vcsCommandString(DiffCommand);
- const Core::Id kind = vcsEditorKind(DiffCommand);
+ const Utils::Id kind = vcsEditorKind(DiffCommand);
const QString id = VcsBaseEditor::getTitleId(workingDir, files);
const QString title = vcsEditorTitle(vcsCmdString, id);
const QString source = VcsBaseEditor::getSource(workingDir, files);
@@ -413,7 +413,7 @@ void VcsBaseClient::log(const QString &workingDir, const QStringList &files,
bool enableAnnotationContextMenu)
{
const QString vcsCmdString = vcsCommandString(LogCommand);
- const Core::Id kind = vcsEditorKind(LogCommand);
+ const Utils::Id kind = vcsEditorKind(LogCommand);
const QString id = VcsBaseEditor::getTitleId(workingDir, files);
const QString title = vcsEditorTitle(vcsCmdString, id);
const QString source = VcsBaseEditor::getSource(workingDir, files);
@@ -543,7 +543,7 @@ void VcsBaseClient::view(const QString &source, const QString &id,
{
QStringList args;
args << extraOptions << revisionSpec(id);
- const Core::Id kind = vcsEditorKind(DiffCommand);
+ const Utils::Id kind = vcsEditorKind(DiffCommand);
const QString title = vcsEditorTitle(vcsCommandString(LogCommand), id);
VcsBaseEditorWidget *editor = createVcsEditor(kind, title, source,
diff --git a/src/plugins/vcsbase/vcsbaseclient.h b/src/plugins/vcsbase/vcsbaseclient.h
index d5b43759ab7..258a93cb57c 100644
--- a/src/plugins/vcsbase/vcsbaseclient.h
+++ b/src/plugins/vcsbase/vcsbaseclient.h
@@ -27,9 +27,8 @@
#include "vcsbase_global.h"
-#include <coreplugin/id.h>
-
#include <utils/fileutils.h>
+#include <utils/id.h>
#include <utils/synchronousprocess.h>
#include <QObject>
@@ -71,7 +70,7 @@ public:
VcsWindowOutputBind
};
- VcsBaseEditorWidget *createVcsEditor(Core::Id kind, QString title,
+ VcsBaseEditorWidget *createVcsEditor(Utils::Id kind, QString title,
const QString &source, QTextCodec *codec,
const char *registerDynamicProperty,
const QString &dynamicPropertyValue) const;
@@ -221,7 +220,7 @@ public:
};
protected:
virtual QString vcsCommandString(VcsCommandTag cmd) const;
- virtual Core::Id vcsEditorKind(VcsCommandTag cmd) const = 0;
+ virtual Utils::Id vcsEditorKind(VcsCommandTag cmd) const = 0;
virtual Utils::ExitCodeInterpreter exitCodeInterpreter(VcsCommandTag cmd) const;
virtual QStringList revisionSpec(const QString &/*revision*/) const { return {}; }
diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp
index 5a64985678d..713d15ac618 100644
--- a/src/plugins/vcsbase/vcsbaseplugin.cpp
+++ b/src/plugins/vcsbase/vcsbaseplugin.cpp
@@ -32,7 +32,6 @@
#include <coreplugin/documentmanager.h>
#include <coreplugin/icore.h>
-#include <coreplugin/id.h>
#include <coreplugin/idocument.h>
#include <coreplugin/editormanager/editormanager.h>
#include <projectexplorer/projecttree.h>
diff --git a/src/plugins/vcsbase/wizard/vcscommandpage.cpp b/src/plugins/vcsbase/wizard/vcscommandpage.cpp
index 0e725e6ef20..e84745d6e0a 100644
--- a/src/plugins/vcsbase/wizard/vcscommandpage.cpp
+++ b/src/plugins/vcsbase/wizard/vcscommandpage.cpp
@@ -25,7 +25,6 @@
#include "vcscommandpage.h"
-#include <coreplugin/id.h>
#include <coreplugin/iversioncontrol.h>
#include <coreplugin/shellcommand.h>
#include <coreplugin/vcsmanager.h>
diff --git a/src/plugins/vcsbase/wizard/vcscommandpage.h b/src/plugins/vcsbase/wizard/vcscommandpage.h
index 1b51f4b8e21..b09af42b3d0 100644
--- a/src/plugins/vcsbase/wizard/vcscommandpage.h
+++ b/src/plugins/vcsbase/wizard/vcscommandpage.h
@@ -43,9 +43,9 @@ class VcsCommandPageFactory : public ProjectExplorer::JsonWizardPageFactory
public:
VcsCommandPageFactory();
- Utils::WizardPage *create(ProjectExplorer::JsonWizard *wizard, Core::Id typeId,
+ Utils::WizardPage *create(ProjectExplorer::JsonWizard *wizard, Utils::Id typeId,
const QVariant &data) override;
- bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override;
+ bool validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) override;
};
class VcsCommandPage : public Utils::ShellCommandPage
diff --git a/src/plugins/vcsbase/wizard/vcsconfigurationpage.cpp b/src/plugins/vcsbase/wizard/vcsconfigurationpage.cpp
index 2f6c1c35984..8dddc44bad1 100644
--- a/src/plugins/vcsbase/wizard/vcsconfigurationpage.cpp
+++ b/src/plugins/vcsbase/wizard/vcsconfigurationpage.cpp
@@ -66,6 +66,7 @@
using namespace Core;
using namespace ProjectExplorer;
+using namespace Utils;
namespace VcsBase {
namespace Internal {
diff --git a/src/plugins/vcsbase/wizard/vcsconfigurationpage.h b/src/plugins/vcsbase/wizard/vcsconfigurationpage.h
index d24898ea9d5..53e0e61b735 100644
--- a/src/plugins/vcsbase/wizard/vcsconfigurationpage.h
+++ b/src/plugins/vcsbase/wizard/vcsconfigurationpage.h
@@ -43,9 +43,9 @@ class VcsConfigurationPageFactory : public ProjectExplorer::JsonWizardPageFactor
public:
VcsConfigurationPageFactory();
- Utils::WizardPage *create(ProjectExplorer::JsonWizard *wizard, Core::Id typeId,
+ Utils::WizardPage *create(ProjectExplorer::JsonWizard *wizard, Utils::Id typeId,
const QVariant &data) override;
- bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override;
+ bool validateData(Utils::Id typeId, const QVariant &data, QString *errorMessage) override;
};
} // namespace Internal
diff --git a/src/plugins/vcsbase/wizard/vcsjsextension.cpp b/src/plugins/vcsbase/wizard/vcsjsextension.cpp
index 35f73ae8a1e..bd052db21a4 100644
--- a/src/plugins/vcsbase/wizard/vcsjsextension.cpp
+++ b/src/plugins/vcsbase/wizard/vcsjsextension.cpp
@@ -29,6 +29,7 @@
#include <coreplugin/vcsmanager.h>
using namespace Core;
+using namespace Utils;
namespace VcsBase {
namespace Internal {
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-22 01:56:34 +0000