Merge remote-tracking branch 'upstream/master' into v0.6-BugFixing_6

This commit is contained in:
csoler 2021-01-21 18:15:08 +01:00
commit 95fc1a56c8
9 changed files with 61 additions and 22 deletions

View file

@ -669,7 +669,6 @@ void GxsChannelPostsWidgetWithModel::download()
for(auto& file:post.mFiles)
{
std::list<RsPeerId> sources;
std::string destination;
// Add possible direct sources.
FileInfo fileInfo;
@ -1318,9 +1317,9 @@ void GxsChannelPostsWidgetWithModel::switchOnlyUnread(bool)
}
void GxsChannelPostsWidgetWithModel::filterChanged(QString s)
{
QStringList ql = s.split(' ',Qt::SkipEmptyParts);
uint32_t count;
mChannelPostsModel->setFilter(ql,ui->showUnread_TB->isChecked(),count);
QStringList ql = s.split(' ',QString::SkipEmptyParts);
uint32_t count;
mChannelPostsModel->setFilter(ql,ui->showUnread_TB->isChecked(),count);
mChannelFilesModel->setFilter(ql,count);
}