Skip to content
Permalink
Browse files

Fix channel filtering not working.

Channel filtering broke for windows Snapshots delivered with Qt 5
due to a signature change on the QAbstractView::dataChanged function
overridden in UserView to implement the channel filtering functionality.
See http://qt-project.org/doc/qt-5/sourcebreaks.html#changes-to-qt-widgets .

Fixes #1328 .
  • Loading branch information...
hacst committed Aug 18, 2014
1 parent 34daf71 commit b5d375835b75b97b94390b5c33e3f2546d66978a
Showing with 11 additions and 2 deletions.
  1. +5 −1 src/mumble/UserView.cpp
  2. +6 −1 src/mumble/UserView.h
@@ -385,7 +385,11 @@ void UserView::updateChannel(const QModelIndex &idx) {
}
}

void UserView::dataChanged ( const QModelIndex & topLeft, const QModelIndex & bottomRight )
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
void UserView::dataChanged ( const QModelIndex & topLeft, const QModelIndex & bottomRight, const QVector<int> &)
#else
void UserView::dataChanged ( const QModelIndex & topLeft, const QModelIndex & bottomRight)
#endif
{
UserModel *um = static_cast<UserModel *>(model());
int nRowCount = um->rowCount();
@@ -77,10 +77,15 @@ class UserView : public QTreeView {
public:
UserView(QWidget *);
void keyboardSearch(const QString &search);
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
void dataChanged(const QModelIndex & topLeft, const QModelIndex & bottomRight, const QVector<int> & roles = QVector<int> ());
#else
void dataChanged(const QModelIndex & topLeft, const QModelIndex & bottomRight);
#endif

public slots:
void nodeActivated(const QModelIndex &idx);
void selectSearchResult();
void dataChanged(const QModelIndex & topLeft, const QModelIndex & bottomRight);
void updateChannel(const QModelIndex &index);
};

0 comments on commit b5d3758

Please sign in to comment.
You can’t perform that action at this time.