Core::Context: fix documentation, remove an unused variable

3 files changed, 4 insertions, 5 deletions

diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
index 990dfda360..a7e0d8571e 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 363d886b2c..192845b456 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 3053aba12e..7a56092b2f 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;