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

Merge remote-tracking branch 'origin/2.8'

Browse Source
This commit is contained in:
Eike Ziller
2013-05-27 17:21:01 +02:00
parent 1c34b266fb 5b648d8b6e
commit d08ad0038d
217 changed files with 653 additions and 1148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/coreplugin/actionmanager/actioncontainer.cpp
View File

@@ -173,12 +173,12 @@ ActionContainer::OnAllDisabledBehavior ActionContainerPrivate::onAllDisabledBeha
return m_onAllDisabledBehavior;
}
void ActionContainerPrivate::appendGroup(const Id &groupId)
void ActionContainerPrivate::appendGroup(Id groupId)
{
m_groups.append(Group(groupId));
}
void ActionContainerPrivate::insertGroup(const Id &before, const Id &groupId)
void ActionContainerPrivate::insertGroup(Id before, Id groupId)
{
QList<Group>::iterator it = m_groups.begin();
while (it != m_groups.end()) {
@@ -190,7 +190,7 @@ void ActionContainerPrivate::insertGroup(const Id &before, const Id &groupId)
}
}
QList<Group>::const_iterator ActionContainerPrivate::findGroup(const Id &groupId) const
QList<Group>::const_iterator ActionContainerPrivate::findGroup(Id groupId) const
{
QList<Group>::const_iterator it = m_groups.constBegin();
while (it != m_groups.constEnd()) {
@@ -202,7 +202,7 @@ QList<Group>::const_iterator ActionContainerPrivate::findGroup(const Id &groupId
}
QAction *ActionContainerPrivate::insertLocation(const Id &groupId) const
QAction *ActionContainerPrivate::insertLocation(Id groupId) const
{
QList<Group>::const_iterator it = findGroup(groupId);
QTC_ASSERT(it != m_groups.constEnd(), return 0);
@@ -230,7 +230,7 @@ QAction *ActionContainerPrivate::insertLocation(QList<Group>::const_iterator gro
return 0;
}
void ActionContainerPrivate::addAction(Command *command, const Id &groupId)
void ActionContainerPrivate::addAction(Command *command, Id groupId)
{
if (!canAddAction(command))
return;
@@ -248,7 +248,7 @@ void ActionContainerPrivate::addAction(Command *command, const Id &groupId)
scheduleUpdate();
}
void ActionContainerPrivate::addMenu(ActionContainer *menu, const Id &groupId)
void ActionContainerPrivate::addMenu(ActionContainer *menu, Id groupId)
{
ActionContainerPrivate *containerPrivate = static_cast<ActionContainerPrivate *>(menu);
if (!containerPrivate->canBeAddedToMenu())
@@ -266,7 +266,7 @@ void ActionContainerPrivate::addMenu(ActionContainer *menu, const Id &groupId)
scheduleUpdate();
}
void ActionContainerPrivate::addMenu(ActionContainer *before, ActionContainer *menu, const Id &groupId)
void ActionContainerPrivate::addMenu(ActionContainer *before, ActionContainer *menu, Id groupId)
{
ActionContainerPrivate *containerPrivate = static_cast<ActionContainerPrivate *>(menu);
if (!containerPrivate->canBeAddedToMenu())
@@ -293,7 +293,7 @@ void ActionContainerPrivate::addMenu(ActionContainer *before, ActionContainer *m
/*! \a context \a group \a outSeparator
* \internal
*/
Command *ActionContainerPrivate::addSeparator(const Context &context, const Id &group, QAction **outSeparator)
Command *ActionContainerPrivate::addSeparator(const Context &context, Id group, QAction **outSeparator)
{
static int separatorIdCount = 0;
QAction *separator = new QAction(this);