diff options
author | hjk <qtc-committer@nokia.com> | 2009-01-26 13:03:38 +0100 |
---|---|---|
committer | hjk <qtc-committer@nokia.com> | 2009-01-26 13:03:38 +0100 |
commit | f31607b33d2e3c892c880c22d32c49fc04aa8719 (patch) | |
tree | 3c68f369cd571ef5252b54e84b4e5e16bf62c3e4 /src/plugins/coreplugin | |
parent | 1e6a62942a4da22572a65cfbb8b560344801e6e8 (diff) | |
download | qt-creator-f31607b33d2e3c892c880c22d32c49fc04aa8719.tar.gz |
Fixes: coreplugin: use UniqueIDManager more directly
Diffstat (limited to 'src/plugins/coreplugin')
-rw-r--r-- | src/plugins/coreplugin/actionmanager/actionmanager.cpp | 31 | ||||
-rw-r--r-- | src/plugins/coreplugin/actionmanager/actionmanager_p.h | 2 | ||||
-rw-r--r-- | src/plugins/coreplugin/mainwindow.cpp | 2 |
3 files changed, 18 insertions, 17 deletions
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp index b5a1e5cc0c..f3cf2f9c01 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp +++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp @@ -205,10 +205,11 @@ ActionManagerPrivate* ActionManagerPrivate::m_instance = 0; \internal */ -ActionManagerPrivate::ActionManagerPrivate(MainWindow *mainWnd, UniqueIDManager *uidmgr) : - ActionManager(mainWnd), +ActionManagerPrivate::ActionManagerPrivate(MainWindow *mainWnd) + : ActionManager(mainWnd), m_mainWnd(mainWnd) { + UniqueIDManager *uidmgr = UniqueIDManager::instance(); m_defaultGroups << uidmgr->uniqueIdentifier(Constants::G_DEFAULT_ONE); m_defaultGroups << uidmgr->uniqueIdentifier(Constants::G_DEFAULT_TWO); m_defaultGroups << uidmgr->uniqueIdentifier(Constants::G_DEFAULT_THREE); @@ -258,7 +259,7 @@ void ActionManagerPrivate::setContext(const QList<int> &context) it.value()->setCurrentContext(m_context); const IdContainerMap::const_iterator acend = m_idContainerMap.constEnd(); - for ( IdContainerMap::const_iterator it = m_idContainerMap.constBegin(); it != acend; ++it) + for (IdContainerMap::const_iterator it = m_idContainerMap.constBegin(); it != acend; ++it) it.value()->update(); } @@ -273,7 +274,7 @@ bool ActionManagerPrivate::hasContext(QList<int> context) const ActionContainer *ActionManagerPrivate::createMenu(const QString &id) { - const int uid = m_mainWnd->uniqueIDManager()->uniqueIdentifier(id); + const int uid = UniqueIDManager::instance()->uniqueIdentifier(id); const IdContainerMap::const_iterator it = m_idContainerMap.constFind(uid); if (it != m_idContainerMap.constEnd()) return it.value(); @@ -291,7 +292,7 @@ ActionContainer *ActionManagerPrivate::createMenu(const QString &id) ActionContainer *ActionManagerPrivate::createMenuBar(const QString &id) { - const int uid = m_mainWnd->uniqueIDManager()->uniqueIdentifier(id); + const int uid = UniqueIDManager::instance()->uniqueIdentifier(id); const IdContainerMap::const_iterator it = m_idContainerMap.constFind(uid); if (it != m_idContainerMap.constEnd()) return it.value(); @@ -320,7 +321,7 @@ Command *ActionManagerPrivate::registerAction(QAction *action, const QString &id Command *ActionManagerPrivate::registerOverridableAction(QAction *action, const QString &id, bool checkUnique) { OverrideableAction *a = 0; - const int uid = m_mainWnd->uniqueIDManager()->uniqueIdentifier(id); + const int uid = UniqueIDManager::instance()->uniqueIdentifier(id); if (CommandPrivate *c = m_idCmdMap.value(uid, 0)) { if (c->type() != Command::CT_OverridableAction) { qWarning() << "registerAction: id" << id << "is registered with a different command type."; @@ -366,7 +367,7 @@ Command *ActionManagerPrivate::registerOverridableAction(QAction *action, const Command *ActionManagerPrivate::registerShortcut(QShortcut *shortcut, const QString &id, const QList<int> &context) { Shortcut *sc = 0; - int uid = m_mainWnd->uniqueIDManager()->uniqueIdentifier(id); + int uid = UniqueIDManager::instance()->uniqueIdentifier(id); if (CommandPrivate *c = m_idCmdMap.value(uid, 0)) { if (c->type() != Command::CT_Shortcut) { qWarning() << "registerShortcut: id" << id << "is registered with a different command type."; @@ -402,7 +403,7 @@ Command *ActionManagerPrivate::registerShortcut(QShortcut *shortcut, const QStri Command *ActionManagerPrivate::command(const QString &id) const { - const int uid = m_mainWnd->uniqueIDManager()->uniqueIdentifier(id); + const int uid = UniqueIDManager::instance()->uniqueIdentifier(id); const IdCmdMap::const_iterator it = m_idCmdMap.constFind(uid); if (it == m_idCmdMap.constEnd()) { if (warnAboutFindFailures) @@ -414,9 +415,9 @@ Command *ActionManagerPrivate::command(const QString &id) const ActionContainer *ActionManagerPrivate::actionContainer(const QString &id) const { - const int uid = m_mainWnd->uniqueIDManager()->uniqueIdentifier(id); - const IdContainerMap::const_iterator it = m_idContainerMap.constFind(uid); - if ( it == m_idContainerMap.constEnd()) { + const int uid = UniqueIDManager::instance()->uniqueIdentifier(id); + const IdContainerMap::const_iterator it = m_idContainerMap.constFind(uid); + if (it == m_idContainerMap.constEnd()) { if (warnAboutFindFailures) qWarning() << "ActionManagerPrivate::actionContainer(): failed to find :" << id << '/' << uid; return 0; @@ -429,7 +430,7 @@ Command *ActionManagerPrivate::command(int uid) const const IdCmdMap::const_iterator it = m_idCmdMap.constFind(uid); if (it == m_idCmdMap.constEnd()) { if (warnAboutFindFailures) - qWarning() << "ActionManagerPrivate::command(): failed to find :" << m_mainWnd->uniqueIDManager()->stringForUniqueIdentifier(uid) << '/' << uid; + qWarning() << "ActionManagerPrivate::command(): failed to find :" << UniqueIDManager::instance()->stringForUniqueIdentifier(uid) << '/' << uid; return 0; } return it.value(); @@ -440,7 +441,7 @@ ActionContainer *ActionManagerPrivate::actionContainer(int uid) const const IdContainerMap::const_iterator it = m_idContainerMap.constFind(uid); if (it == m_idContainerMap.constEnd()) { if (warnAboutFindFailures) - qWarning() << "ActionManagerPrivate::actionContainer(): failed to find :" << m_mainWnd->uniqueIDManager()->stringForUniqueIdentifier(uid) << uid; + qWarning() << "ActionManagerPrivate::actionContainer(): failed to find :" << UniqueIDManager::instance()->stringForUniqueIdentifier(uid) << uid; return 0; } return it.value(); @@ -458,7 +459,7 @@ void ActionManagerPrivate::initialize() settings->setArrayIndex(i); const QString sid = settings->value(QLatin1String(idKey)).toString(); const QKeySequence key(settings->value(QLatin1String(sequenceKey)).toString()); - const int id = m_mainWnd->uniqueIDManager()->uniqueIdentifier(sid); + const int id = UniqueIDManager::instance()->uniqueIdentifier(sid); Command *cmd = command(id); if (cmd) @@ -478,7 +479,7 @@ void ActionManagerPrivate::saveSettings(QSettings *settings) CommandPrivate *cmd = j.value(); QKeySequence key = cmd->keySequence(); if (key != cmd->defaultKeySequence()) { - const QString sid = m_mainWnd->uniqueIDManager()->stringForUniqueIdentifier(id); + const QString sid = UniqueIDManager::instance()->stringForUniqueIdentifier(id); settings->setArrayIndex(count); settings->setValue(QLatin1String(idKey), sid); settings->setValue(QLatin1String(sequenceKey), key.toString()); diff --git a/src/plugins/coreplugin/actionmanager/actionmanager_p.h b/src/plugins/coreplugin/actionmanager/actionmanager_p.h index f1e106c4bf..658d3228cc 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager_p.h +++ b/src/plugins/coreplugin/actionmanager/actionmanager_p.h @@ -65,7 +65,7 @@ class ActionManagerPrivate : public Core::ActionManager Q_OBJECT public: - ActionManagerPrivate(MainWindow *mainWnd, UniqueIDManager *uidmgr); + explicit ActionManagerPrivate(MainWindow *mainWnd); ~ActionManagerPrivate(); void setContext(const QList<int> &context); diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index 68cea95694..800d5b4dfd 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -116,7 +116,7 @@ MainWindow::MainWindow() : m_additionalContexts(m_globalContext), m_settings(new QSettings(QSettings::IniFormat, QSettings::UserScope, QLatin1String("Nokia"), QLatin1String("QtCreator"), this)), m_printer(0), - m_actionManager(new ActionManagerPrivate(this, m_uniqueIDManager)), + m_actionManager(new ActionManagerPrivate(this)), m_editorManager(0), m_fileManager(new FileManager(this)), m_progressManager(new ProgressManagerPrivate()), |