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

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

@@ -33,7 +33,7 @@
#include "mainwindow.h"
#include "actioncontainer.h"
#include "actionmanager.h"
#include "actionmanager_p.h"
#include "basemode.h"
#include "coreimpl.h"
#include "coreconstants.h"
@@ -115,7 +115,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 ActionManager(this, m_uniqueIDManager)),
m_actionManager(new ActionManagerPrivate(this, m_uniqueIDManager)),
m_editorManager(0),
m_fileManager(new FileManager(m_coreImpl, this)),
m_progressManager(new ProgressManager()),
@@ -362,9 +362,9 @@ QStatusBar *MainWindow::statusBar() const
void MainWindow::registerDefaultContainers()
{
ActionManager *am = m_actionManager;
ActionManagerPrivate *am = m_actionManager;
IActionContainer *menubar = m_actionManager->createMenuBar(Constants::MENU_BAR);
IActionContainer *menubar = am->createMenuBar(Constants::MENU_BAR);
#ifndef Q_WS_MAC // System menu bar on Mac
setMenuBar(menubar->menuBar());
@@ -427,7 +427,7 @@ void MainWindow::registerDefaultContainers()
ac->appendGroup(Constants::G_HELP_ABOUT, true);
}
static ICommand *createSeparator(ActionManager *am, QObject *parent,
static ICommand *createSeparator(ActionManagerPrivate *am, QObject *parent,
const QString &name,
const QList<int> &context)
{
@@ -439,7 +439,7 @@ static ICommand *createSeparator(ActionManager *am, QObject *parent,
void MainWindow::registerDefaultActions()
{
ActionManager *am = m_actionManager;
ActionManagerPrivate *am = m_actionManager;
IActionContainer *mfile = am->actionContainer(Constants::M_FILE);
IActionContainer *medit = am->actionContainer(Constants::M_EDIT);
IActionContainer *mtools = am->actionContainer(Constants::M_TOOLS);