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

TextEditor: Pass menuGroup as Core::Id around, not as char *.

Browse Source 
Will be used as that in the end, we can be clear about
its true nature.

Change-Id: I8928678eba12ecdbd32c291f3c02c5c89700ff76
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
hjk
2015-06-25 12:52:16 +02:00
parent adf4ab29f2
commit 9c8eeaccd0
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/texteditor/texteditoractionhandler.cpp
View File

@@ -63,7 +63,7 @@ public:
uint optionalActions);
QAction *registerActionHelper(Core::Id id, bool scriptable, const QString &title,
const QKeySequence &keySequence, const char *menueGroup,
const QKeySequence &keySequence, Core::Id menueGroup,
Core::ActionContainer *container,
std::function<void(bool)> slot)
{
@@ -72,7 +72,7 @@ public:
if (!keySequence.isEmpty())
command->setDefaultKeySequence(keySequence);
if (container && menueGroup)
if (container && menueGroup.isValid())
container->addAction(command, menueGroup);
connect(result, &QAction::triggered, slot);
@@ -84,7 +84,7 @@ public:
bool scriptable = false,
const QString &title = QString(),
const QKeySequence &keySequence = QKeySequence(),
const char *menueGroup = 0,
Core::Id menueGroup = Core::Id(),
Core::ActionContainer *container = 0)
{
return registerActionHelper(id, scriptable, title, keySequence, menueGroup, container,
@@ -96,7 +96,7 @@ public:
bool scriptable = false,
const QString &title = QString(),
const QKeySequence &keySequence = QKeySequence(),
const char *menueGroup = 0,
Core::Id menueGroup = Core::Id(),
Core::ActionContainer *container = 0)
{
return registerActionHelper(id, scriptable, title, keySequence, menueGroup, container,
@@ -108,7 +108,7 @@ public:
bool scriptable = false,
const QString &title = QString(),
const QKeySequence &keySequence = QKeySequence(),
const char *menueGroup = 0,
Core::Id menueGroup = Core::Id(),
Core::ActionContainer *container = 0)
{
return registerActionHelper(id, scriptable, title, keySequence, menueGroup, container,