From b50ba6a27156045bba3a0107fc40e7385ca163b8 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Tue, 29 Jun 2010 08:13:28 +0200
Subject: [PATCH] Core::Context: fix documentation, remove an unused variable
---
src/plugins/coreplugin/actionmanager/actionmanager.cpp | 4 ++--
src/plugins/coreplugin/icore.cpp | 4 ++--
src/plugins/cppeditor/cppeditor.h | 1 -
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
index 990dfda3601..a7e0d8571e3 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
@@ -161,7 +161,7 @@ namespace {
*/
/*!
- \fn Command *ActionManager::registerAction(QAction *action, const QString &id, const QList<int> &context)
+ \fn Command *ActionManager::registerAction(QAction *action, const QString &id, const Core::Context &context)
\brief Makes an \a action known to the system under the specified string \a id.
Returns a command object that represents the action in the application and is
@@ -172,7 +172,7 @@ namespace {
*/
/*!
- \fn Command *ActionManager::registerShortcut(QShortcut *shortcut, const QString &id, const QList<int> &context)
+ \fn Command *ActionManager::registerShortcut(QShortcut *shortcut, const QString &id, const Core::Context &context)
\brief Makes a \a shortcut known to the system under the specified string \a id.
Returns a command object that represents the shortcut in the application and is
diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp
index 363d886b2ca..192845b456b 100644
--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
@@ -249,7 +249,7 @@
*/
/*!
- \fn void ICore::updateAdditionalContexts(const QList<int> &remove, const QList<int> &add)
+ \fn void ICore::updateAdditionalContexts(const Core::Context &remove, const Core::Context &add)
\brief Change the currently active additional contexts.
Removes the list of additional contexts specified by \a remove and adds the
@@ -340,7 +340,7 @@
*/
/*!
- \fn void ICore::contextChanged(Core::IContext *context, const QList<int> &additionalContexts)
+ \fn void ICore::contextChanged(Core::IContext *context, const Core::Context &additionalContexts)
\brief Sent just after a new \a context became the current context
(meaning that its widget got focus), or if the additional context ids changed.
*/
diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h
index 3053aba12eb..7a56092b2fa 100644
--- a/src/plugins/cppeditor/cppeditor.h
+++ b/src/plugins/cppeditor/cppeditor.h
@@ -292,7 +292,6 @@ private:
CppTools::CppModelManagerInterface *m_modelManager;
- QList<int> m_contexts;
QComboBox *m_methodCombo;
CPlusPlus::OverviewModel *m_overviewModel;
QSortFilterProxyModel *m_proxyModel;
--
GitLab