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

suppressed memory leak in GUI

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4067 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2011-03-02 14:31:03 +00:00
parent 28ebbf0b2e
commit 3ae378d9b9
3 changed files with 43 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
retroshare-gui/src/gui/RsAutoUpdatePage.cpp
View file

@ -17,6 +17,14 @@ RsAutoUpdatePage::RsAutoUpdatePage(int ms_update_period,QWidget *parent)
_timer->start() ; _timer->start() ;
} }
RsAutoUpdatePage::~RsAutoUpdatePage()
{
if(_timer != NULL)
delete _timer ;
_timer = NULL ;
}
void RsAutoUpdatePage::showEvent(QShowEvent *event) void RsAutoUpdatePage::showEvent(QShowEvent *event)
{ {
//std::cout << "RsAutoUpdatePage::showEvent() In show event !!" << std::endl ; //std::cout << "RsAutoUpdatePage::showEvent() In show event !!" << std::endl ;

1
retroshare-gui/src/gui/RsAutoUpdatePage.h
View file

@ -19,6 +19,7 @@ class RsAutoUpdatePage: public MainPage
public: public:
RsAutoUpdatePage(int ms_update_period = 1000,QWidget *parent=NULL) ; RsAutoUpdatePage(int ms_update_period = 1000,QWidget *parent=NULL) ;
virtual ~RsAutoUpdatePage() ;
virtual void updateDisplay() {} virtual void updateDisplay() {}

38
retroshare-gui/src/gui/TurtleRouterDialog.cpp
View file

@ -3,6 +3,8 @@
#include <retroshare/rsturtle.h> #include <retroshare/rsturtle.h>
#include "TurtleRouterDialog.h" #include "TurtleRouterDialog.h"
static const int MAX_TUNNEL_REQUESTS_DISPLAY = 10 ;
TurtleRouterDialog::TurtleRouterDialog(QWidget *parent) TurtleRouterDialog::TurtleRouterDialog(QWidget *parent)
: RsAutoUpdatePage(2000,parent) : RsAutoUpdatePage(2000,parent)
{ {
@ -41,7 +43,11 @@ void TurtleRouterDialog::updateDisplay()
// remove all children of top level objects // remove all children of top level objects
for(int i=0;i<_f2f_TW->topLevelItemCount();++i) for(int i=0;i<_f2f_TW->topLevelItemCount();++i)
while(_f2f_TW->topLevelItem(i)->takeChild(0) != NULL) ; {
QTreeWidgetItem *taken ;
while( (taken = _f2f_TW->topLevelItem(i)->takeChild(0)) != NULL)
delete taken ;
}
for(uint i=0;i<hashes_info.size();++i) for(uint i=0;i<hashes_info.size();++i)
findParentHashItem(hashes_info[i][0]) ; findParentHashItem(hashes_info[i][0]) ;
@ -55,14 +61,14 @@ void TurtleRouterDialog::updateDisplay()
QTreeWidgetItem *parent = findParentHashItem(hash) ; QTreeWidgetItem *parent = findParentHashItem(hash) ;
if(parent->text(0) == QString("Unknown hashes")) if(parent->text(0).left(14) == QString("Unknown hashes"))
unknown_hash_found = true ; unknown_hash_found = true ;
QString str = QString::fromStdString( "Tunnel id: " + tunnels_info[i][0] + "\t [" + tunnels_info[i][2] + "] --> [" + tunnels_info[i][1] + "]\t\t last transfer: " + tunnels_info[i][4] + "\t Speed: " + tunnels_info[i][5] ) ; QString str = QString::fromStdString( "Tunnel id: " + tunnels_info[i][0] + "\t [" + tunnels_info[i][2] + "] --> [" + tunnels_info[i][1] + "]\t\t last transfer: " + tunnels_info[i][4] + "\t Speed: " + tunnels_info[i][5] ) ;
stl.clear() ; stl.clear() ;
stl.push_back(str) ; stl.push_back(str) ;
new QTreeWidgetItem(parent,stl) ; parent->addChild(new QTreeWidgetItem(stl)) ;
} }
for(uint i=0;i<search_reqs_info.size();++i) for(uint i=0;i<search_reqs_info.size();++i)
@ -72,27 +78,41 @@ void TurtleRouterDialog::updateDisplay()
stl.clear() ; stl.clear() ;
stl.push_back(str) ; stl.push_back(str) ;
new QTreeWidgetItem(top_level_s_requests,stl) ; top_level_s_requests->addChild(new QTreeWidgetItem(stl)) ;
} }
top_level_s_requests->setText(0, tr("Search requests") + "(" + QString::number(search_reqs_info.size()) + ")" ) ; top_level_s_requests->setText(0, tr("Search requests") + "(" + QString::number(search_reqs_info.size()) + ")" ) ;
for(uint i=0;i<tunnel_reqs_info.size();++i) int reqs_size = tunnel_reqs_info.size() ;
for(uint i=0;i<reqs_size;++i)
if(i+MAX_TUNNEL_REQUESTS_DISPLAY >= reqs_size || i < MAX_TUNNEL_REQUESTS_DISPLAY)
{ {
QString str = QString::fromStdString( "Request id: " + tunnel_reqs_info[i][0] + "\t from [" + tunnel_reqs_info[i][1] + "]\t " + tunnel_reqs_info[i][2]) ; QString str = QString::fromStdString( "Request id: " + tunnel_reqs_info[i][0] + "\t from [" + tunnel_reqs_info[i][1] + "]\t " + tunnel_reqs_info[i][2]) ;
stl.clear() ; stl.clear() ;
stl.push_back(str) ; stl.push_back(str) ;
new QTreeWidgetItem(top_level_t_requests,stl) ; top_level_t_requests->addChild(new QTreeWidgetItem(stl)) ;
} }
else if(i == MAX_TUNNEL_REQUESTS_DISPLAY)
{
stl.clear() ;
stl.push_back(QString("...")) ;
top_level_t_requests->addChild(new QTreeWidgetItem(stl)) ;
}
top_level_t_requests->setText(0, tr("Tunnel requests") + "("+QString::number(tunnel_reqs_info.size()) + ")") ; top_level_t_requests->setText(0, tr("Tunnel requests") + "("+QString::number(tunnel_reqs_info.size()) + ")") ;
QTreeWidgetItem *unknown_hashs_item = findParentHashItem("") ;
unknown_hashs_item->setText(0,QString("Unknown hashes (") + QString::number(unknown_hashs_item->childCount())+QString(")")) ;
// Ok, this is a N2 search, but there are very few elements in the list. // Ok, this is a N2 search, but there are very few elements in the list.
for(int i=2;i<_f2f_TW->topLevelItemCount();) for(int i=2;i<_f2f_TW->topLevelItemCount();)
{ {
bool found = false ; bool found = false ;
if(_f2f_TW->topLevelItem(i)->text(0) == "Unknown hashes" && unknown_hash_found) if(_f2f_TW->topLevelItem(i)->text(0).left(14) == "Unknown hashes" && unknown_hash_found)
found = true ; found = true ;
if(_f2f_TW->topLevelItem(i)->childCount() > 0) // this saves uploading hashes if(_f2f_TW->topLevelItem(i)->childCount() > 0) // this saves uploading hashes
@ -103,7 +123,7 @@ void TurtleRouterDialog::updateDisplay()
found=true ; found=true ;
if(!found) if(!found)
_f2f_TW->takeTopLevelItem(i) ; delete _f2f_TW->takeTopLevelItem(i) ;
else else
++i ; ++i ;
} }
@ -113,7 +133,7 @@ QTreeWidgetItem *TurtleRouterDialog::findParentHashItem(const std::string& hash)
{ {
// look for the hash, and insert a new element if necessary. // look for the hash, and insert a new element if necessary.
// //
QList<QTreeWidgetItem*> items = _f2f_TW->findItems((hash=="")?QString("Unknown hashes"):QString::fromStdString(hash),Qt::MatchExactly) ; QList<QTreeWidgetItem*> items = _f2f_TW->findItems((hash=="")?QString("Unknown hashes"):QString::fromStdString(hash),Qt::MatchStartsWith) ;
if(items.empty()) if(items.empty())
{ {