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

Vcs*: Rename several *Editors to *EditorWidgets

Browse Source 
Follow suit.

Change-Id: If22452a5e46d62d419ba273981b1f247f5095b53
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
hjk
2014-08-21 20:43:33 +02:00
parent d6ddff9373
commit b5a1599776
20 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cvs/cvseditor.cpp
View File

@@ -47,7 +47,7 @@ namespace Internal {
#define CVS_REVISION_PATTERN "[\\d\\.]+"
#define CVS_REVISION_AT_START_PATTERN "^(" CVS_REVISION_PATTERN ") "
CvsEditor::CvsEditor() :
CvsEditorWidget::CvsEditorWidget() :
m_revisionAnnotationPattern(QLatin1String(CVS_REVISION_AT_START_PATTERN ".*$")),
m_revisionLogPattern(QLatin1String("^revision *(" CVS_REVISION_PATTERN ")$"))
{
@@ -66,7 +66,7 @@ CvsEditor::CvsEditor() :
setAnnotateRevisionTextFormat(tr("Annotate revision \"%1\""));
}
QSet<QString> CvsEditor::annotationChanges() const
QSet<QString> CvsEditorWidget::annotationChanges() const
{
QSet<QString> changes;
const QString txt = toPlainText();
@@ -90,7 +90,7 @@ QSet<QString> CvsEditor::annotationChanges() const
return changes;
}
QString CvsEditor::changeUnderCursor(const QTextCursor &c) const
QString CvsEditorWidget::changeUnderCursor(const QTextCursor &c) const
{
// Try to match "1.1" strictly:
// 1) Annotation: Check for a revision number at the beginning of the line.
@@ -121,12 +121,12 @@ QString CvsEditor::changeUnderCursor(const QTextCursor &c) const
return QString();
}
VcsBase::BaseAnnotationHighlighter *CvsEditor::createAnnotationHighlighter(const QSet<QString> &changes) const
VcsBase::BaseAnnotationHighlighter *CvsEditorWidget::createAnnotationHighlighter(const QSet<QString> &changes) const
{
return new CvsAnnotationHighlighter(changes);
}
QStringList CvsEditor::annotationPreviousVersions(const QString &revision) const
QStringList CvsEditorWidget::annotationPreviousVersions(const QString &revision) const
{
if (isFirstRevision(revision))
return QStringList();

4
src/plugins/cvs/cvseditor.h
View File

@@ -37,12 +37,12 @@
namespace Cvs {
namespace Internal {
class CvsEditor : public VcsBase::VcsBaseEditorWidget
class CvsEditorWidget : public VcsBase::VcsBaseEditorWidget
{
Q_OBJECT
public:
CvsEditor();
CvsEditorWidget();
private:
QSet<QString> annotationChanges() const;

8
src/plugins/cvs/cvsplugin.cpp
View File

@@ -253,7 +253,7 @@ bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
static const char *describeSlotC = SLOT(slotDescribe(QString,QString));
const int editorCount = sizeof(editorParameters) / sizeof(editorParameters[0]);
const auto widgetCreator = []() { return new CvsEditor; };
const auto widgetCreator = []() { return new CvsEditorWidget; };
for (int i = 0; i < editorCount; i++)
addAutoReleasedObject(new VcsEditorFactory(editorParameters + i, widgetCreator, this, describeSlotC));
@@ -1191,7 +1191,7 @@ IEditor *CvsPlugin::showOutputInEditor(const QString& title, const QString &outp
IEditor *editor = EditorManager::openEditorWithContents(id, &s, output.toUtf8());
connect(editor, SIGNAL(annotateRevisionRequested(QString,QString,QString,int)),
this, SLOT(vcsAnnotate(QString,QString,QString,int)));
CvsEditor *e = qobject_cast<CvsEditor*>(editor->widget());
CvsEditorWidget *e = qobject_cast<CvsEditorWidget*>(editor->widget());
if (!e)
return 0;
s.replace(QLatin1Char(' '), QLatin1Char('_'));
@@ -1319,7 +1319,7 @@ void CvsPlugin::testDiffFileResolving_data()
void CvsPlugin::testDiffFileResolving()
{
CvsEditor editor;
CvsEditorWidget editor;
editor.setParameters(editorParameters + 3);
editor.testDiffFileResolving();
}
@@ -1347,7 +1347,7 @@ void CvsPlugin::testLogResolving()
"added latest commentary\n"
"----------------------------\n"
);
CvsEditor editor;
CvsEditorWidget editor;
editor.setParameters(editorParameters + 1);
editor.testLogResolving(data, "1.3", "1.2");
}