aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/mercurial
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/mercurial')
-rw-r--r--src/plugins/mercurial/mercurialclient.cpp34
-rw-r--r--src/plugins/mercurial/mercurialclient.h4
-rw-r--r--src/plugins/mercurial/mercurialeditor.cpp2
-rw-r--r--src/plugins/mercurial/mercurialeditor.h2
-rw-r--r--src/plugins/mercurial/mercurialjobrunner.cpp4
-rw-r--r--src/plugins/mercurial/mercurialjobrunner.h8
-rw-r--r--src/plugins/mercurial/mercurialplugin.cpp2
7 files changed, 28 insertions, 28 deletions
diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp
index eb1b70901af..e8b8c7561f9 100644
--- a/src/plugins/mercurial/mercurialclient.cpp
+++ b/src/plugins/mercurial/mercurialclient.cpp
@@ -315,11 +315,11 @@ void MercurialClient::annotate(const QString &workingDir, const QString &file,
args << QLatin1String("-r") << revision;
args << file;
const QString kind = QLatin1String(Constants::ANNOTATELOG);
- const QString id = VCSBase::VCSBaseEditor::getSource(workingDir, QStringList(file));
+ const QString id = VCSBase::VCSBaseEditorWidget::getSource(workingDir, QStringList(file));
const QString title = tr("Hg Annotate %1").arg(id);
- const QString source = VCSBase::VCSBaseEditor::getSource(workingDir, file);
+ const QString source = VCSBase::VCSBaseEditorWidget::getSource(workingDir, file);
- VCSBase::VCSBaseEditor *editor = createVCSEditor(kind, title, source, true,
+ VCSBase::VCSBaseEditorWidget *editor = createVCSEditor(kind, title, source, true,
"annotate", id);
QSharedPointer<HgTask> job(new HgTask(workingDir, args, editor));
@@ -335,10 +335,10 @@ void MercurialClient::diff(const QString &workingDir, const QStringList &files)
args.append(files);
const QString kind = QLatin1String(Constants::DIFFLOG);
- const QString id = VCSBase::VCSBaseEditor::getTitleId(workingDir,files);
+ const QString id = VCSBase::VCSBaseEditorWidget::getTitleId(workingDir,files);
const QString title = tr("Hg diff %1").arg(id);
- const QString source = VCSBase::VCSBaseEditor::getSource(workingDir, files);
- VCSBase::VCSBaseEditor *editor = createVCSEditor(kind, title, source, true,
+ const QString source = VCSBase::VCSBaseEditorWidget::getSource(workingDir, files);
+ VCSBase::VCSBaseEditorWidget *editor = createVCSEditor(kind, title, source, true,
"diff", id);
editor->setDiffBaseDirectory(workingDir);
@@ -355,11 +355,11 @@ void MercurialClient::log(const QString &workingDir, const QStringList &files,
args.append(files);
const QString kind = QLatin1String(Constants::FILELOG);
- const QString id = VCSBase::VCSBaseEditor::getTitleId(workingDir,files);
+ const QString id = VCSBase::VCSBaseEditorWidget::getTitleId(workingDir,files);
const QString title = tr("Hg log %1").arg(id);
- const QString source = VCSBase::VCSBaseEditor::getSource(workingDir, files);
+ const QString source = VCSBase::VCSBaseEditorWidget::getSource(workingDir, files);
- VCSBase::VCSBaseEditor *editor = createVCSEditor(kind, title, workingDir, true,
+ VCSBase::VCSBaseEditorWidget *editor = createVCSEditor(kind, title, workingDir, true,
"log", id);
editor->setFileLogAnnotateEnabled(enableAnnotationContextMenu);
@@ -575,7 +575,7 @@ void MercurialClient::incoming(const QString &repositoryRoot, const QString &rep
const QString kind = QLatin1String(Constants::DIFFLOG);
const QString title = tr("Hg incoming %1").arg(id);
- VCSBase::VCSBaseEditor *editor = createVCSEditor(kind, title, repositoryRoot,
+ VCSBase::VCSBaseEditorWidget *editor = createVCSEditor(kind, title, repositoryRoot,
true, "incoming", id);
QSharedPointer<HgTask> job(new HgTask(repositoryRoot, args, editor));
@@ -594,7 +594,7 @@ void MercurialClient::outgoing(const QString &repositoryRoot)
const QString title = tr("Hg outgoing %1").
arg(QDir::toNativeSeparators(repositoryRoot));
- VCSBase::VCSBaseEditor *editor = createVCSEditor(kind, title, repositoryRoot, true,
+ VCSBase::VCSBaseEditorWidget *editor = createVCSEditor(kind, title, repositoryRoot, true,
"outgoing", repositoryRoot);
QSharedPointer<HgTask> job(new HgTask(repositoryRoot, args, editor));
@@ -612,7 +612,7 @@ void MercurialClient::view(const QString &source, const QString &id)
const QString kind = QLatin1String(Constants::DIFFLOG);
const QString title = tr("Hg log %1").arg(id);
- VCSBase::VCSBaseEditor *editor = createVCSEditor(kind, title, source,
+ VCSBase::VCSBaseEditorWidget *editor = createVCSEditor(kind, title, source,
true, "view", id);
QSharedPointer<HgTask> job(new HgTask(source, args, editor));
@@ -665,29 +665,29 @@ void MercurialClient::settingsChanged()
jobManager->restart();
}
-VCSBase::VCSBaseEditor *MercurialClient::createVCSEditor(const QString &kind, QString title,
+VCSBase::VCSBaseEditorWidget *MercurialClient::createVCSEditor(const QString &kind, QString title,
const QString &source, bool setSourceCodec,
const char *registerDynamicProperty,
const QString &dynamicPropertyValue) const
{
- VCSBase::VCSBaseEditor *baseEditor = 0;
+ VCSBase::VCSBaseEditorWidget *baseEditor = 0;
Core::IEditor* outputEditor = locateEditor(core, registerDynamicProperty, dynamicPropertyValue);
const QString progressMsg = tr("Working...");
if (outputEditor) {
// Exists already
outputEditor->createNew(progressMsg);
- baseEditor = VCSBase::VCSBaseEditor::getVcsBaseEditor(outputEditor);
+ baseEditor = VCSBase::VCSBaseEditorWidget::getVcsBaseEditor(outputEditor);
QTC_ASSERT(baseEditor, return 0);
} else {
outputEditor = core->editorManager()->openEditorWithContents(kind, &title, progressMsg);
outputEditor->file()->setProperty(registerDynamicProperty, dynamicPropertyValue);
- baseEditor = VCSBase::VCSBaseEditor::getVcsBaseEditor(outputEditor);
+ baseEditor = VCSBase::VCSBaseEditorWidget::getVcsBaseEditor(outputEditor);
connect(baseEditor, SIGNAL(annotateRevisionRequested(QString,QString,int)),
this, SLOT(slotAnnotateRevisionRequested(QString,QString,int)));
QTC_ASSERT(baseEditor, return 0);
baseEditor->setSource(source);
if (setSourceCodec)
- baseEditor->setCodec(VCSBase::VCSBaseEditor::getCodec(source));
+ baseEditor->setCodec(VCSBase::VCSBaseEditorWidget::getCodec(source));
}
core->editorManager()->activateEditor(outputEditor, Core::EditorManager::ModeSwitch);
diff --git a/src/plugins/mercurial/mercurialclient.h b/src/plugins/mercurial/mercurialclient.h
index f7f94a47a07..ca5a58b45c4 100644
--- a/src/plugins/mercurial/mercurialclient.h
+++ b/src/plugins/mercurial/mercurialclient.h
@@ -49,7 +49,7 @@ class ICore;
}
namespace VCSBase{
-class VCSBaseEditor;
+class VCSBaseEditorWidget;
}
namespace Utils {
@@ -140,7 +140,7 @@ private:
MercurialJobRunner *jobManager;
Core::ICore *core;
- VCSBase::VCSBaseEditor *createVCSEditor(const QString &kind, QString title,
+ VCSBase::VCSBaseEditorWidget *createVCSEditor(const QString &kind, QString title,
const QString &source, bool setSourceCodec,
const char *registerDynamicProperty,
const QString &dynamicPropertyValue) const;
diff --git a/src/plugins/mercurial/mercurialeditor.cpp b/src/plugins/mercurial/mercurialeditor.cpp
index ba039da4ccc..3c5a94152f8 100644
--- a/src/plugins/mercurial/mercurialeditor.cpp
+++ b/src/plugins/mercurial/mercurialeditor.cpp
@@ -51,7 +51,7 @@ using namespace Mercurial::Internal;
using namespace Mercurial;
MercurialEditor::MercurialEditor(const VCSBase::VCSBaseEditorParameters *type, QWidget *parent)
- : VCSBase::VCSBaseEditor(type, parent),
+ : VCSBase::VCSBaseEditorWidget(type, parent),
exactIdentifier12(QLatin1String(Constants::CHANGEIDEXACT12)),
exactIdentifier40(QLatin1String(Constants::CHANGEIDEXACT40)),
changesetIdentifier12(QLatin1String(Constants::CHANGESETID12)),
diff --git a/src/plugins/mercurial/mercurialeditor.h b/src/plugins/mercurial/mercurialeditor.h
index 18f9b22ae9d..28462839266 100644
--- a/src/plugins/mercurial/mercurialeditor.h
+++ b/src/plugins/mercurial/mercurialeditor.h
@@ -41,7 +41,7 @@
namespace Mercurial {
namespace Internal {
-class MercurialEditor : public VCSBase::VCSBaseEditor
+class MercurialEditor : public VCSBase::VCSBaseEditorWidget
{
Q_OBJECT
public:
diff --git a/src/plugins/mercurial/mercurialjobrunner.cpp b/src/plugins/mercurial/mercurialjobrunner.cpp
index a081f194fa8..9dd572c56fa 100644
--- a/src/plugins/mercurial/mercurialjobrunner.cpp
+++ b/src/plugins/mercurial/mercurialjobrunner.cpp
@@ -65,7 +65,7 @@ HgTask::HgTask(const QString &repositoryRoot,
HgTask::HgTask(const QString &repositoryRoot,
const QStringList &arguments,
- VCSBase::VCSBaseEditor *editor,
+ VCSBase::VCSBaseEditorWidget *editor,
const QVariant &cookie) :
m_repositoryRoot(repositoryRoot),
arguments(arguments),
@@ -76,7 +76,7 @@ HgTask::HgTask(const QString &repositoryRoot,
{
}
-VCSBase::VCSBaseEditor* HgTask::displayEditor() const
+VCSBase::VCSBaseEditorWidget* HgTask::displayEditor() const
{
return editor;
}
diff --git a/src/plugins/mercurial/mercurialjobrunner.h b/src/plugins/mercurial/mercurialjobrunner.h
index ccaf3cecc25..f3b36a6f1ba 100644
--- a/src/plugins/mercurial/mercurialjobrunner.h
+++ b/src/plugins/mercurial/mercurialjobrunner.h
@@ -49,7 +49,7 @@ class QProcess;
QT_END_NAMESPACE
namespace VCSBase {
-class VCSBaseEditor;
+class VCSBaseEditorWidget;
}
namespace Mercurial {
@@ -66,11 +66,11 @@ public:
bool emitRaw=false,
const QVariant &cookie = QVariant());
explicit HgTask(const QString &workingDir, const QStringList &arguments,
- VCSBase::VCSBaseEditor *editor,
+ VCSBase::VCSBaseEditorWidget *editor,
const QVariant &cookie = QVariant());
bool shouldEmit() const { return emitRaw; }
- VCSBase::VCSBaseEditor* displayEditor() const;
+ VCSBase::VCSBaseEditorWidget* displayEditor() const;
QStringList args() const { return arguments; }
QString repositoryRoot() const { return m_repositoryRoot; }
@@ -90,7 +90,7 @@ private:
const QStringList arguments;
const bool emitRaw;
const QVariant m_cookie;
- QPointer<VCSBase::VCSBaseEditor> editor; // User might close it.
+ QPointer<VCSBase::VCSBaseEditorWidget> editor; // User might close it.
bool m_unixTerminalDisabled;
};
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index b764fdfdcd3..7d733d1e888 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -120,7 +120,7 @@ static const VCSBase::VCSBaseSubmitEditorParameters submitEditorParameters = {
static inline const VCSBase::VCSBaseEditorParameters *findType(int ie)
{
const VCSBase::EditorContentType et = static_cast<VCSBase::EditorContentType>(ie);
- return VCSBase::VCSBaseEditor::findType(editorParameters,
+ return VCSBase::VCSBaseEditorWidget::findType(editorParameters,
sizeof(editorParameters)/sizeof(VCSBase::VCSBaseEditorParameters), et);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-23 00:59:25 +0000