From 0b71e89b24d60ef4be8a5b71de543b97548d441b Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Fri, 20 Feb 2009 17:30:57 +0100
Subject: [PATCH] Fixes:    adjust example keymaps to recent changes

---
 share/qtcreator/schemes/MS_Visual_C++.kms | 34 +++++++++----------
 share/qtcreator/schemes/Xcode.kms         | 40 +++++++++++------------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/share/qtcreator/schemes/MS_Visual_C++.kms b/share/qtcreator/schemes/MS_Visual_C++.kms
index 696b96bb42f..abd265f1bad 100644
--- a/share/qtcreator/schemes/MS_Visual_C++.kms
+++ b/share/qtcreator/schemes/MS_Visual_C++.kms
@@ -24,10 +24,10 @@
  <shortcut id="Debugger.AddToWatch" >
   <key value="Alt+D, Alt+W" />
  </shortcut>
- <shortcut id="QtCreator.Mode.GdbDebugger.Mode.Debug" >
+ <shortcut id="QtCreator.Mode.Debug" >
   <key value="Ctrl+3" />
  </shortcut>
- <shortcut id="Qt Script Editor.Run" >
+ <shortcut id="QtScriptEditor.Run" >
   <key value="" />
  </shortcut>
  <shortcut id="FindFilter.Files on Disk" >
@@ -168,19 +168,19 @@
  <shortcut id="QtCreator.RevertToSaved" >
   <key value="" />
  </shortcut>
- <shortcut id="Formeditor.Menu.Preview.Windows" >
+ <shortcut id="FormEditor.Menu.Preview.Windows" >
   <key value="" />
  </shortcut>
- <shortcut id="Formeditor.Menu.Preview.Motif" >
+ <shortcut id="FormEditor.Menu.Preview.Motif" >
   <key value="" />
  </shortcut>
- <shortcut id="Formeditor.Menu.Preview.CDE" >
+ <shortcut id="FormEditor.Menu.Preview.CDE" >
   <key value="" />
  </shortcut>
- <shortcut id="Formeditor.Menu.Preview.Plastique" >
+ <shortcut id="FormEditor.Menu.Preview.Plastique" >
   <key value="" />
  </shortcut>
- <shortcut id="Formeditor.Menu.Preview.Cleanlooks" >
+ <shortcut id="FormEditor.Menu.Preview.Cleanlooks" >
   <key value="" />
  </shortcut>
  <shortcut id="FormEditor.ViewCode" >
@@ -231,13 +231,13 @@
  <shortcut id="QtCreator.DocumentToNextGroup" >
   <key value="" />
  </shortcut>
- <shortcut id="QtCreator.Mode.QtCreator.Mode.Output" >
+ <shortcut id="QtCreator.Mode.Output" >
   <key value="Ctrl+6" />
  </shortcut>
- <shortcut id="QtCreator.Mode.QtCreator.Mode.Welcome" >
+ <shortcut id="QtCreator.Mode.Welcome" >
   <key value="Ctrl+1" />
  </shortcut>
- <shortcut id="QtCreator.Mode.QtCreator.Mode.Edit" >
+ <shortcut id="QtCreator.Mode.Edit" >
   <key value="Ctrl+2" />
  </shortcut>
  <shortcut id="Find.FindInCurrentDocument" >
@@ -264,7 +264,7 @@
  <shortcut id="Find.WholeWords" >
   <key value="" />
  </shortcut>
- <shortcut id="QtCreator.View.QuickOpen.ToolWindow" >
+ <shortcut id="QtCreator.QuickOpen" >
   <key value="Ctrl+D" />
  </shortcut>
  <shortcut id="Help.Home" >
@@ -291,7 +291,7 @@
  <shortcut id="Help.Context" >
   <key value="F1" />
  </shortcut>
- <shortcut id="QtCreator.Mode.Help.HelpMode" >
+ <shortcut id="QtCreator.Mode.Help" >
   <key value="Ctrl+5" />
  </shortcut>
  <shortcut id="Help.IndexShortcut" >
@@ -306,7 +306,7 @@
  <shortcut id="TextEditor.CompleteThis" >
   <key value="Ctrl+Space" />
  </shortcut>
- <shortcut id="QtCreator.Mode.ProjectExplorer.Mode.Session" >
+ <shortcut id="QtCreator.Mode.Project" >
   <key value="Ctrl+4" />
  </shortcut>
  <shortcut id="ProjectExplorer.NewSession" >
@@ -387,10 +387,10 @@
  <shortcut id="Bookmarks.Next" >
   <key value="F2" />
  </shortcut>
- <shortcut id="Bookmarks.Previous.Document" >
+ <shortcut id="Bookmarks.PreviousDocument" >
   <key value="" />
  </shortcut>
- <shortcut id="Bookmarks.Next.Document" >
+ <shortcut id="Bookmarks.NextDocument" >
   <key value="" />
  </shortcut>
  <shortcut id="CppTools.SwitchHeaderSource" >
@@ -453,10 +453,10 @@
  <shortcut id="Perforce.Filelog" >
   <key value="" />
  </shortcut>
- <shortcut id="Nokia.Perforce.SubmitCurrentLog" >
+ <shortcut id="Perforce.SubmitCurrentLog" >
   <key value="" />
  </shortcut>
- <shortcut id="Nokia.Perforce.DiffSelectedFilesInLog" >
+ <shortcut id="Perforce.DiffSelectedFilesInLog" >
   <key value="" />
  </shortcut>
  <shortcut id="Debugger.StartExternal" >
diff --git a/share/qtcreator/schemes/Xcode.kms b/share/qtcreator/schemes/Xcode.kms
index 30653822dff..48bc6291322 100644
--- a/share/qtcreator/schemes/Xcode.kms
+++ b/share/qtcreator/schemes/Xcode.kms
@@ -114,13 +114,13 @@
  <shortcut id="QtCreator.DocumentToNextGroup" >
   <key value="" />
  </shortcut>
- <shortcut id="QtCreator.Mode.QtCreator.Mode.Output" >
+ <shortcut id="QtCreator.Mode.Output" >
   <key value="Meta+6" />
  </shortcut>
- <shortcut id="QtCreator.Mode.QtCreator.Mode.Welcome" >
+ <shortcut id="QtCreator.Mode.Welcome" >
   <key value="Meta+1" />
  </shortcut>
- <shortcut id="QtCreator.Mode.QtCreator.Mode.Edit" >
+ <shortcut id="QtCreator.Mode.Edit" >
   <key value="Meta+2" />
  </shortcut>
  <shortcut id="Find.FindInCurrentDocument" >
@@ -150,13 +150,13 @@
  <shortcut id="Find.WholeWords" >
   <key value="" />
  </shortcut>
- <shortcut id="QtCreator.View.QuickOpen.ToolWindow" >
+ <shortcut id="QtCreator.QuickOpen" >
   <key value="Ctrl+Shift+D" />
  </shortcut>
  <shortcut id="TextEditor.CompleteThis" >
   <key value="Alt+Esc" />
  </shortcut>
- <shortcut id="QtCreator.Mode.ProjectExplorer.Mode.Session" >
+ <shortcut id="QtCreator.Mode.Project" >
   <key value="Meta+4" />
  </shortcut>
  <shortcut id="ProjectExplorer.NewSession" >
@@ -282,22 +282,22 @@
  <shortcut id="FormEditor.Preview" >
   <key value="Ctrl+Alt+R" />
  </shortcut>
- <shortcut id="Formeditor.Menu.Preview.Windows" >
+ <shortcut id="FormEditor.Menu.Preview.Windows" >
   <key value="" />
  </shortcut>
- <shortcut id="Formeditor.Menu.Preview.Motif" >
+ <shortcut id="FormEditor.Menu.Preview.Motif" >
   <key value="" />
  </shortcut>
- <shortcut id="Formeditor.Menu.Preview.CDE" >
+ <shortcut id="FormEditor.Menu.Preview.CDE" >
   <key value="" />
  </shortcut>
- <shortcut id="Formeditor.Menu.Preview.Plastique" >
+ <shortcut id="FormEditor.Menu.Preview.Plastique" >
   <key value="" />
  </shortcut>
- <shortcut id="Formeditor.Menu.Preview.Cleanlooks" >
+ <shortcut id="FormEditor.Menu.Preview.Cleanlooks" >
   <key value="" />
  </shortcut>
- <shortcut id="Formeditor.Menu.Preview.Macintosh (aqua)" >
+ <shortcut id="FormEditor.Menu.Preview.Macintosh (aqua)" >
   <key value="" />
  </shortcut>
  <shortcut id="FormEditor.FormSettings" >
@@ -369,7 +369,7 @@
  <shortcut id="Help.Context" >
   <key value="F1" />
  </shortcut>
- <shortcut id="QtCreator.Mode.Help.HelpMode" >
+ <shortcut id="QtCreator.Mode.Help" >
   <key value="Meta+5" />
  </shortcut>
  <shortcut id="Help.IndexShortcut" >
@@ -387,13 +387,13 @@
  <shortcut id="Qt4Builder.RunQMakeContextMenu" >
   <key value="" />
  </shortcut>
- <shortcut id="Qt Script Editor.Run" >
+ <shortcut id="QtScriptEditor.Run" >
   <key value="Ctrl+R" />
  </shortcut>
- <shortcut id="CodePaster.post" >
+ <shortcut id="CodePaster.Post" >
   <key value="Alt+C, Alt+P" />
  </shortcut>
- <shortcut id="CodePaster.fetch" >
+ <shortcut id="CodePaster.Fetch" >
   <key value="Alt+C, Alt+F" />
  </shortcut>
  <shortcut id="Debugger.StartExternal" >
@@ -456,7 +456,7 @@
  <shortcut id="Debugger.AddToWatch" >
   <key value="" />
  </shortcut>
- <shortcut id="QtCreator.Mode.Debugger.Mode.Debug" >
+ <shortcut id="QtCreator.Mode.Debug" >
   <key value="Meta+3" />
  </shortcut>
  <shortcut id="Perforce.Edit" >
@@ -504,10 +504,10 @@
  <shortcut id="Perforce.Filelog" >
   <key value="" />
  </shortcut>
- <shortcut id="Nokia.Perforce.SubmitCurrentLog" >
+ <shortcut id="Perforce.SubmitCurrentLog" >
   <key value="" />
  </shortcut>
- <shortcut id="Nokia.Perforce.DiffSelectedFilesInLog" >
+ <shortcut id="Perforce.DiffSelectedFilesInLog" >
   <key value="" />
  </shortcut>
  <shortcut id="Bookmarks.Toggle" >
@@ -525,10 +525,10 @@
  <shortcut id="Bookmarks.Next" >
   <key value="Meta+." />
  </shortcut>
- <shortcut id="Bookmarks.Previous.Document" >
+ <shortcut id="Bookmarks.PreviousDocument" >
   <key value="" />
  </shortcut>
- <shortcut id="Bookmarks.Next.Document" >
+ <shortcut id="Bookmarks.NextDocument" >
   <key value="" />
  </shortcut>
  <shortcut id="TextEditor.SelectEncoding" >