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

Don't clash signal names with other methods

Browse Source 
Amends d2e1feceac

Change-Id: Icbd1179b29a9284d4dd64d3e4609a701a0708510
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2020-12-08 11:11:36 +01:00
parent b5c820d76d
commit c714cfa714
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/shared/help/bookmarkmanager.cpp
View File

@@ -353,7 +353,7 @@ void BookmarkWidget::activated(const QModelIndex &index)
emit linkActivated(data); emit linkActivated(data);
} }
void BookmarkWidget::customContextMenuRequested(const QPoint &point) void BookmarkWidget::showContextMenu(const QPoint &point)
{ {
QModelIndex index = treeView->indexAt(point); QModelIndex index = treeView->indexAt(point);
if (!index.isValid()) if (!index.isValid())
@@ -449,7 +449,7 @@ void BookmarkWidget::setup()
connect(treeView, &TreeView::collapsed, this, &BookmarkWidget::expand); connect(treeView, &TreeView::collapsed, this, &BookmarkWidget::expand);
connect(treeView, &TreeView::activated, this, &BookmarkWidget::activated); connect(treeView, &TreeView::activated, this, &BookmarkWidget::activated);
connect(treeView, &TreeView::customContextMenuRequested, connect(treeView, &TreeView::customContextMenuRequested,
this, &BookmarkWidget::customContextMenuRequested); this, &BookmarkWidget::showContextMenu);
filterBookmarkModel->setFilterKeyColumn(0); filterBookmarkModel->setFilterKeyColumn(0);
filterBookmarkModel->setDynamicSortFilter(true); filterBookmarkModel->setDynamicSortFilter(true);

2
src/shared/help/bookmarkmanager.h
View File

@@ -117,7 +117,7 @@ private:
void filterChanged(); void filterChanged();
void expand(const QModelIndex& index); void expand(const QModelIndex& index);
void activated(const QModelIndex &index); void activated(const QModelIndex &index);
void customContextMenuRequested(const QPoint &point); void showContextMenu(const QPoint &point);
void setup(); void setup();
void expandItems(); void expandItems();
bool eventFilter(QObject *object, QEvent *event) override; bool eventFilter(QObject *object, QEvent *event) override;