diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h
index 3da9fd45579e9d3cf829760cd92292735ff7f480..21e5dd5ea7b2574fcc66e2f02c611d112b1d9c03 100644
--- a/src/plugins/coreplugin/coreconstants.h
+++ b/src/plugins/coreplugin/coreconstants.h
@@ -38,194 +38,193 @@
namespace Core {
namespace Constants {
-//modes
-const char * const MODE_WELCOME = "Welcome";
-const char * const MODE_WELCOME_TYPE = "Type.Welcome";
-const char * const MODE_EDIT = "Edit";
-const char * const MODE_EDIT_TYPE = "Type.Edit";
-const char * const MODE_DESIGN = "Design";
-const char * const MODE_DESIGN_TYPE = "Type.Design";
-const int P_MODE_WELCOME = 100;
-const int P_MODE_EDIT = 90;
-const int P_MODE_DESIGN = 89;
-
-//menubar
-const char * const MENU_BAR = "QtCreator.MenuBar";
-
-//menus
-const char * const M_FILE = "QtCreator.Menu.File";
-const char * const M_FILE_RECENTFILES = "QtCreator.Menu.File.RecentFiles";
-const char * const M_EDIT = "QtCreator.Menu.Edit";
-const char * const M_EDIT_ADVANCED = "QtCreator.Menu.Edit.Advanced";
-const char * const M_TOOLS = "QtCreator.Menu.Tools";
-const char * const M_TOOLS_EXTERNAL = "QtCreator.Menu.Tools.External";
-const char * const M_WINDOW = "QtCreator.Menu.Window";
-const char * const M_WINDOW_PANES = "QtCreator.Menu.Window.Panes";
-const char * const M_WINDOW_VIEWS = "QtCreator.Menu.Window.Views";
-const char * const M_HELP = "QtCreator.Menu.Help";
-
-//contexts
-const char * const C_GLOBAL = "Global Context";
-const char * const C_WELCOME_MODE = "Core.WelcomeMode";
-const char * const C_EDIT_MODE = "Core.EditMode";
-const char * const C_DESIGN_MODE = "Core.DesignMode";
-const char * const C_EDITORMANAGER = "Core.EditorManager";
-const char * const C_NAVIGATION_PANE = "Core.NavigationPane";
-const char * const C_PROBLEM_PANE = "Core.ProblemPane";
-const char * const C_GENERAL_OUTPUT_PANE = "Core.GeneralOutputPane";
-
-//default editor kind
-const char * const K_DEFAULT_TEXT_EDITOR_DISPLAY_NAME = QT_TRANSLATE_NOOP("OpenWith::Editors", "Plain Text Editor");
-const char * const K_DEFAULT_TEXT_EDITOR_ID = "Core.PlainTextEditor";
-const char * const K_DEFAULT_BINARY_EDITOR_ID = "Core.BinaryEditor";
+// Modes
+const char MODE_WELCOME[] = "Welcome";
+const char MODE_WELCOME_TYPE[] = "Type.Welcome";
+const char MODE_EDIT[] = "Edit";
+const char MODE_EDIT_TYPE[] = "Type.Edit";
+const char MODE_DESIGN[] = "Design";
+const char MODE_DESIGN_TYPE[] = "Type.Design";
+const int P_MODE_WELCOME = 100;
+const int P_MODE_EDIT = 90;
+const int P_MODE_DESIGN = 89;
+
+// Menubar
+const char MENU_BAR[] = "QtCreator.MenuBar";
+
+// Menus
+const char M_FILE[] = "QtCreator.Menu.File";
+const char M_FILE_RECENTFILES[] = "QtCreator.Menu.File.RecentFiles";
+const char M_EDIT[] = "QtCreator.Menu.Edit";
+const char M_EDIT_ADVANCED[] = "QtCreator.Menu.Edit.Advanced";
+const char M_TOOLS[] = "QtCreator.Menu.Tools";
+const char M_TOOLS_EXTERNAL[] = "QtCreator.Menu.Tools.External";
+const char M_WINDOW[] = "QtCreator.Menu.Window";
+const char M_WINDOW_PANES[] = "QtCreator.Menu.Window.Panes";
+const char M_WINDOW_VIEWS[] = "QtCreator.Menu.Window.Views";
+const char M_HELP[] = "QtCreator.Menu.Help";
+
+// Contexts
+const char C_GLOBAL[] = "Global Context";
+const char C_WELCOME_MODE[] = "Core.WelcomeMode";
+const char C_EDIT_MODE[] = "Core.EditMode";
+const char C_DESIGN_MODE[] = "Core.DesignMode";
+const char C_EDITORMANAGER[] = "Core.EditorManager";
+const char C_NAVIGATION_PANE[] = "Core.NavigationPane";
+const char C_PROBLEM_PANE[] = "Core.ProblemPane";
+const char C_GENERAL_OUTPUT_PANE[] = "Core.GeneralOutputPane";
+
+// Default editor kind
+const char K_DEFAULT_TEXT_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("OpenWith::Editors", "Plain Text Editor");
+const char K_DEFAULT_TEXT_EDITOR_ID[] = "Core.PlainTextEditor";
+const char K_DEFAULT_BINARY_EDITOR_ID[] = "Core.BinaryEditor";
//actions
-const char * const UNDO = "QtCreator.Undo";
-const char * const REDO = "QtCreator.Redo";
-const char * const COPY = "QtCreator.Copy";
-const char * const PASTE = "QtCreator.Paste";
-const char * const CUT = "QtCreator.Cut";
-const char * const SELECTALL = "QtCreator.SelectAll";
-
-const char * const GOTO = "QtCreator.Goto";
-
-const char * const NEW = "QtCreator.New";
-const char * const OPEN = "QtCreator.Open";
-const char * const OPEN_WITH = "QtCreator.OpenWith";
-const char * const REVERTTOSAVED = "QtCreator.RevertToSaved";
-const char * const SAVE = "QtCreator.Save";
-const char * const SAVEAS = "QtCreator.SaveAs";
-const char * const SAVEALL = "QtCreator.SaveAll";
-const char * const PRINT = "QtCreator.Print";
-const char * const EXIT = "QtCreator.Exit";
-
-const char * const OPTIONS = "QtCreator.Options";
-const char * const TOGGLE_SIDEBAR = "QtCreator.ToggleSidebar";
-const char * const TOGGLE_FULLSCREEN = "QtCreator.ToggleFullScreen";
+const char UNDO[] = "QtCreator.Undo";
+const char REDO[] = "QtCreator.Redo";
+const char COPY[] = "QtCreator.Copy";
+const char PASTE[] = "QtCreator.Paste";
+const char CUT[] = "QtCreator.Cut";
+const char SELECTALL[] = "QtCreator.SelectAll";
+
+const char GOTO[] = "QtCreator.Goto";
+
+const char NEW[] = "QtCreator.New";
+const char OPEN[] = "QtCreator.Open";
+const char OPEN_WITH[] = "QtCreator.OpenWith";
+const char REVERTTOSAVED[] = "QtCreator.RevertToSaved";
+const char SAVE[] = "QtCreator.Save";
+const char SAVEAS[] = "QtCreator.SaveAs";
+const char SAVEALL[] = "QtCreator.SaveAll";
+const char PRINT[] = "QtCreator.Print";
+const char EXIT[] = "QtCreator.Exit";
+
+const char OPTIONS[] = "QtCreator.Options";
+const char TOGGLE_SIDEBAR[] = "QtCreator.ToggleSidebar";
+const char TOGGLE_FULLSCREEN[] = "QtCreator.ToggleFullScreen";
#ifdef Q_WS_MAC
-const char * const MINIMIZE_WINDOW = "QtCreator.MinimizeWindow";
-const char * const ZOOM_WINDOW = "QtCreator.ZoomWindow";
+const char MINIMIZE_WINDOW[] = "QtCreator.MinimizeWindow";
+const char ZOOM_WINDOW[] = "QtCreator.ZoomWindow";
#endif
-const char * const SPLIT = "QtCreator.Split";
-const char * const SPLIT_SIDE_BY_SIDE = "QtCreator.SplitSideBySide";
-const char * const REMOVE_CURRENT_SPLIT = "QtCreator.RemoveCurrentSplit";
-const char * const REMOVE_ALL_SPLITS = "QtCreator.RemoveAllSplits";
-const char * const GOTO_OTHER_SPLIT = "QtCreator.GotoOtherSplit";
-const char * const CLOSE = "QtCreator.Close";
+const char SPLIT[] = "QtCreator.Split";
+const char SPLIT_SIDE_BY_SIDE[] = "QtCreator.SplitSideBySide";
+const char REMOVE_CURRENT_SPLIT[] = "QtCreator.RemoveCurrentSplit";
+const char REMOVE_ALL_SPLITS[] = "QtCreator.RemoveAllSplits";
+const char GOTO_OTHER_SPLIT[] = "QtCreator.GotoOtherSplit";
+const char CLOSE[] = "QtCreator.Close";
#ifdef Q_WS_WIN
-const char * const CLOSE_ALTERNATIVE = "QtCreator.Close_Alternative"; // temporary, see QTCREATORBUG-72
+const char CLOSE_ALTERNATIVE[] = "QtCreator.Close_Alternative"; // temporary, see QTCREATORBUG-72
#endif
-const char * const CLOSEALL = "QtCreator.CloseAll";
-const char * const CLOSEOTHERS = "QtCreator.CloseOthers";
-const char * const GOTONEXT = "QtCreator.GotoNext";
-const char * const GOTOPREV = "QtCreator.GotoPrevious";
-const char * const GOTONEXTINHISTORY = "QtCreator.GotoNextInHistory";
-const char * const GOTOPREVINHISTORY = "QtCreator.GotoPreviousInHistory";
-const char * const GO_BACK = "QtCreator.GoBack";
-const char * const GO_FORWARD = "QtCreator.GoForward";
-const char * const ABOUT_QTCREATOR = "QtCreator.AboutQtCreator";
-const char * const ABOUT_PLUGINS = "QtCreator.AboutPlugins";
-const char * const S_RETURNTOEDITOR = "QtCreator.ReturnToEditor";
-
-// default groups
-const char * const G_DEFAULT_ONE = "QtCreator.Group.Default.One";
-const char * const G_DEFAULT_TWO = "QtCreator.Group.Default.Two";
-const char * const G_DEFAULT_THREE = "QtCreator.Group.Default.Three";
-
-// main menu bar groups
-const char * const G_FILE = "QtCreator.Group.File";
-const char * const G_EDIT = "QtCreator.Group.Edit";
-const char * const G_VIEW = "QtCreator.Group.View";
-const char * const G_TOOLS = "QtCreator.Group.Tools";
-const char * const G_WINDOW = "QtCreator.Group.Window";
-const char * const G_HELP = "QtCreator.Group.Help";
-
-// file menu groups
-const char * const G_FILE_NEW = "QtCreator.Group.File.New";
-const char * const G_FILE_OPEN = "QtCreator.Group.File.Open";
-const char * const G_FILE_PROJECT = "QtCreator.Group.File.Project";
-const char * const G_FILE_SAVE = "QtCreator.Group.File.Save";
-const char * const G_FILE_CLOSE = "QtCreator.Group.File.Close";
-const char * const G_FILE_PRINT = "QtCreator.Group.File.Print";
-const char * const G_FILE_OTHER = "QtCreator.Group.File.Other";
-
-// edit menu groups
-const char * const G_EDIT_UNDOREDO = "QtCreator.Group.Edit.UndoRedo";
-const char * const G_EDIT_COPYPASTE = "QtCreator.Group.Edit.CopyPaste";
-const char * const G_EDIT_SELECTALL = "QtCreator.Group.Edit.SelectAll";
-const char * const G_EDIT_ADVANCED = "QtCreator.Group.Edit.Advanced";
-
-const char * const G_EDIT_FIND = "QtCreator.Group.Edit.Find";
-const char * const G_EDIT_OTHER = "QtCreator.Group.Edit.Other";
-
-// advanced edit menu groups
-
-const char * const G_EDIT_FORMAT = "QtCreator.Group.Edit.Format";
-const char * const G_EDIT_COLLAPSING = "QtCreator.Group.Edit.Collapsing";
-const char * const G_EDIT_BLOCKS = "QtCreator.Group.Edit.Blocks";
-const char * const G_EDIT_FONT = "QtCreator.Group.Edit.Font";
-const char * const G_EDIT_EDITOR = "QtCreator.Group.Edit.Editor";
-
-const char * const G_TOOLS_OPTIONS = "QtCreator.Group.Tools.Options";
-
-// window menu groups
-const char * const G_WINDOW_SIZE = "QtCreator.Group.Window.Size";
-const char * const G_WINDOW_PANES = "QtCreator.Group.Window.Panes";
-const char * const G_WINDOW_VIEWS = "QtCreator.Group.Window.Views";
-const char * const G_WINDOW_SPLIT = "QtCreator.Group.Window.Split";
-const char * const G_WINDOW_NAVIGATE = "QtCreator.Group.Window.Navigate";
-const char * const G_WINDOW_OTHER = "QtCreator.Group.Window.Other";
-
-// help groups (global)
-const char * const G_HELP_HELP = "QtCreator.Group.Help.Help";
-const char * const G_HELP_ABOUT = "QtCreator.Group.Help.About";
-
-const char * const ICON_MINUS = ":/core/images/minus.png";
-const char * const ICON_PLUS = ":/core/images/plus.png";
-const char * const ICON_NEWFILE = ":/core/images/filenew.png";
-const char * const ICON_OPENFILE = ":/core/images/fileopen.png";
-const char * const ICON_SAVEFILE = ":/core/images/filesave.png";
-const char * const ICON_UNDO = ":/core/images/undo.png";
-const char * const ICON_REDO = ":/core/images/redo.png";
-const char * const ICON_COPY = ":/core/images/editcopy.png";
-const char * const ICON_PASTE = ":/core/images/editpaste.png";
-const char * const ICON_CUT = ":/core/images/editcut.png";
-const char * const ICON_NEXT = ":/core/images/next.png";
-const char * const ICON_PREV = ":/core/images/prev.png";
-const char * const ICON_DIR = ":/core/images/dir.png";
-const char * const ICON_CLEAN_PANE = ":/core/images/clean_pane_small.png";
-const char * const ICON_CLEAR = ":/core/images/clear.png";
-const char * const ICON_RESET = ":/core/images/reset.png";
-const char * const ICON_MAGNIFIER = ":/core/images/magnifier.png";
-const char * const ICON_TOGGLE_SIDEBAR = ":/core/images/sidebaricon.png";
-const char * const ICON_CLOSE = ":/core/images/closebutton.png";
-const char * const ICON_CLOSE_DARK = ":/core/images/darkclosebutton.png";
-const char * const ICON_SPLIT_HORIZONTAL = ":/core/images/splitbutton_horizontal.png";
-const char * const ICON_FILTER = ":/core/images/filtericon.png";
-const char * const ICON_LINK = ":/core/images/linkicon.png";
-const char * const ICON_QTLOGO_32 = ":/core/images/logo/32/qtcreator.png";
-const char * const ICON_QTLOGO_128 = ":/core/images/logo/128/qtcreator.png";
-
-const char * const WIZARD_CATEGORY_QT = "R.Qt";
-const char * const WIZARD_TR_CATEGORY_QT = QT_TRANSLATE_NOOP("Core", "Qt");
-
-const char * const SETTINGS_CATEGORY_CORE = "A.Core";
-const char * const SETTINGS_CATEGORY_CORE_ICON = ":/core/images/category_core.png";
-const char * const SETTINGS_TR_CATEGORY_CORE = QT_TRANSLATE_NOOP("Core", "Environment");
-const char * const SETTINGS_ID_ENVIRONMENT = "A.General";
-const char * const SETTINGS_ID_SHORTCUTS = "B.Keyboard";
-const char * const SETTINGS_ID_TOOLS = "C.ExternalTools";
-const char * const SETTINGS_ID_MIMETYPES = "D.MimeTypes";
-
-const char * const SETTINGS_DEFAULTTEXTENCODING = "General/DefaultFileEncoding";
-
-const char * const ALL_FILES_FILTER = QT_TRANSLATE_NOOP("Core", "All Files (*)");
-
-const char * const VARIABLE_SUPPORT_PROPERTY = "QtCreator.VariableSupport";
-
-const char * const TR_CLEAR_MENU = QT_TRANSLATE_NOOP("Core", "Clear Menu");
+const char CLOSEALL[] = "QtCreator.CloseAll";
+const char CLOSEOTHERS[] = "QtCreator.CloseOthers";
+const char GOTONEXT[] = "QtCreator.GotoNext";
+const char GOTOPREV[] = "QtCreator.GotoPrevious";
+const char GOTONEXTINHISTORY[] = "QtCreator.GotoNextInHistory";
+const char GOTOPREVINHISTORY[] = "QtCreator.GotoPreviousInHistory";
+const char GO_BACK[] = "QtCreator.GoBack";
+const char GO_FORWARD[] = "QtCreator.GoForward";
+const char ABOUT_QTCREATOR[] = "QtCreator.AboutQtCreator";
+const char ABOUT_PLUGINS[] = "QtCreator.AboutPlugins";
+const char S_RETURNTOEDITOR[] = "QtCreator.ReturnToEditor";
+
+// Default groups
+const char G_DEFAULT_ONE[] = "QtCreator.Group.Default.One";
+const char G_DEFAULT_TWO[] = "QtCreator.Group.Default.Two";
+const char G_DEFAULT_THREE[] = "QtCreator.Group.Default.Three";
+
+// Main menu bar groups
+const char G_FILE[] = "QtCreator.Group.File";
+const char G_EDIT[] = "QtCreator.Group.Edit";
+const char G_VIEW[] = "QtCreator.Group.View";
+const char G_TOOLS[] = "QtCreator.Group.Tools";
+const char G_WINDOW[] = "QtCreator.Group.Window";
+const char G_HELP[] = "QtCreator.Group.Help";
+
+// File menu groups
+const char G_FILE_NEW[] = "QtCreator.Group.File.New";
+const char G_FILE_OPEN[] = "QtCreator.Group.File.Open";
+const char G_FILE_PROJECT[] = "QtCreator.Group.File.Project";
+const char G_FILE_SAVE[] = "QtCreator.Group.File.Save";
+const char G_FILE_CLOSE[] = "QtCreator.Group.File.Close";
+const char G_FILE_PRINT[] = "QtCreator.Group.File.Print";
+const char G_FILE_OTHER[] = "QtCreator.Group.File.Other";
+
+// Edit menu groups
+const char G_EDIT_UNDOREDO[] = "QtCreator.Group.Edit.UndoRedo";
+const char G_EDIT_COPYPASTE[] = "QtCreator.Group.Edit.CopyPaste";
+const char G_EDIT_SELECTALL[] = "QtCreator.Group.Edit.SelectAll";
+const char G_EDIT_ADVANCED[] = "QtCreator.Group.Edit.Advanced";
+
+const char G_EDIT_FIND[] = "QtCreator.Group.Edit.Find";
+const char G_EDIT_OTHER[] = "QtCreator.Group.Edit.Other";
+
+// Advanced edit menu groups
+const char G_EDIT_FORMAT[] = "QtCreator.Group.Edit.Format";
+const char G_EDIT_COLLAPSING[] = "QtCreator.Group.Edit.Collapsing";
+const char G_EDIT_BLOCKS[] = "QtCreator.Group.Edit.Blocks";
+const char G_EDIT_FONT[] = "QtCreator.Group.Edit.Font";
+const char G_EDIT_EDITOR[] = "QtCreator.Group.Edit.Editor";
+
+const char G_TOOLS_OPTIONS[] = "QtCreator.Group.Tools.Options";
+
+// Window menu groups
+const char G_WINDOW_SIZE[] = "QtCreator.Group.Window.Size";
+const char G_WINDOW_PANES[] = "QtCreator.Group.Window.Panes";
+const char G_WINDOW_VIEWS[] = "QtCreator.Group.Window.Views";
+const char G_WINDOW_SPLIT[] = "QtCreator.Group.Window.Split";
+const char G_WINDOW_NAVIGATE[] = "QtCreator.Group.Window.Navigate";
+const char G_WINDOW_OTHER[] = "QtCreator.Group.Window.Other";
+
+// Help groups (global)
+const char G_HELP_HELP[] = "QtCreator.Group.Help.Help";
+const char G_HELP_ABOUT[] = "QtCreator.Group.Help.About";
+
+const char ICON_MINUS[] = ":/core/images/minus.png";
+const char ICON_PLUS[] = ":/core/images/plus.png";
+const char ICON_NEWFILE[] = ":/core/images/filenew.png";
+const char ICON_OPENFILE[] = ":/core/images/fileopen.png";
+const char ICON_SAVEFILE[] = ":/core/images/filesave.png";
+const char ICON_UNDO[] = ":/core/images/undo.png";
+const char ICON_REDO[] = ":/core/images/redo.png";
+const char ICON_COPY[] = ":/core/images/editcopy.png";
+const char ICON_PASTE[] = ":/core/images/editpaste.png";
+const char ICON_CUT[] = ":/core/images/editcut.png";
+const char ICON_NEXT[] = ":/core/images/next.png";
+const char ICON_PREV[] = ":/core/images/prev.png";
+const char ICON_DIR[] = ":/core/images/dir.png";
+const char ICON_CLEAN_PANE[] = ":/core/images/clean_pane_small.png";
+const char ICON_CLEAR[] = ":/core/images/clear.png";
+const char ICON_RESET[] = ":/core/images/reset.png";
+const char ICON_MAGNIFIER[] = ":/core/images/magnifier.png";
+const char ICON_TOGGLE_SIDEBAR[] = ":/core/images/sidebaricon.png";
+const char ICON_CLOSE[] = ":/core/images/closebutton.png";
+const char ICON_CLOSE_DARK[] = ":/core/images/darkclosebutton.png";
+const char ICON_SPLIT_HORIZONTAL[] = ":/core/images/splitbutton_horizontal.png";
+const char ICON_FILTER[] = ":/core/images/filtericon.png";
+const char ICON_LINK[] = ":/core/images/linkicon.png";
+const char ICON_QTLOGO_32[] = ":/core/images/logo/32/qtcreator.png";
+const char ICON_QTLOGO_128[] = ":/core/images/logo/128/qtcreator.png";
+
+const char WIZARD_CATEGORY_QT[] = "R.Qt";
+const char WIZARD_TR_CATEGORY_QT[] = QT_TRANSLATE_NOOP("Core", "Qt");
+
+const char SETTINGS_CATEGORY_CORE[] = "A.Core";
+const char SETTINGS_CATEGORY_CORE_ICON[] = ":/core/images/category_core.png";
+const char SETTINGS_TR_CATEGORY_CORE[] = QT_TRANSLATE_NOOP("Core", "Environment");
+const char SETTINGS_ID_ENVIRONMENT[] = "A.General";
+const char SETTINGS_ID_SHORTCUTS[] = "B.Keyboard";
+const char SETTINGS_ID_TOOLS[] = "C.ExternalTools";
+const char SETTINGS_ID_MIMETYPES[] = "D.MimeTypes";
+
+const char SETTINGS_DEFAULTTEXTENCODING[] = "General/DefaultFileEncoding";
+
+const char ALL_FILES_FILTER[] = QT_TRANSLATE_NOOP("Core", "All Files (*)");
+
+const char VARIABLE_SUPPORT_PROPERTY[] = "QtCreator.VariableSupport";
+
+const char TR_CLEAR_MENU[] = QT_TRANSLATE_NOOP("Core", "Clear Menu");
const int TARGET_ICON_SIZE = 32;