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

BaseTextEditor: Make internally used function static

Browse Source 
Change-Id: I365e4c56b45dda205caa009e7733579d40bca9d0
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Eike Ziller
2014-01-13 15:37:18 +01:00
parent 2a2837a683
commit 4d99f6e9ad
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -4190,6 +4190,15 @@ void BaseTextEditorWidget::dragEnterEvent(QDragEnterEvent *e)
QPlainTextEdit::dragEnterEvent(e); QPlainTextEdit::dragEnterEvent(e);
} }
static void appendMenuActionsFromContext(QMenu *menu, const Core::Id menuContextId)
{
Core::ActionContainer *mcontext = Core::ActionManager::actionContainer(menuContextId);
QMenu *contextMenu = mcontext->menu();
foreach (QAction *action, contextMenu->actions())
menu->addAction(action);
}
void BaseTextEditorWidget::showDefaultContextMenu(QContextMenuEvent *e, const Core::Id menuContextId) void BaseTextEditorWidget::showDefaultContextMenu(QContextMenuEvent *e, const Core::Id menuContextId)
{ {
QMenu menu; QMenu menu;
@@ -6027,15 +6036,6 @@ QColor BaseTextEditorWidget::replacementPenColor(int blockNumber) const
return QColor(); return QColor();
} }
void BaseTextEditorWidget::appendMenuActionsFromContext(QMenu *menu, const Core::Id menuContextId)
{
Core::ActionContainer *mcontext = Core::ActionManager::actionContainer(menuContextId);
QMenu *contextMenu = mcontext->menu();
foreach (QAction *action, contextMenu->actions())
menu->addAction(action);
}
void BaseTextEditorWidget::appendStandardContextMenuActions(QMenu *menu) void BaseTextEditorWidget::appendStandardContextMenuActions(QMenu *menu)
{ {
menu->addSeparator(); menu->addSeparator();

1
src/plugins/texteditor/basetexteditor.h
View File

@@ -150,7 +150,6 @@ public:
void print(QPrinter *); void print(QPrinter *);
void appendMenuActionsFromContext(QMenu *menu, Core::Id menuContextId);
void appendStandardContextMenuActions(QMenu *menu); void appendStandardContextMenuActions(QMenu *menu);
// Works only in conjunction with a syntax highlighter that puts // Works only in conjunction with a syntax highlighter that puts