From edcb065edb74c40d6d3eed79d4b7260595039369 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 13 Jan 2012 09:36:30 +0100 Subject: [PATCH] Windows build fix. Change-Id: I4b7223e16eb727e9d98cc973eb64cb4f9feccdcc Reviewed-by: Friedemann Kleint --- src/plugins/coreplugin/actionmanager/command.cpp | 6 +++--- src/plugins/coreplugin/editormanager/editormanager.cpp | 2 +- src/plugins/remotelinux/remotelinuxplugin.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/coreplugin/actionmanager/command.cpp b/src/plugins/coreplugin/actionmanager/command.cpp index 73858baefec..8e09b09ffd6 100644 --- a/src/plugins/coreplugin/actionmanager/command.cpp +++ b/src/plugins/coreplugin/actionmanager/command.cpp @@ -118,7 +118,7 @@ */ /*! - \fn void Command::setDefaultText(const QString &text) + \fn void Command::setDescription(const QString &text) Set the \a text that is used to represent the Command in the keyboard shortcut settings dialog. If you don't set this, the current text from the user visible action is taken (which @@ -126,9 +126,9 @@ */ /*! - \fn QString Command::defaultText() const + \fn QString Command::description() const Returns the text that is used to present this Command to the user. - \sa setDefaultText() + \sa setDescription() */ /*! diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index 9a16dfc1bde..9a10447a9d9 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -346,7 +346,7 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) : QShortcut *sc = new QShortcut(parent); cmd = am->registerShortcut(sc, Constants::CLOSE_ALTERNATIVE, editManagerContext); cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+F4"))); - cmd->setDefaultText(EditorManager::tr("Close")); + cmd->setDescription(EditorManager::tr("Close")); connect(sc, SIGNAL(activated()), this, SLOT(closeEditor())); #endif diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp index 920a9f8c7c9..fe44f60ac46 100644 --- a/src/plugins/remotelinux/remotelinuxplugin.cpp +++ b/src/plugins/remotelinux/remotelinuxplugin.cpp @@ -110,13 +110,13 @@ void RemoteLinuxPlugin::extensionsInitialized() act = new QAction(tr("Start Remote Debug Server..."), 0); cmd = am->registerAction(act, "StartGdbServer", globalcontext); - cmd->setDefaultText(tr("Start Gdbserver")); + cmd->setDescription(tr("Start Gdbserver")); mstart->addAction(cmd, Debugger::Constants::G_MANUAL_REMOTE); connect(act, SIGNAL(triggered()), SLOT(startGdbServer())); act = new QAction(tr("Attach to Running Remote Process..."), 0); cmd = am->registerAction(act, "AttachRemoteProcess", globalcontext); - cmd->setDefaultText(tr("Attach to Remote Process")); + cmd->setDescription(tr("Attach to Remote Process")); mstart->addAction(cmd, Debugger::Constants::G_AUTOMATIC_REMOTE); connect(act, SIGNAL(triggered()), SLOT(startGdbServer())); */