Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
c9889120
Commit
c9889120
authored
Jan 13, 2009
by
con
Browse files
Fixes: - Rename ActionManagerInterface --> ActionManager
Details: - To make it conform to naming convention.
parent
2562b09f
Changes
50
Hide whitespace changes
Inline
Side-by-side
src/plugins/bineditor/bineditorplugin.cpp
View file @
c9889120
...
...
@@ -46,7 +46,7 @@
#include
<coreplugin/coreconstants.h>
#include
<coreplugin/mimedatabase.h>
#include
<coreplugin/uniqueidmanager.h>
#include
<coreplugin/actionmanager/actionmanager
interface
.h>
#include
<coreplugin/actionmanager/actionmanager.h>
#include
<coreplugin/editormanager/editormanager.h>
#include
<texteditor/texteditorsettings.h>
#include
<texteditor/fontsettings.h>
...
...
src/plugins/bookmarks/bookmarksplugin.cpp
View file @
c9889120
...
...
@@ -42,7 +42,7 @@
#include
<coreplugin/editormanager/editormanager.h>
#include
<coreplugin/coreconstants.h>
#include
<coreplugin/uniqueidmanager.h>
#include
<coreplugin/actionmanager/actionmanager
interface
.h>
#include
<coreplugin/actionmanager/actionmanager.h>
#include
<QtCore/qplugin.h>
#include
<QtCore/QDebug>
...
...
@@ -68,7 +68,7 @@ void BookmarksPlugin::extensionsInitialized()
bool
BookmarksPlugin
::
initialize
(
const
QStringList
&
/*arguments*/
,
QString
*
)
{
m_core
=
ExtensionSystem
::
PluginManager
::
instance
()
->
getObject
<
Core
::
ICore
>
();
Core
::
ActionManager
Interface
*
am
=
m_core
->
actionManager
();
Core
::
ActionManager
*
am
=
m_core
->
actionManager
();
QList
<
int
>
context
=
QList
<
int
>
()
<<
m_core
->
uniqueIDManager
()
->
uniqueIdentifier
(
Constants
::
BOOKMARKS_CONTEXT
);
...
...
src/plugins/coreplugin/actionmanager/actionmanager.cpp
View file @
c9889120
...
...
@@ -52,15 +52,15 @@ namespace {
}
/*!
\class Core::ActionManager
Interface
\class Core::ActionManager
\mainclass
\ingroup qwb
\inheaderfile actionmanager
interface
.h
\inheaderfile actionmanager.h
\brief All actions should be registered in the ActionManager, since this enables the user to
e.g. change their shortcuts at a central place.
The ActionManager
Interface
is the central bookkeeper of actions and their shortcuts and layout.
The ActionManager is the central bookkeeper of actions and their shortcuts and layout.
You get the only implementation of this class from the core interface (ICore::actionManager()).
The main reasons for the need of this class is to provide a central place where the user
...
...
@@ -94,52 +94,52 @@ namespace {
*/
/*!
\fn virtual IActionContainer *ActionManager
Interface
::createMenu(const QString &id) = 0
\fn virtual IActionContainer *ActionManager::createMenu(const QString &id) = 0
...
*/
/*!
\fn virtual IActionContainer *ActionManager
Interface
::createMenuBar(const QString &id) = 0
\fn virtual IActionContainer *ActionManager::createMenuBar(const QString &id) = 0
...
*/
/*!
\fn virtual ICommand *ActionManager
Interface
::registerAction(QAction *action, const QString &id, const QList<int> &context) = 0
\fn virtual ICommand *ActionManager::registerAction(QAction *action, const QString &id, const QList<int> &context) = 0
...
*/
/*!
\fn virtual ICommand *ActionManager
Interface
::registerShortcut(QShortcut *shortcut, const QString &id, const QList<int> &context) = 0
\fn virtual ICommand *ActionManager::registerShortcut(QShortcut *shortcut, const QString &id, const QList<int> &context) = 0
...
*/
/*!
\fn virtual ICommand *ActionManager
Interface
::registerAction(QAction *action, const QString &id) = 0
\fn virtual ICommand *ActionManager::registerAction(QAction *action, const QString &id) = 0
...
*/
/*!
\fn virtual void ActionManager
Interface
::addAction(ICommand *action, const QString &globalGroup) = 0
\fn virtual void ActionManager::addAction(ICommand *action, const QString &globalGroup) = 0
...
*/
/*!
\fn virtual void ActionManager
Interface
::addMenu(IActionContainer *menu, const QString &globalGroup) = 0
\fn virtual void ActionManager::addMenu(IActionContainer *menu, const QString &globalGroup) = 0
...
*/
/*!
\fn virtual ICommand *ActionManager
Interface
::command(const QString &id) const = 0
\fn virtual ICommand *ActionManager::command(const QString &id) const = 0
...
*/
/*!
\fn virtual IActionContainer *ActionManager
Interface
::actionContainer(const QString &id) const = 0
\fn virtual IActionContainer *ActionManager::actionContainer(const QString &id) const = 0
...
*/
/*!
\fn virtual ActionManager
Interface
::~ActionManager
Interface
()
\fn virtual ActionManager::~ActionManager()
...
*/
...
...
@@ -160,7 +160,7 @@ ActionManagerPrivate* ActionManagerPrivate::m_instance = 0;
...
*/
ActionManagerPrivate
::
ActionManagerPrivate
(
MainWindow
*
mainWnd
,
UniqueIDManager
*
uidmgr
)
:
ActionManager
Interface
(
mainWnd
),
ActionManager
(
mainWnd
),
m_mainWnd
(
mainWnd
)
{
m_defaultGroups
<<
uidmgr
->
uniqueIdentifier
(
Constants
::
G_DEFAULT_ONE
);
...
...
src/plugins/coreplugin/actionmanager/actionmanager
interface
.h
→
src/plugins/coreplugin/actionmanager/actionmanager.h
View file @
c9889120
...
...
@@ -31,8 +31,8 @@
**
***************************************************************************/
#ifndef ACTIONMANAGER
INTERFACE
_H
#define ACTIONMANAGER
INTERFACE
_H
#ifndef ACTIONMANAGER_H
#define ACTIONMANAGER_H
#include
"coreplugin/core_global.h"
...
...
@@ -50,12 +50,12 @@ QT_END_NAMESPACE
namespace
Core
{
class
CORE_EXPORT
ActionManager
Interface
:
public
QObject
class
CORE_EXPORT
ActionManager
:
public
QObject
{
Q_OBJECT
public:
ActionManager
Interface
(
QObject
*
parent
=
0
)
:
QObject
(
parent
)
{}
virtual
~
ActionManager
Interface
()
{}
ActionManager
(
QObject
*
parent
=
0
)
:
QObject
(
parent
)
{}
virtual
~
ActionManager
()
{}
virtual
IActionContainer
*
createMenu
(
const
QString
&
id
)
=
0
;
virtual
IActionContainer
*
createMenuBar
(
const
QString
&
id
)
=
0
;
...
...
@@ -74,4 +74,4 @@ public:
}
// namespace Core
#endif // ACTIONMANAGER
INTERFACE
_H
#endif // ACTIONMANAGER_H
src/plugins/coreplugin/actionmanager/actionmanager_p.h
View file @
c9889120
...
...
@@ -34,7 +34,7 @@
#ifndef ACTIONMANAGERPRIVATE_H
#define ACTIONMANAGERPRIVATE_H
#include
<coreplugin/actionmanager/actionmanager
interface
.h>
#include
<coreplugin/actionmanager/actionmanager.h>
#include
<QtCore/QMap>
#include
<QtCore/QHash>
...
...
@@ -60,7 +60,7 @@ class ActionContainer;
class
MainWindow
;
class
Command
;
class
ActionManagerPrivate
:
public
Core
::
ActionManager
Interface
class
ActionManagerPrivate
:
public
Core
::
ActionManager
{
Q_OBJECT
...
...
src/plugins/coreplugin/coreimpl.cpp
View file @
c9889120
...
...
@@ -64,7 +64,7 @@ void CoreImpl::showOptionsDialog(const QString &group, const QString &page)
m_mainwindow
->
showOptionsDialog
(
group
,
page
);
}
ActionManager
Interface
*
CoreImpl
::
actionManager
()
const
ActionManager
*
CoreImpl
::
actionManager
()
const
{
return
m_mainwindow
->
actionManager
();
}
...
...
src/plugins/coreplugin/coreimpl.h
View file @
c9889120
...
...
@@ -56,7 +56,7 @@ public:
void
showOptionsDialog
(
const
QString
&
group
=
QString
(),
const
QString
&
page
=
QString
());
ActionManager
Interface
*
actionManager
()
const
;
ActionManager
*
actionManager
()
const
;
FileManager
*
fileManager
()
const
;
UniqueIDManager
*
uniqueIDManager
()
const
;
MessageManager
*
messageManager
()
const
;
...
...
src/plugins/coreplugin/coreplugin.pro
View file @
c9889120
...
...
@@ -99,7 +99,7 @@ HEADERS += mainwindow.h \
editormanager
/
ieditor
.
h
\
editormanager
/
ieditorfactory
.
h
\
actionmanager
/
iactioncontainer
.
h
\
actionmanager
/
actionmanager
interface
.
h
\
actionmanager
/
actionmanager
.
h
\
actionmanager
/
icommand
.
h
\
actionmanager
/
actionmanager_p
.
h
\
actionmanager
/
command
.
h
\
...
...
src/plugins/coreplugin/editormanager/editormanager.cpp
View file @
c9889120
...
...
@@ -48,7 +48,7 @@
#include
<coreplugin/coreconstants.h>
#include
<coreplugin/modemanager.h>
#include
<coreplugin/uniqueidmanager.h>
#include
<coreplugin/actionmanager/actionmanager
interface
.h>
#include
<coreplugin/actionmanager/actionmanager.h>
#include
<coreplugin/editormanager/ieditorfactory.h>
#include
<coreplugin/baseview.h>
#include
<coreplugin/imode.h>
...
...
@@ -207,7 +207,7 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
const
QList
<
int
>
editManagerContext
=
QList
<
int
>
()
<<
m_d
->
m_core
->
uniqueIDManager
()
->
uniqueIdentifier
(
Constants
::
C_EDITORMANAGER
);
ActionManager
Interface
*
am
=
m_d
->
m_core
->
actionManager
();
ActionManager
*
am
=
m_d
->
m_core
->
actionManager
();
IActionContainer
*
mfile
=
am
->
actionContainer
(
Constants
::
M_FILE
);
//Revert to saved
...
...
src/plugins/coreplugin/editormanager/editorsplitter.cpp
View file @
c9889120
...
...
@@ -41,7 +41,7 @@
#include
<coreplugin/icore.h>
#include
<coreplugin/coreconstants.h>
#include
<coreplugin/uniqueidmanager.h>
#include
<coreplugin/actionmanager/actionmanager
interface
.h>
#include
<coreplugin/actionmanager/actionmanager.h>
#include
<utils/qtcassert.h>
...
...
@@ -72,7 +72,7 @@ void EditorSplitter::registerActions()
const
QList
<
int
>
editorManagerContext
=
QList
<
int
>
()
<<
m_core
->
uniqueIDManager
()
->
uniqueIdentifier
(
Constants
::
C_EDITORMANAGER
);
ActionManager
Interface
*
am
=
m_core
->
actionManager
();
ActionManager
*
am
=
m_core
->
actionManager
();
IActionContainer
*
mwindow
=
am
->
actionContainer
(
Constants
::
M_WINDOW
);
ICommand
*
cmd
;
...
...
src/plugins/coreplugin/icore.cpp
View file @
c9889120
...
...
@@ -51,7 +51,7 @@
*/
/*!
\fn ActionManager
Interface
*ICore::actionManager() const
\fn ActionManager *ICore::actionManager() const
\brief Returns the application's action manager.
The action manager is responsible for registration of menus and
...
...
src/plugins/coreplugin/icore.h
View file @
c9889120
...
...
@@ -50,7 +50,7 @@ QT_END_NAMESPACE
namespace
Core
{
// forward declarations
class
ActionManager
Interface
;
class
ActionManager
;
class
IFile
;
class
FileManager
;
class
MessageManager
;
...
...
@@ -81,7 +81,7 @@ public:
virtual
void
showOptionsDialog
(
const
QString
&
group
=
QString
(),
const
QString
&
page
=
QString
())
=
0
;
virtual
ActionManager
Interface
*
actionManager
()
const
=
0
;
virtual
ActionManager
*
actionManager
()
const
=
0
;
virtual
FileManager
*
fileManager
()
const
=
0
;
virtual
UniqueIDManager
*
uniqueIDManager
()
const
=
0
;
virtual
MessageManager
*
messageManager
()
const
=
0
;
...
...
src/plugins/coreplugin/mainwindow.cpp
View file @
c9889120
...
...
@@ -815,7 +815,7 @@ void MainWindow::openFileWith()
}
}
ActionManager
Interface
*
MainWindow
::
actionManager
()
const
ActionManager
*
MainWindow
::
actionManager
()
const
{
return
m_actionManager
;
}
...
...
src/plugins/coreplugin/mainwindow.h
View file @
c9889120
...
...
@@ -55,7 +55,7 @@ class PluginManager;
namespace
Core
{
class
ActionManager
Interface
;
class
ActionManager
;
class
BaseMode
;
class
BaseView
;
class
EditorManager
;
...
...
@@ -105,7 +105,7 @@ public:
//ICore
inline
ExtensionSystem
::
PluginManager
*
pluginManager
()
{
return
m_pluginManager
;
}
Core
::
ActionManager
Interface
*
actionManager
()
const
;
Core
::
ActionManager
*
actionManager
()
const
;
Core
::
FileManager
*
fileManager
()
const
;
Core
::
UniqueIDManager
*
uniqueIDManager
()
const
;
Core
::
MessageManager
*
messageManager
()
const
;
...
...
src/plugins/coreplugin/modemanager.cpp
View file @
c9889120
...
...
@@ -39,7 +39,7 @@
#include
<aggregation/aggregate.h>
#include
<coreplugin/actionmanager/actionmanager
interface
.h>
#include
<coreplugin/actionmanager/actionmanager.h>
#include
<coreplugin/actionmanager/icommand.h>
#include
<coreplugin/coreconstants.h>
#include
<coreplugin/coreimpl.h>
...
...
@@ -140,7 +140,7 @@ void ModeManager::objectAdded(QObject *obj)
m_modeStack
->
insertTab
(
index
,
mode
->
widget
(),
mode
->
icon
(),
mode
->
name
());
// Register mode shortcut
ActionManager
Interface
*
am
=
m_mainWindow
->
actionManager
();
ActionManager
*
am
=
m_mainWindow
->
actionManager
();
const
QString
shortcutId
=
QLatin1String
(
"QtCreator.Mode."
)
+
mode
->
uniqueModeName
();
QShortcut
*
shortcut
=
new
QShortcut
(
m_mainWindow
);
shortcut
->
setWhatsThis
(
tr
(
"Switch to %1 mode"
).
arg
(
mode
->
name
()));
...
...
src/plugins/coreplugin/navigationwidget.cpp
View file @
c9889120
...
...
@@ -38,7 +38,7 @@
#include
<coreplugin/inavigationwidgetfactory.h>
#include
<coreplugin/modemanager.h>
#include
<coreplugin/uniqueidmanager.h>
#include
<coreplugin/actionmanager/actionmanager
interface
.h>
#include
<coreplugin/actionmanager/actionmanager.h>
#include
<extensionsystem/ExtensionSystemInterfaces>
#include
<QtGui/QAction>
...
...
@@ -316,7 +316,7 @@ void NavigationWidget::objectAdded(QObject * obj)
return
;
Core
::
ICore
*
core
=
ExtensionSystem
::
PluginManager
::
instance
()
->
getObject
<
Core
::
ICore
>
();
Core
::
ActionManager
Interface
*
am
=
core
->
actionManager
();
Core
::
ActionManager
*
am
=
core
->
actionManager
();
QList
<
int
>
navicontext
=
QList
<
int
>
()
<<
core
->
uniqueIDManager
()
->
uniqueIdentifier
(
Core
::
Constants
::
C_NAVIGATION_PANE
);
...
...
src/plugins/coreplugin/outputpane.cpp
View file @
c9889120
...
...
@@ -37,7 +37,7 @@
#include
"mainwindow.h"
#include
"modemanager.h"
#include
<coreplugin/actionmanager/actionmanager
interface
.h>
#include
<coreplugin/actionmanager/actionmanager.h>
#include
<coreplugin/actionmanager/iactioncontainer.h>
#include
<coreplugin/editormanager/editormanager.h>
#include
<coreplugin/editormanager/editorgroup.h>
...
...
@@ -210,7 +210,7 @@ void OutputPane::init(ICore *core, ExtensionSystem::PluginManager *pm)
m_pluginManager
=
pm
;
m_core
=
core
;
ActionManager
Interface
*
am
=
m_core
->
actionManager
();
ActionManager
*
am
=
m_core
->
actionManager
();
IActionContainer
*
mwindow
=
am
->
actionContainer
(
Constants
::
M_WINDOW
);
// Window->Output Panes
...
...
src/plugins/coreplugin/sidebar.cpp
View file @
c9889120
...
...
@@ -35,7 +35,7 @@
#include
"imode.h"
#include
"modemanager.h"
#include
"actionmanager/actionmanager
interface
.h"
#include
"actionmanager/actionmanager.h"
#include
<QtCore/QDebug>
#include
<QtCore/QEvent>
...
...
src/plugins/coreplugin/viewmanager.cpp
View file @
c9889120
...
...
@@ -38,7 +38,7 @@
#include
"uniqueidmanager.h"
#include
"iview.h"
#include
<coreplugin/actionmanager/actionmanager
interface
.h>
#include
<coreplugin/actionmanager/actionmanager.h>
#include
<coreplugin/actionmanager/icommand.h>
#include
<extensionsystem/ExtensionSystemInterfaces>
#include
<aggregation/aggregate.h>
...
...
src/plugins/cpaster/cpasterplugin.cpp
View file @
c9889120
...
...
@@ -43,7 +43,7 @@
#include
<coreplugin/filemanager.h>
#include
<coreplugin/messagemanager.h>
#include
<coreplugin/uniqueidmanager.h>
#include
<coreplugin/actionmanager/actionmanager
interface
.h>
#include
<coreplugin/actionmanager/actionmanager.h>
#include
<coreplugin/editormanager/editormanager.h>
#include
<texteditor/itexteditor.h>
#include
<coreplugin/messageoutputwindow.h>
...
...
@@ -95,7 +95,7 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *error_m
addObject
(
m_settingsPage
);
//register actions
Core
::
ActionManager
Interface
*
actionManager
=
gCoreInstance
->
actionManager
();
Core
::
ActionManager
*
actionManager
=
gCoreInstance
->
actionManager
();
Core
::
IActionContainer
*
toolsContainer
=
actionManager
->
actionContainer
(
Core
::
Constants
::
M_TOOLS
);
...
...
Prev
1
2
3
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment