summaryrefslogtreecommitdiff
path: root/src/plugins/perforce
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2014-08-21 20:43:33 +0200
committerhjk <hjk121@nokiamail.com>2014-08-22 11:24:01 +0200
commitb5a15997766b60424bd3574c40ed1645c618fd63 (patch)
tree6f528568e1f7742d25358af7655b47503977fef7 /src/plugins/perforce
parentd6ddff93732dd3ce063df4d010dd31767ed73601 (diff)
downloadqt-creator-b5a15997766b60424bd3574c40ed1645c618fd63.tar.gz
Vcs*: Rename several *Editors to *EditorWidgets
Follow suit. Change-Id: If22452a5e46d62d419ba273981b1f247f5095b53 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'src/plugins/perforce')
-rw-r--r--src/plugins/perforce/perforceeditor.cpp12
-rw-r--r--src/plugins/perforce/perforceeditor.h4
-rw-r--r--src/plugins/perforce/perforceplugin.cpp6
3 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/perforce/perforceeditor.cpp b/src/plugins/perforce/perforceeditor.cpp
index 394e8b4a09..7098072acd 100644
--- a/src/plugins/perforce/perforceeditor.cpp
+++ b/src/plugins/perforce/perforceeditor.cpp
@@ -56,7 +56,7 @@ namespace Perforce {
namespace Internal {
// ------------ PerforceEditor
-PerforceEditor::PerforceEditor() :
+PerforceEditorWidget::PerforceEditorWidget() :
m_changeNumberPattern(QLatin1String("^\\d+$"))
{
QTC_CHECK(m_changeNumberPattern.isValid());
@@ -70,7 +70,7 @@ PerforceEditor::PerforceEditor() :
setAnnotateRevisionTextFormat(tr("Annotate change list \"%1\""));
}
-QSet<QString> PerforceEditor::annotationChanges() const
+QSet<QString> PerforceEditorWidget::annotationChanges() const
{
QSet<QString> changes;
const QString txt = toPlainText();
@@ -94,7 +94,7 @@ QSet<QString> PerforceEditor::annotationChanges() const
return changes;
}
-QString PerforceEditor::changeUnderCursor(const QTextCursor &c) const
+QString PerforceEditorWidget::changeUnderCursor(const QTextCursor &c) const
{
QTextCursor cursor = c;
// Any number is regarded as change number.
@@ -105,12 +105,12 @@ QString PerforceEditor::changeUnderCursor(const QTextCursor &c) const
return m_changeNumberPattern.exactMatch(change) ? change : QString();
}
-VcsBase::BaseAnnotationHighlighter *PerforceEditor::createAnnotationHighlighter(const QSet<QString> &changes) const
+VcsBase::BaseAnnotationHighlighter *PerforceEditorWidget::createAnnotationHighlighter(const QSet<QString> &changes) const
{
return new PerforceAnnotationHighlighter(changes);
}
-QString PerforceEditor::findDiffFile(const QString &f) const
+QString PerforceEditorWidget::findDiffFile(const QString &f) const
{
QString errorMessage;
const QString fileName = PerforcePlugin::fileNameFromPerforceName(f.trimmed(), false, &errorMessage);
@@ -119,7 +119,7 @@ QString PerforceEditor::findDiffFile(const QString &f) const
return fileName;
}
-QStringList PerforceEditor::annotationPreviousVersions(const QString &v) const
+QStringList PerforceEditorWidget::annotationPreviousVersions(const QString &v) const
{
bool ok;
const int changeList = v.toInt(&ok);
diff --git a/src/plugins/perforce/perforceeditor.h b/src/plugins/perforce/perforceeditor.h
index ff67549bd6..2118fee817 100644
--- a/src/plugins/perforce/perforceeditor.h
+++ b/src/plugins/perforce/perforceeditor.h
@@ -37,12 +37,12 @@
namespace Perforce {
namespace Internal {
-class PerforceEditor : public VcsBase::VcsBaseEditorWidget
+class PerforceEditorWidget : public VcsBase::VcsBaseEditorWidget
{
Q_OBJECT
public:
- PerforceEditor();
+ PerforceEditorWidget();
private:
QSet<QString> annotationChanges() const;
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index d6ec7835da..db98156434 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -244,7 +244,7 @@ bool PerforcePlugin::initialize(const QStringList & /* arguments */, QString *er
static const char *describeSlot = SLOT(describe(QString,QString));
const int editorCount = sizeof(editorParameters) / sizeof(editorParameters[0]);
- const auto widgetCreator = []() { return new PerforceEditor; };
+ const auto widgetCreator = []() { return new PerforceEditorWidget; };
for (int i = 0; i < editorCount; i++)
addAutoReleasedObject(new VcsEditorFactory(editorParameters + i, widgetCreator, this, describeSlot));
@@ -1206,7 +1206,7 @@ IEditor *PerforcePlugin::showOutputInEditor(const QString &title,
IEditor *editor = EditorManager::openEditorWithContents(id, &s, output.toUtf8());
connect(editor, SIGNAL(annotateRevisionRequested(QString,QString,QString,int)),
this, SLOT(vcsAnnotate(QString,QString,QString,int)));
- PerforceEditor *e = qobject_cast<PerforceEditor*>(editor->widget());
+ PerforceEditorWidget *e = qobject_cast<PerforceEditorWidget*>(editor->widget());
if (!e)
return 0;
e->setForceReadOnly(true);
@@ -1558,7 +1558,7 @@ void PerforcePlugin::testLogResolving()
"\n"
" Comment\n"
);
- PerforceEditor editor;
+ PerforceEditorWidget editor;
editor.setParameters(editorParameters);
editor.testLogResolving(data, "12345", "12344");
}