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

Fixes: - Rename ActionManager --> ActionManagerPrivate

Browse Source 
Details:  - Step one, step two is ActionManagerInterface -->
ActionManager because it conflicts with our naming conventions
This commit is contained in:
con
2009-01-13 13:07:29 +01:00
parent e2b9db7bd8
commit 2562b09f5b
12 changed files with 63 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,8 @@
***************************************************************************/
#include "actioncontainer.h"
#include "actionmanager_p.h"
#include "command.h"
#include "coreimpl.h"
@@ -181,7 +183,7 @@ void ActionContainer::appendGroup(const QString &group, bool global)
int gid = idmanager->uniqueIdentifier(group);
m_groups << gid;
if (global)
ActionManager::instance()->registerGlobalGroup(gid, m_id);
ActionManagerPrivate::instance()->registerGlobalGroup(gid, m_id);
}
/*!
@@ -220,7 +222,7 @@ void ActionContainer::addAction(ICommand *action, const QString &group)
if (!canAddAction(action))
return;
ActionManager *am = ActionManager::instance();
ActionManagerPrivate *am = ActionManagerPrivate::instance();
Action *a = static_cast<Action *>(action);
if (a->stateFlags() & Command::CS_PreLocation) {
QList<CommandLocation> locs = a->locations();
@@ -251,7 +253,7 @@ void ActionContainer::addMenu(IActionContainer *menu, const QString &group)
if (!canAddMenu(menu))
return;
ActionManager *am = ActionManager::instance();
ActionManagerPrivate *am = ActionManagerPrivate::instance();
MenuActionContainer *mc = static_cast<MenuActionContainer *>(menu);
if (mc->hasState(ActionContainer::CS_PreLocation)) {
CommandLocation loc = mc->location();
@@ -396,7 +398,7 @@ void ActionContainer::addMenu(IActionContainer *menu, int pos, bool setpos)
*/
QAction *ActionContainer::beforeAction(int pos, int *prevKey) const
{
ActionManager *am = ActionManager::instance();
ActionManagerPrivate *am = ActionManagerPrivate::instance();
int baId = -1;