feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core: Use Id in Context instead of plain int.

Browse Source 
Change-Id: Iaa8e48459fb19b7d3b8821d0374925d0c6a7e0cc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
hjk
2013-01-11 13:34:31 +01:00
parent fd1302995c
commit 3475d55fd9
8 changed files with 42 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -1206,21 +1206,21 @@ void MainWindow::writeSettings()
void MainWindow::updateAdditionalContexts(const Context &remove, const Context &add)
{
foreach (const int context, remove) {
if (context == 0)
foreach (const Id id, remove) {
if (!id.isValid())
continue;
int index = m_additionalContexts.indexOf(context);
int index = m_additionalContexts.indexOf(id);
if (index != -1)
m_additionalContexts.removeAt(index);
}
foreach (const int context, add) {
if (context == 0)
foreach (const Id id, add) {
if (!id.isValid())
continue;
if (!m_additionalContexts.contains(context))
m_additionalContexts.prepend(context);
if (!m_additionalContexts.contains(id))
m_additionalContexts.prepend(id);
}
updateContext();
@@ -1237,9 +1237,9 @@ void MainWindow::updateContext()
Context uniquecontexts;
for (int i = 0; i < contexts.size(); ++i) {
const int c = contexts.at(i);
if (!uniquecontexts.contains(c))
uniquecontexts.add(c);
const Id id = contexts.at(i);
if (!uniquecontexts.contains(id))
uniquecontexts.add(id);
}
m_actionManager->d->setContext(uniquecontexts);