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>

3 files changed, 12 insertions, 5 deletions

diff --git a/src/plugins/diffeditor/diffeditorconstants.h b/src/plugins/diffeditor/diffeditorconstants.h
index 1c9f605aa4..a7b4185a4f 100644
--- a/src/plugins/diffeditor/diffeditorconstants.h
+++ b/src/plugins/diffeditor/diffeditorconstants.h
@@ -30,6 +30,8 @@
 namespace DiffEditor {
 namespace Constants {
 
+const char DIFF_EDITOR_PLUGIN[] = "DiffEditorPlugin";
+
 const char DIFF_EDITOR_ID[] = "Diff Editor";
 const char DIFF_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("DiffEditor", "Diff Editor");
 const char DIFF_EDITOR_MIMETYPE[] = "text/x-patch";
diff --git a/src/plugins/diffeditor/diffeditorcontroller.h b/src/plugins/diffeditor/diffeditorcontroller.h
index f73524fff5..2a9a49fe39 100644
--- a/src/plugins/diffeditor/diffeditorcontroller.h
+++ b/src/plugins/diffeditor/diffeditorcontroller.h
@@ -55,7 +55,8 @@ public:
 
     QString makePatch(bool revert, bool addPrefix = false) const;
 
-    static Core::IDocument *findOrCreateDocument(const QString &vcsId, const QString &displayName);
+    static Core::IDocument *findOrCreateDocument(const QString &vcsId,
+                                                 const QString &displayName);
     static DiffEditorController *controller(Core::IDocument *document);
 
 public slots:
diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp
index cc0f2d3a0f..e324d60aa3 100644
--- a/src/plugins/diffeditor/diffeditorplugin.cpp
+++ b/src/plugins/diffeditor/diffeditorplugin.cpp
@@ -428,7 +428,8 @@ DiffEditorServiceImpl::DiffEditorServiceImpl(QObject *parent) :
 
 void DiffEditorServiceImpl::diffModifiedFiles(const QStringList &fileNames)
 {
-    const QString documentId = QLatin1String("Diff Modified Files");
+    const QString documentId = Constants::DIFF_EDITOR_PLUGIN
+            + QLatin1String(".DiffModifiedFiles");
     const QString title = tr("Diff Modified Files");
     auto const document = qobject_cast<DiffEditorDocument *>(
                 DiffEditorController::findOrCreateDocument(documentId, title));
@@ -520,7 +521,8 @@ void DiffEditorPlugin::diffCurrentFile()
     if (fileName.isEmpty())
         return;
 
-    const QString documentId = QLatin1String("Diff ") + fileName;
+    const QString documentId = Constants::DIFF_EDITOR_PLUGIN
+            + QLatin1String(".Diff.") + fileName;
     const QString title = tr("Diff \"%1\"").arg(fileName);
     auto const document = qobject_cast<DiffEditorDocument *>(
                 DiffEditorController::findOrCreateDocument(documentId, title));
@@ -535,7 +537,8 @@ void DiffEditorPlugin::diffCurrentFile()
 
 void DiffEditorPlugin::diffOpenFiles()
 {
-    const QString documentId = QLatin1String("Diff Open Files");
+    const QString documentId = Constants::DIFF_EDITOR_PLUGIN
+            + QLatin1String(".DiffOpenFiles");
     const QString title = tr("Diff Open Files");
     auto const document = qobject_cast<DiffEditorDocument *>(
                 DiffEditorController::findOrCreateDocument(documentId, title));
@@ -566,7 +569,8 @@ void DiffEditorPlugin::diffExternalFiles()
     if (EditorManager::skipOpeningBigTextFile(fileName2))
         return;
 
-    const QString documentId = QLatin1String("Diff ") + fileName1 + QLatin1String(", ") + fileName2;
+    const QString documentId = Constants::DIFF_EDITOR_PLUGIN
+            + QLatin1String(".DiffExternalFiles.") + fileName1 + QLatin1Char('.') + fileName2;
     const QString title = tr("Diff \"%1\", \"%2\"").arg(fileName1, fileName2);
     auto const document = qobject_cast<DiffEditorDocument *>(
                 DiffEditorController::findOrCreateDocument(documentId, title));