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

Let ModeManager::addAction take a QAction instead of Command

Browse Source 
There was no reason, and using QAction is more flexible.
This commit is contained in:
con
2011-01-12 14:21:12 +01:00
parent e7ad89ffd8
commit 8bf142fbc3
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/coreplugin/modemanager.cpp
View File

@@ -71,7 +71,7 @@ struct ModeManagerPrivate
Internal::MainWindow *m_mainWindow; Internal::MainWindow *m_mainWindow;
Internal::FancyTabWidget *m_modeStack; Internal::FancyTabWidget *m_modeStack;
Internal::FancyActionBar *m_actionBar; Internal::FancyActionBar *m_actionBar;
QMap<Command*, int> m_actions; QMap<QAction*, int> m_actions;
QVector<IMode*> m_modes; QVector<IMode*> m_modes;
QVector<Command*> m_modeShortcuts; QVector<Command*> m_modeShortcuts;
QSignalMapper *m_signalMapper; QSignalMapper *m_signalMapper;
@@ -269,9 +269,9 @@ void ModeManager::aboutToRemoveObject(QObject *obj)
d->m_mainWindow->removeContextObject(mode); d->m_mainWindow->removeContextObject(mode);
} }
void ModeManager::addAction(Command *command, int priority) void ModeManager::addAction(QAction *action, int priority)
{ {
d->m_actions.insert(command, priority); d->m_actions.insert(action, priority);
// Count the number of commands with a higher priority // Count the number of commands with a higher priority
int index = 0; int index = 0;
@@ -280,7 +280,7 @@ void ModeManager::addAction(Command *command, int priority)
++index; ++index;
} }
d->m_actionBar->insertAction(index, command->action()); d->m_actionBar->insertAction(index, action);
} }
void ModeManager::addProjectSelector(QAction *action) void ModeManager::addProjectSelector(QAction *action)

4
src/plugins/coreplugin/modemanager.h
View File

@@ -43,8 +43,8 @@ QT_END_NAMESPACE
namespace Core { namespace Core {
class Command;
class IMode; class IMode;
namespace Internal { namespace Internal {
class MainWindow; class MainWindow;
class FancyTabWidget; class FancyTabWidget;
@@ -66,7 +66,7 @@ public:
IMode* currentMode() const; IMode* currentMode() const;
IMode* mode(const QString &id) const; IMode* mode(const QString &id) const;
void addAction(Command *command, int priority); void addAction(QAction *action, int priority);
void addProjectSelector(QAction *action); void addProjectSelector(QAction *action);
void addWidget(QWidget *widget); void addWidget(QWidget *widget);

2
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -2836,7 +2836,7 @@ void DebuggerPluginPrivate::extensionsInitialized()
cmd->setDefaultText(tr("Start Debugging")); cmd->setDefaultText(tr("Start Debugging"));
cmd->setDefaultKeySequence(QKeySequence(Constants::DEBUG_KEY)); cmd->setDefaultKeySequence(QKeySequence(Constants::DEBUG_KEY));
mstart->addAction(cmd, Core::Constants::G_DEFAULT_ONE); mstart->addAction(cmd, Core::Constants::G_DEFAULT_ONE);
Core::ICore::instance()->modeManager()->addAction(cmd, Constants::P_ACTION_DEBUG); Core::ICore::instance()->modeManager()->addAction(cmd->action(), Constants::P_ACTION_DEBUG);
cmd = am->registerAction(m_actions.continueAction, cmd = am->registerAction(m_actions.continueAction,
Constants::DEBUG, m_continuableContext); Constants::DEBUG, m_continuableContext);

4
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -582,7 +582,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
mbuild->addAction(cmd, Constants::G_BUILD_SESSION); mbuild->addAction(cmd, Constants::G_BUILD_SESSION);
msessionContextMenu->addAction(cmd, Constants::G_SESSION_BUILD); msessionContextMenu->addAction(cmd, Constants::G_SESSION_BUILD);
// Add to mode bar // Add to mode bar
modeManager->addAction(cmd, Constants::P_ACTION_BUILDSESSION); modeManager->addAction(cmd->action(), Constants::P_ACTION_BUILDSESSION);
// rebuild session action // rebuild session action
QIcon rebuildIcon(Constants::ICON_REBUILD); QIcon rebuildIcon(Constants::ICON_REBUILD);
@@ -705,7 +705,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+R"))); cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+R")));
mbuild->addAction(cmd, Constants::G_BUILD_RUN); mbuild->addAction(cmd, Constants::G_BUILD_RUN);
modeManager->addAction(cmd, Constants::P_ACTION_RUN); modeManager->addAction(cmd->action(), Constants::P_ACTION_RUN);
d->m_runActionContextMenu = new QAction(runIcon, tr("Run"), this); d->m_runActionContextMenu = new QAction(runIcon, tr("Run"), this);
cmd = am->registerAction(d->m_runActionContextMenu, Constants::RUNCONTEXTMENU, projecTreeContext); cmd = am->registerAction(d->m_runActionContextMenu, Constants::RUNCONTEXTMENU, projecTreeContext);

2
src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp
View File

@@ -99,7 +99,7 @@ MaemoQemuManager::MaemoQemuManager(QObject *parent)
qemuCommand->setAttribute(Core::Command::CA_UpdateIcon); qemuCommand->setAttribute(Core::Command::CA_UpdateIcon);
Core::ModeManager *modeManager = core->modeManager(); Core::ModeManager *modeManager = core->modeManager();
modeManager->addAction(qemuCommand, 1); modeManager->addAction(qemuCommand->action(), 1);
// listen to qt version changes to update the start button // listen to qt version changes to update the start button
connect(QtVersionManager::instance(), SIGNAL(qtVersionsChanged(QList<int>)), connect(QtVersionManager::instance(), SIGNAL(qtVersionsChanged(QList<int>)),