Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
Code Releases Activity

Bookmarks: Fix bookmarksSelected signal

Browse Source 
Regression from recent commits
This commit is contained in:
David Rosca 2015-08-31 22:26:13 +02:00
parent 5b161b74be
commit 50b9dd9023
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/bookmarks/bookmarkstreeview.cpp
View File

@ -41,9 +41,8 @@ BookmarksTreeView::BookmarksTreeView(QWidget* parent)
setItemDelegate(new BookmarksItemDelegate(this)); setItemDelegate(new BookmarksItemDelegate(this));
header()->resizeSections(QHeaderView::ResizeToContents); header()->resizeSections(QHeaderView::ResizeToContents);
connect(this, SIGNAL(expanded(QModelIndex)), this, SLOT(indexExpanded(QModelIndex))); connect(this, &QTreeView::expanded, this, &BookmarksTreeView::indexExpanded);
connect(this, SIGNAL(collapsed(QModelIndex)), this, SLOT(indexCollapsed(QModelIndex))); connect(this, &QTreeView::collapsed, this, &BookmarksTreeView::indexCollapsed);
connect(this, SIGNAL(slotSelectionChanged(QItemSelection,QItemSelection)), this, SLOT(slotSelectionChanged()));
} }
BookmarksTreeView::ViewType BookmarksTreeView::viewType() const BookmarksTreeView::ViewType BookmarksTreeView::viewType() const
@ -151,11 +150,6 @@ void BookmarksTreeView::indexCollapsed(const QModelIndex &parent)
} }
} }
void BookmarksTreeView::slotSelectionChanged()
{
emit bookmarksSelected(selectedBookmarks());
}
void BookmarksTreeView::restoreExpandedState(const QModelIndex &parent) void BookmarksTreeView::restoreExpandedState(const QModelIndex &parent)
{ {
for (int i = 0; i < m_filter->rowCount(parent); ++i) { for (int i = 0; i < m_filter->rowCount(parent); ++i) {
@ -172,6 +166,14 @@ void BookmarksTreeView::rowsInserted(const QModelIndex &parent, int start, int e
QTreeView::rowsInserted(parent, start, end); QTreeView::rowsInserted(parent, start, end);
} }
void BookmarksTreeView::selectionChanged(const QItemSelection &selected, const QItemSelection &deselected)
{
Q_UNUSED(selected)
Q_UNUSED(deselected)
emit bookmarksSelected(selectedBookmarks());
}
void BookmarksTreeView::contextMenuEvent(QContextMenuEvent* event) void BookmarksTreeView::contextMenuEvent(QContextMenuEvent* event)
{ {
emit contextMenuRequested(viewport()->mapToGlobal(event->pos())); emit contextMenuRequested(viewport()->mapToGlobal(event->pos()));

3
src/lib/bookmarks/bookmarkstreeview.h
View File

@ -70,11 +70,10 @@ private slots:
void indexExpanded(const QModelIndex &parent); void indexExpanded(const QModelIndex &parent);
void indexCollapsed(const QModelIndex &parent); void indexCollapsed(const QModelIndex &parent);
void slotSelectionChanged();
private: private:
void restoreExpandedState(const QModelIndex &parent); void restoreExpandedState(const QModelIndex &parent);
void rowsInserted(const QModelIndex &parent, int start, int end); void rowsInserted(const QModelIndex &parent, int start, int end);
void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
void contextMenuEvent(QContextMenuEvent* event); void contextMenuEvent(QContextMenuEvent* event);
void mouseMoveEvent(QMouseEvent* event); void mouseMoveEvent(QMouseEvent* event);