Merge branch '1.0.0' of git@scm.dev.nokia.troll.no:creator/mainline into 1.0.0

diff --git a/share/qtcreator/schemes/MS_Visual_C++.kms b/share/qtcreator/schemes/MS_Visual_C++.kms
index 696b96b..abd265f 100644 (file)
--- 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 3065382..48bc629 100644 (file)
--- 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" >

diff --git a/src/plugins/bookmarks/bookmarks_global.h b/src/plugins/bookmarks/bookmarks_global.h
index 469c7ac..727978f 100644 (file)
--- a/src/plugins/bookmarks/bookmarks_global.h
+++ b/src/plugins/bookmarks/bookmarks_global.h
@@ -42,10 +42,10 @@ const char * const BOOKMARKS_MOVEUP_ACTION      = "Bookmarks.MoveUp";
 const char * const BOOKMARKS_MOVEDOWN_ACTION    = "Bookmarks.MoveDown";
 const char * const BOOKMARKS_PREV_ACTION        = "Bookmarks.Previous";
 const char * const BOOKMARKS_NEXT_ACTION        = "Bookmarks.Next";
-const char * const BOOKMARKS_PREVDIR_ACTION     = "Bookmarks.Previous.Directory";
-const char * const BOOKMARKS_NEXTDIR_ACTION     = "Bookmarks.Next.Directory";
-const char * const BOOKMARKS_PREVDOC_ACTION     = "Bookmarks.Previous.Document";
-const char * const BOOKMARKS_NEXTDOC_ACTION     = "Bookmarks.Next.Document";
+const char * const BOOKMARKS_PREVDIR_ACTION     = "Bookmarks.PreviousDirectory";
+const char * const BOOKMARKS_NEXTDIR_ACTION     = "Bookmarks.NextDirectory";
+const char * const BOOKMARKS_PREVDOC_ACTION     = "Bookmarks.PreviousDocument";
+const char * const BOOKMARKS_NEXTDOC_ACTION     = "Bookmarks.NextDocument";
 
 const char * const BOOKMARKS_MENU               = "Bookmarks.Menu";
 const char * const BOOKMARKS_CONTEXT            = "Bookmarks";

diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h
index 469727c..191b73c 100644 (file)
--- a/src/plugins/coreplugin/coreconstants.h
+++ b/src/plugins/coreplugin/coreconstants.h
@@ -63,9 +63,9 @@ const char * const IDE_REVISION_STR      = "";
 #undef STRINGIFY_INTERNAL
 
 //modes
-const char * const MODE_WELCOME          = "QtCreator.Mode.Welcome";
-const char * const MODE_EDIT             = "QtCreator.Mode.Edit";
-const char * const MODE_OUTPUT           = "QtCreator.Mode.Output";
+const char * const MODE_WELCOME          = "Welcome";
+const char * const MODE_EDIT             = "Edit";
+const char * const MODE_OUTPUT           = "Output";
 const int          P_MODE_WELCOME        = 100;
 const int          P_MODE_EDIT           = 90;
 const int          P_MODE_OUTPUT         = 10;

diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index 965b562..3561577 100644 (file)
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -314,7 +314,7 @@ bool MainWindow::init(QString *errorMessage)
     // Add widget to the bottom, we create the view here instead of inside the
     // OutputPaneManager, since the ViewManager needs to be initilized before
     m_outputView = new Core::BaseView;
-    m_outputView->setUniqueViewName("OutputWindow.Buttons");
+    m_outputView->setUniqueViewName("OutputWindow");
     m_outputView->setWidget(OutputPaneManager::instance()->buttonsWidget());
     m_outputView->setDefaultPosition(Core::IView::Second);
     pm->addObject(m_outputView);

diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp
index 3d4607a..856becf 100644 (file)
--- a/src/plugins/coreplugin/navigationwidget.cpp
+++ b/src/plugins/coreplugin/navigationwidget.cpp
@@ -326,7 +326,7 @@ void NavigationWidget::objectAdded(QObject * obj)
     QShortcut *shortcut = new QShortcut(this);
     shortcut->setWhatsThis(tr("Activate %1 Pane").arg(displayName));
     Core::Command *cmd = am->registerShortcut(shortcut,
-        displayName + QLatin1String(".FocusShortcut"), navicontext);
+        QLatin1String("QtCreator.Sidebar.") + displayName, navicontext);
     cmd->setDefaultKeySequence(factory->activationSequence());
     connect(shortcut, SIGNAL(activated()), this, SLOT(activateSubWidget()));
 

diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp
index 82a8be3..90d2e5c 100644 (file)
--- a/src/plugins/cpaster/cpasterplugin.cpp
+++ b/src/plugins/cpaster/cpasterplugin.cpp
@@ -103,14 +103,14 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *error_m
 
     Core::Command *command;
 
-    m_postAction = new QAction(tr("Paste snippet..."), this);
-    command = actionManager->registerAction(m_postAction, "CodePaster.post", globalcontext);
+    m_postAction = new QAction(tr("Paste Snippet..."), this);
+    command = actionManager->registerAction(m_postAction, "CodePaster.Post", globalcontext);
     command->setDefaultKeySequence(QKeySequence(tr("Alt+C,Alt+P")));
     connect(m_postAction, SIGNAL(triggered()), this, SLOT(post()));
     cpContainer->addAction(command);
 
-    m_fetchAction = new QAction(tr("Fetch snippet..."), this);
-    command = actionManager->registerAction(m_fetchAction, "CodePaster.fetch", globalcontext);
+    m_fetchAction = new QAction(tr("Fetch Snippet..."), this);
+    command = actionManager->registerAction(m_fetchAction, "CodePaster.Fetch", globalcontext);
     command->setDefaultKeySequence(QKeySequence(tr("Alt+C,Alt+F")));
     connect(m_fetchAction, SIGNAL(triggered()), this, SLOT(fetch()));
     cpContainer->addAction(command);

diff --git a/src/plugins/designer/designerconstants.h b/src/plugins/designer/designerconstants.h
index 6d5f4a4..954b90e 100644 (file)
--- a/src/plugins/designer/designerconstants.h
+++ b/src/plugins/designer/designerconstants.h
@@ -38,10 +38,10 @@ namespace Designer {
 namespace Constants {
 
 // context
-const char * const C_FORMEDITOR         = "Formeditor";
-const char * const T_FORMEDITOR         = "Formeditor.Toolbar";
-const char * const M_FORMEDITOR         = "Formeditor.Menu";
-const char * const M_FORMEDITOR_PREVIEW = "Formeditor.Menu.Preview";
+const char * const C_FORMEDITOR         = "FormEditor";
+const char * const T_FORMEDITOR         = "FormEditor.Toolbar";
+const char * const M_FORMEDITOR         = "FormEditor.Menu";
+const char * const M_FORMEDITOR_PREVIEW = "FormEditor.Menu.Preview";
 
 // Wizard type
 const char * const FORM_FILE_TYPE       = "Qt4FormFiles";

diff --git a/src/plugins/git/gitconstants.h b/src/plugins/git/gitconstants.h
index b539046..096ce41 100644 (file)
--- a/src/plugins/git/gitconstants.h
+++ b/src/plugins/git/gitconstants.h
@@ -44,8 +44,8 @@ const char * const GIT_DIFF_EDITOR_KIND = "Git Diff Editor";
 
 const char * const C_GITSUBMITEDITOR  = "Git Submit Editor";
 const char * const GITSUBMITEDITOR_KIND = "Git Submit Editor";
-const char * const SUBMIT_CURRENT = "Nokia.Git.SubmitCurrentLog";
-const char * const DIFF_SELECTED = "Nokia.Git.DiffSelectedFilesInLog";
+const char * const SUBMIT_CURRENT = "Git.SubmitCurrentLog";
+const char * const DIFF_SELECTED = "Git.DiffSelectedFilesInLog";
 const char * const SUBMIT_MIMETYPE = "application/vnd.nokia.text.git.submit";
 const char * const GIT_BINARY = "git";
 

diff --git a/src/plugins/help/helpplugin.h b/src/plugins/help/helpplugin.h
index 145981e..d38df69 100644 (file)
--- a/src/plugins/help/helpplugin.h
+++ b/src/plugins/help/helpplugin.h
@@ -71,7 +71,7 @@ namespace Constants {
     const char * const HELPVIEWER_KIND = "Qt Help Viewer";
     const char * const C_MODE_HELP     = "Help Mode";
     const int          P_MODE_HELP     = 70;
-    const char * const ID_MODE_HELP    = "Help.HelpMode";
+    const char * const ID_MODE_HELP    = "Help";
 }
 
 class HELP_EXPORT HelpManager : public QObject

diff --git a/src/plugins/perforce/perforceconstants.h b/src/plugins/perforce/perforceconstants.h
index e0feb0c..a0d47ba 100644 (file)
--- a/src/plugins/perforce/perforceconstants.h
+++ b/src/plugins/perforce/perforceconstants.h
@@ -42,8 +42,8 @@ const char * const C_PERFORCEEDITOR  = "Perforce Editor";
 const char * const PERFORCEEDITOR_KIND  = "Perforce Editor";
 const char * const C_PERFORCESUBMITEDITOR  = "Perforce Submit Editor";
 const char * const PERFORCESUBMITEDITOR_KIND  = "Perforce Submit Editor";
-const char * const SUBMIT_CURRENT = "Nokia.Perforce.SubmitCurrentLog";
-const char * const DIFF_SELECTED = "Nokia.Perforce.DiffSelectedFilesInLog";
+const char * const SUBMIT_CURRENT = "Perforce.SubmitCurrentLog";
+const char * const DIFF_SELECTED = "Perforce.DiffSelectedFilesInLog";
 const char * const SUBMIT_MIMETYPE = "application/vnd.nokia.text.p4.submit";
 enum { debug = 0 };
 } // Internal

diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h
index e65ca54..8680a80 100644 (file)
--- a/src/plugins/projectexplorer/projectexplorerconstants.h
+++ b/src/plugins/projectexplorer/projectexplorerconstants.h
@@ -38,7 +38,7 @@ namespace ProjectExplorer {
 namespace Constants {
 
 // modes and their priorities
-const char * const MODE_SESSION         = "ProjectExplorer.Mode.Session";
+const char * const MODE_SESSION         = "Project";
 const int          P_MODE_SESSION       = 85;
 
 // actions

diff --git a/src/plugins/qtscripteditor/qtscripteditorconstants.h b/src/plugins/qtscripteditor/qtscripteditorconstants.h
index 0e2e52c..474a829 100644 (file)
--- a/src/plugins/qtscripteditor/qtscripteditorconstants.h
+++ b/src/plugins/qtscripteditor/qtscripteditorconstants.h
@@ -38,8 +38,8 @@ namespace QtScriptEditor {
 namespace Constants {
 
 const char * const M_CONTEXT = "Qt Script Editor.ContextMenu";
-const char * const RUN = "Qt Script Editor.Run";
-const char * const RUN_SEP = "Qt Script Editor.Run.Separator";
+const char * const RUN = "QtScriptEditor.Run";
+const char * const RUN_SEP = "QtScriptEditor.Run.Separator";
 const char * const C_QTSCRIPTEDITOR = "Qt Script Editor";
 
 const char * const C_QTSCRIPTEDITOR_MIMETYPE = "application/javascript";

diff --git a/src/plugins/quickopen/quickopenplugin.cpp b/src/plugins/quickopen/quickopenplugin.cpp
index a7b6de8..c6a67e6 100644 (file)
--- a/src/plugins/quickopen/quickopenplugin.cpp
+++ b/src/plugins/quickopen/quickopenplugin.cpp
@@ -91,14 +91,14 @@ bool QuickOpenPlugin::initialize(const QStringList &, QString *)
     m_quickOpenToolWindow = new QuickOpenToolWindow(this);
     m_quickOpenToolWindow->setEnabled(false);
     Core::BaseView *view = new Core::BaseView;
-    view->setUniqueViewName("QuickOpen.ToolWindow");
+    view->setUniqueViewName("QuickOpen");
     view->setWidget(m_quickOpenToolWindow);
     view->setContext(QList<int>() << core->uniqueIDManager()
         ->uniqueIdentifier(QLatin1String("QuickOpenToolWindow")));
     view->setDefaultPosition(Core::IView::First);
     addAutoReleasedObject(view);
 
-    const QString actionId = QLatin1String("QtCreator.View.QuickOpen.ToolWindow");
+    const QString actionId = QLatin1String("QtCreator.QuickOpen");
     QAction *action = new QAction(m_quickOpenToolWindow->windowIcon(), m_quickOpenToolWindow->windowTitle(), this);
     Core::Command *cmd = core->actionManager()->registerAction(action, actionId, QList<int>() << Core::Constants::C_GLOBAL_ID);
     cmd->setDefaultKeySequence(QKeySequence("Ctrl+K"));

diff --git a/src/plugins/snippets/snippetsplugin.cpp b/src/plugins/snippets/snippetsplugin.cpp
index 3eae254..d597b9a 100644 (file)
--- a/src/plugins/snippets/snippetsplugin.cpp
+++ b/src/plugins/snippets/snippetsplugin.cpp
@@ -82,7 +82,7 @@ bool SnippetsPlugin::initialize(const QStringList &arguments, QString *)
 
     m_snippetWnd = new SnippetsWindow();
     Core::BaseView *view = new Core::BaseView;
-    view->setUniqueViewName("Snippets.SnippetsTree");
+    view->setUniqueViewName("Snippets");
     view->setWidget(m_snippetWnd);
     view->setContext(QList<int>()
         << core->uniqueIDManager()->uniqueIdentifier(QLatin1String("Snippets Window"))

diff --git a/src/plugins/subversion/subversionconstants.h b/src/plugins/subversion/subversionconstants.h
index bd06b2b..57c3b07 100644 (file)
--- a/src/plugins/subversion/subversionconstants.h
+++ b/src/plugins/subversion/subversionconstants.h
@@ -42,8 +42,8 @@ const char * const SUBVERSIONEDITOR  = "Subversion Editor";
 const char * const SUBVERSIONEDITOR_KIND  = "Subversion Editor";
 const char * const SUBVERSIONCOMMITEDITOR  = "Subversion Commit Editor";
 const char * const SUBVERSIONCOMMITEDITOR_KIND  = "Subversion Commit Editor";
-const char * const SUBMIT_CURRENT = "Nokia.Subversion.SubmitCurrentLog";
-const char * const DIFF_SELECTED = "Nokia.Subversion.DiffSelectedFilesInLog";
+const char * const SUBMIT_CURRENT = "Subversion.SubmitCurrentLog";
+const char * const DIFF_SELECTED = "Subversion.DiffSelectedFilesInLog";
 enum { debug = 0 };
 
 } // namespace Constants