diff options
author | hjk <hjk@qt.io> | 2020-06-19 10:14:47 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2020-06-19 09:32:55 +0000 |
commit | 3ec4afff0e75ad44a3cc812f8ec375771cae2942 (patch) | |
tree | e4c04f85e66d307bf6a60d5a4a60ce49c4ea82be /src/shared | |
parent | f9a5ad4d3cf85f93beb87f34e023e2be4acd7415 (diff) |
Remove uses QOverload<const QString &>::of(&QComboBox::currentIndexChanged)
Gone in Qt 6.
Task-number: QTCREATORBUG-24098
Change-Id: I7ab2dcb9b7c71a3b0d07f05162ef2752e02dc881
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/shared')
-rw-r--r-- | src/shared/help/bookmarkmanager.cpp | 9 | ||||
-rw-r--r-- | src/shared/help/bookmarkmanager.h | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/shared/help/bookmarkmanager.cpp b/src/shared/help/bookmarkmanager.cpp index 788bf6a714..54817c3e7a 100644 --- a/src/shared/help/bookmarkmanager.cpp +++ b/src/shared/help/bookmarkmanager.cpp @@ -95,8 +95,7 @@ BookmarkDialog::BookmarkDialog(BookmarkManager *manager, const QString &title, &QStandardItemModel::itemChanged, this, &BookmarkDialog::itemChanged); - connect(ui.bookmarkFolders, - QOverload<const QString &>::of(&QComboBox::currentIndexChanged), + connect(ui.bookmarkFolders, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &BookmarkDialog::selectBookmarkFolder); connect(ui.treeView, &TreeView::customContextMenuRequested, @@ -188,11 +187,9 @@ void BookmarkDialog::textChanged(const QString& string) ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!string.isEmpty()); } -void BookmarkDialog::selectBookmarkFolder(const QString &folderName) +void BookmarkDialog::selectBookmarkFolder(int index) { - if (folderName.isEmpty()) - return; - + const QString folderName = ui.bookmarkFolders->itemText(index); if (folderName == tr("Bookmarks")) { ui.treeView->clearSelection(); return; diff --git a/src/shared/help/bookmarkmanager.h b/src/shared/help/bookmarkmanager.h index 0339bbf315..885346df87 100644 --- a/src/shared/help/bookmarkmanager.h +++ b/src/shared/help/bookmarkmanager.h @@ -70,7 +70,7 @@ private: void toolButtonClicked(); void itemChanged(QStandardItem *item); void textChanged(const QString& string); - void selectBookmarkFolder(const QString &folderName); + void selectBookmarkFolder(int index); void customContextMenuRequested(const QPoint &point); void currentChanged(const QModelIndex& current); bool eventFilter(QObject *object, QEvent *e); |