Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-06 08:05:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Optimized search of feed items in RSFeedWidget by using a map instead of QTreeWidgetItemIterator.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8013 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2015-03-12 13:59:56 +00:00
parent 6ef761e4e5
commit cdf9a5b4d4
6 changed files with 168 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

74
retroshare-gui/src/gui/common/RSFeedWidget.cpp
View file

@ -26,7 +26,8 @@
#include "ui_RSFeedWidget.h"
#include "RSTreeWidgetItem.h"
#include "gui/feeds/FeedItem.h"
#include "gui/gxs/GxsFeedItem.h"
#include <iostream>
#define COLUMN_FEED 0
@ -108,6 +109,7 @@ bool RSFeedWidget::eventFilter(QObject *object, QEvent *event)
FeedItem *feedItem = feedItemFromTreeItem(treeItem);
if (feedItem) {
disconnectSignals(feedItem);
feedRemoved(feedItem);
delete(feedItem);
}
delete(treeItem);
@ -127,6 +129,21 @@ bool RSFeedWidget::eventFilter(QObject *object, QEvent *event)
return QWidget::eventFilter(object, event);
}
void RSFeedWidget::feedAdded(FeedItem *feedItem, QTreeWidgetItem *treeItem)
{
mItems.insert(feedItem, treeItem);
}
void RSFeedWidget::feedRemoved(FeedItem *feedItem)
{
mItems.remove(feedItem);
}
void RSFeedWidget::feedsCleared()
{
mItems.clear();
}
void RSFeedWidget::connectSignals(FeedItem *feedItem)
{
connect(feedItem, SIGNAL(feedItemDestroyed(FeedItem*)), this, SLOT(feedItemDestroyed(FeedItem*)));
@ -167,6 +184,8 @@ void RSFeedWidget::addFeedItem(FeedItem *feedItem, Qt::ItemDataRole sortRole, co
ui->treeWidget->addTopLevelItem(treeItem);
ui->treeWidget->setItemWidget(treeItem, 0, feedItem);
feedAdded(feedItem, treeItem);
connectSignals(feedItem);
filterItem(treeItem, feedItem);
@ -192,6 +211,8 @@ void RSFeedWidget::addFeedItem(FeedItem *feedItem, const QMap<Qt::ItemDataRole,
ui->treeWidget->addTopLevelItem(treeItem);
ui->treeWidget->setItemWidget(treeItem, 0, feedItem);
feedAdded(feedItem, treeItem);
connectSignals(feedItem);
filterItem(treeItem, feedItem);
@ -246,6 +267,8 @@ void RSFeedWidget::clear()
}
}
feedsCleared();
/* Clear items */
ui->treeWidget->clear();
@ -369,6 +392,7 @@ void RSFeedWidget::removeFeedItem(FeedItem *feedItem)
disconnectSignals(feedItem);
QTreeWidgetItem *treeItem = findTreeWidgetItem(feedItem);
feedRemoved(feedItem);
if (treeItem) {
delete(treeItem);
}
@ -396,6 +420,7 @@ void RSFeedWidget::feedItemDestroyed(FeedItem *feedItem)
/* No need to disconnect when object will be destroyed */
QTreeWidgetItem *treeItem = findTreeWidgetItem(feedItem);
feedRemoved(feedItem);
if (treeItem) {
delete(treeItem);
}
@ -407,16 +432,12 @@ void RSFeedWidget::feedItemDestroyed(FeedItem *feedItem)
QTreeWidgetItem *RSFeedWidget::findTreeWidgetItem(FeedItem *feedItem)
{
QTreeWidgetItemIterator it(ui->treeWidget);
QTreeWidgetItem *treeItem;
while ((treeItem = *it) != NULL) {
++it;
if (feedItemFromTreeItem(treeItem) == feedItem) {
return treeItem;
}
QMap<FeedItem*, QTreeWidgetItem*>::iterator it = mItems.find(feedItem);
if (it == mItems.end()) {
return NULL;
}
return NULL;
return it.value();
}
bool RSFeedWidget::scrollTo(FeedItem *feedItem, bool focus)
@ -491,38 +512,3 @@ void RSFeedWidget::selectedFeedItems(QList<FeedItem*> &feedItems)
feedItems.push_back(feedItem);
}
}
struct FindGxsFeedItemData
{
FindGxsFeedItemData(const RsGxsGroupId &groupId, const RsGxsMessageId &messageId) : mGroupId(groupId), mMessageId(messageId) {}
const RsGxsGroupId &mGroupId;
const RsGxsMessageId &mMessageId;
};
static bool findGxsFeedItemCallback(FeedItem *feedItem, void *data)
{
FindGxsFeedItemData *findData = (FindGxsFeedItemData*) data;
if (!findData || findData->mGroupId.isNull() || findData->mMessageId.isNull()) {
return false;
}
GxsFeedItem *item = dynamic_cast<GxsFeedItem*>(feedItem);
if (!item) {
return false;
}
if (item->groupId() != findData->mGroupId ||
item->messageId() != findData->mMessageId) {
return false;
}
return true;
}
GxsFeedItem *RSFeedWidget::findGxsFeedItem(const RsGxsGroupId &groupId, const RsGxsMessageId &messageId)
{
FindGxsFeedItemData data(groupId, messageId);
FeedItem *feedItem = findFeedItem(findGxsFeedItemCallback, &data);
return dynamic_cast<GxsFeedItem*>(feedItem);
}

12
retroshare-gui/src/gui/common/RSFeedWidget.h
View file

@ -26,14 +26,11 @@
#include <QWidget>
#include <QMap>
#include "retroshare/rsgxsifacetypes.h"
#define FEED_TREEWIDGET_SORTROLE Qt::UserRole
class FeedItem;
class QTreeWidgetItem;
class RSTreeWidgetItemCompareRole;
class GxsFeedItem;
namespace Ui {
class RSFeedWidget;
@ -79,9 +76,6 @@ public:
void selectedFeedItems(QList<FeedItem*> &feedItems);
/* Convenience functions */
GxsFeedItem *findGxsFeedItem(const RsGxsGroupId &groupId, const RsGxsMessageId &messageId);
signals:
void feedCountChanged();
@ -93,6 +87,9 @@ public slots:
protected:
bool eventFilter(QObject *object, QEvent *event);
virtual void feedAdded(FeedItem *feedItem, QTreeWidgetItem *treeItem);
virtual void feedRemoved(FeedItem *feedItem);
virtual void feedsCleared();
private slots:
void feedItemDestroyed(FeedItem *feedItem);
@ -121,6 +118,9 @@ private:
/* Options */
int mCountChangedDisabled;
/* Items */
QMap<FeedItem*, QTreeWidgetItem*> mItems;
Ui::RSFeedWidget *ui;
};