diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2016-11-24 09:58:11 +0100 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2017-01-10 15:14:19 +0000 |
commit | 8b67458a9567fe4f83d3658916f5534617316b02 (patch) | |
tree | 1d35569f8a2c30807c1bcd8c13968d4fdcf6a8a4 /src/plugins/subversion | |
parent | acb07875b7f5578fae26a5230ccf37ba35936e51 (diff) | |
download | qt-creator-8b67458a9567fe4f83d3658916f5534617316b02.tar.gz |
Prefix editor's uniqueId with plugin name
In this way we minimize the chance of
generating non-unique id.
Change-Id: Idd177c5a4b44b17a58c2a944ec77b9517e91964e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/subversion')
-rw-r--r-- | src/plugins/subversion/subversionclient.cpp | 6 | ||||
-rw-r--r-- | src/plugins/subversion/subversionconstants.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/subversion/subversionclient.cpp b/src/plugins/subversion/subversionclient.cpp index 1b01c85b67..d6b4c89e51 100644 --- a/src/plugins/subversion/subversionclient.cpp +++ b/src/plugins/subversion/subversionclient.cpp @@ -300,7 +300,8 @@ void SubversionClient::diff(const QString &workingDirectory, const QStringList & Q_UNUSED(extraOptions); const QString vcsCmdString = vcsCommandString(DiffCommand); - const QString documentId = VcsBaseEditor::getTitleId(workingDirectory, files); + const QString documentId = QLatin1String(Constants::SUBVERSION_PLUGIN) + + QLatin1String(".Diff.") + VcsBaseEditor::getTitleId(workingDirectory, files); const QString title = vcsEditorTitle(vcsCmdString, documentId); DiffController *controller = findOrCreateDiffEditor(documentId, workingDirectory, title, @@ -328,7 +329,8 @@ void SubversionClient::log(const QString &workingDir, void SubversionClient::describe(const QString &workingDirectory, int changeNumber, const QString &title) { - const QString documentId = VcsBaseEditor::editorTag(DiffOutput, + const QString documentId = QLatin1String(Constants::SUBVERSION_PLUGIN) + + QLatin1String(".Describe.") + VcsBaseEditor::editorTag(DiffOutput, workingDirectory, QStringList(), QString::number(changeNumber)); diff --git a/src/plugins/subversion/subversionconstants.h b/src/plugins/subversion/subversionconstants.h index 5b52cbbb90..13c0ef4167 100644 --- a/src/plugins/subversion/subversionconstants.h +++ b/src/plugins/subversion/subversionconstants.h @@ -30,6 +30,8 @@ namespace Subversion { namespace Constants { +const char SUBVERSION_PLUGIN[] = "SubversionPlugin"; + const char NON_INTERACTIVE_OPTION[] = "--non-interactive"; enum { debug = 0 }; |