mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-07-23 06:31:20 -04:00
Added the delete of the TokenQueue in some destructors to fix crashes.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7597 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
e996f9e275
commit
bec735b60a
21 changed files with 72 additions and 11 deletions
|
@ -89,6 +89,11 @@ CirclesDialog::CirclesDialog(QWidget *parent)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CirclesDialog::~CirclesDialog()
|
||||||
|
{
|
||||||
|
delete mCircleQueue;
|
||||||
|
}
|
||||||
|
|
||||||
void CirclesDialog::todo()
|
void CirclesDialog::todo()
|
||||||
{
|
{
|
||||||
QMessageBox::information(this, "Todo",
|
QMessageBox::information(this, "Todo",
|
||||||
|
|
|
@ -38,6 +38,7 @@ class CirclesDialog : public RsGxsUpdateBroadcastPage, public TokenResponse
|
||||||
|
|
||||||
public:
|
public:
|
||||||
CirclesDialog(QWidget *parent = 0);
|
CirclesDialog(QWidget *parent = 0);
|
||||||
|
~CirclesDialog();
|
||||||
|
|
||||||
virtual QIcon iconPixmap() const { return QIcon(IMAGE_CIRCLES) ; } //MainPage
|
virtual QIcon iconPixmap() const { return QIcon(IMAGE_CIRCLES) ; } //MainPage
|
||||||
virtual QString pageName() const { return tr("Circles") ; } //MainPage
|
virtual QString pageName() const { return tr("Circles") ; } //MainPage
|
||||||
|
|
|
@ -203,6 +203,11 @@ IdDialog::IdDialog(QWidget *parent)
|
||||||
registerHelpButton(ui.helpButton, hlp_str) ;
|
registerHelpButton(ui.helpButton, hlp_str) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
IdDialog::~IdDialog()
|
||||||
|
{
|
||||||
|
delete(mIdQueue);
|
||||||
|
}
|
||||||
|
|
||||||
void IdDialog::todo()
|
void IdDialog::todo()
|
||||||
{
|
{
|
||||||
QMessageBox::information(this, "Todo",
|
QMessageBox::information(this, "Todo",
|
||||||
|
|
|
@ -44,6 +44,7 @@ class IdDialog : public RsGxsUpdateBroadcastPage, public TokenResponse
|
||||||
|
|
||||||
public:
|
public:
|
||||||
IdDialog(QWidget *parent = 0);
|
IdDialog(QWidget *parent = 0);
|
||||||
|
~IdDialog();
|
||||||
|
|
||||||
virtual QIcon iconPixmap() const { return QIcon(IMAGE_IDDIALOG) ; } //MainPage
|
virtual QIcon iconPixmap() const { return QIcon(IMAGE_IDDIALOG) ; } //MainPage
|
||||||
virtual QString pageName() const { return tr("Identities") ; } //MainPage
|
virtual QString pageName() const { return tr("Identities") ; } //MainPage
|
||||||
|
|
|
@ -83,6 +83,11 @@ IdEditDialog::IdEditDialog(QWidget *parent)
|
||||||
ui.pushButton_Tag->setEnabled(false);
|
ui.pushButton_Tag->setEnabled(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
IdEditDialog::~IdEditDialog()
|
||||||
|
{
|
||||||
|
delete(mIdQueue);
|
||||||
|
}
|
||||||
|
|
||||||
void IdEditDialog::setupNewId(bool pseudo)
|
void IdEditDialog::setupNewId(bool pseudo)
|
||||||
{
|
{
|
||||||
setWindowTitle(tr("New identity"));
|
setWindowTitle(tr("New identity"));
|
||||||
|
|
|
@ -41,6 +41,7 @@ class IdEditDialog : public QDialog, public TokenResponse
|
||||||
|
|
||||||
public:
|
public:
|
||||||
IdEditDialog(QWidget *parent = 0);
|
IdEditDialog(QWidget *parent = 0);
|
||||||
|
~IdEditDialog();
|
||||||
|
|
||||||
void setupNewId(bool pseudo);
|
void setupNewId(bool pseudo);
|
||||||
void setupExistingId(std::string keyId);
|
void setupExistingId(std::string keyId);
|
||||||
|
|
|
@ -196,6 +196,12 @@ PeopleDialog::PeopleDialog(QWidget *parent)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void PeopleDialog::~PeopleDialog()
|
||||||
|
{
|
||||||
|
delete(mIdentityQueue);
|
||||||
|
delete(mCirclesQueue);
|
||||||
|
}
|
||||||
|
|
||||||
void PeopleDialog::updateDisplay(bool complete)
|
void PeopleDialog::updateDisplay(bool complete)
|
||||||
{
|
{
|
||||||
Q_UNUSED(complete);
|
Q_UNUSED(complete);
|
||||||
|
|
|
@ -51,6 +51,7 @@ class PeopleDialog : public RsGxsUpdateBroadcastPage, public Ui::PeopleDialog, p
|
||||||
static const uint32_t PD_CIRCLES ;
|
static const uint32_t PD_CIRCLES ;
|
||||||
|
|
||||||
PeopleDialog(QWidget *parent = 0);
|
PeopleDialog(QWidget *parent = 0);
|
||||||
|
~PeopleDialog();
|
||||||
|
|
||||||
virtual QIcon iconPixmap() const { return QIcon(IMAGE_IDENTITY) ; } //MainPage
|
virtual QIcon iconPixmap() const { return QIcon(IMAGE_IDENTITY) ; } //MainPage
|
||||||
virtual QString pageName() const { return tr("People") ; } //MainPage
|
virtual QString pageName() const { return tr("People") ; } //MainPage
|
||||||
|
|
|
@ -97,6 +97,11 @@ PhotoShare::PhotoShare(QWidget *parent)
|
||||||
requestAlbumData();
|
requestAlbumData();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void PhotoShare::~PhotoShare()
|
||||||
|
{
|
||||||
|
delete(mPhotoQueue);
|
||||||
|
}
|
||||||
|
|
||||||
void PhotoShare::notifySelection(PhotoShareItem *selection)
|
void PhotoShare::notifySelection(PhotoShareItem *selection)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
|
@ -29,6 +29,7 @@ class PhotoShare : public MainPage, public TokenResponse, public PhotoShareItemH
|
||||||
|
|
||||||
public:
|
public:
|
||||||
PhotoShare(QWidget *parent = 0);
|
PhotoShare(QWidget *parent = 0);
|
||||||
|
~PhotoShare();
|
||||||
|
|
||||||
void notifySelection(PhotoShareItem* selection);
|
void notifySelection(PhotoShareItem* selection);
|
||||||
|
|
||||||
|
|
|
@ -51,14 +51,16 @@ PhotoSlideShow::PhotoSlideShow(const RsPhotoAlbum& album, QWidget *parent)
|
||||||
//QTimer::singleShot(5000, this, SLOT(timerEvent()));
|
//QTimer::singleShot(5000, this, SLOT(timerEvent()));
|
||||||
}
|
}
|
||||||
|
|
||||||
PhotoSlideShow::~PhotoSlideShow(){
|
PhotoSlideShow::~PhotoSlideShow()
|
||||||
|
{
|
||||||
std::map<RsGxsMessageId, RsPhotoPhoto *>::iterator mit = mPhotos.begin();
|
std::map<RsGxsMessageId, RsPhotoPhoto *>::iterator mit = mPhotos.begin();
|
||||||
|
|
||||||
for(; mit != mPhotos.end(); mit++)
|
for(; mit != mPhotos.end(); mit++)
|
||||||
{
|
{
|
||||||
delete mit->second;
|
delete mit->second;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
delete(mPhotoQueue);
|
||||||
}
|
}
|
||||||
|
|
||||||
void PhotoSlideShow::showPhotoDetails()
|
void PhotoSlideShow::showPhotoDetails()
|
||||||
|
|
|
@ -122,6 +122,11 @@ WikiDialog::WikiDialog(QWidget *parent)
|
||||||
insertWikiGroups();
|
insertWikiGroups();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
WikiDialog::~WikiDialog()
|
||||||
|
{
|
||||||
|
delete(mWikiQueue);
|
||||||
|
}
|
||||||
|
|
||||||
void WikiDialog::checkUpdate()
|
void WikiDialog::checkUpdate()
|
||||||
{
|
{
|
||||||
/* update */
|
/* update */
|
||||||
|
|
|
@ -46,6 +46,7 @@ class WikiDialog : public MainPage, public TokenResponse
|
||||||
|
|
||||||
public:
|
public:
|
||||||
WikiDialog(QWidget *parent = 0);
|
WikiDialog(QWidget *parent = 0);
|
||||||
|
~WikiDialog();
|
||||||
|
|
||||||
virtual QIcon iconPixmap() const { return QIcon(IMAGE_WIKI) ; } //MainPage
|
virtual QIcon iconPixmap() const { return QIcon(IMAGE_WIKI) ; } //MainPage
|
||||||
virtual QString pageName() const { return tr("Wiki Pages") ; } //MainPage
|
virtual QString pageName() const { return tr("Wiki Pages") ; } //MainPage
|
||||||
|
|
|
@ -97,6 +97,7 @@ WikiEditDialog::WikiEditDialog(QWidget *parent)
|
||||||
WikiEditDialog::~WikiEditDialog()
|
WikiEditDialog::~WikiEditDialog()
|
||||||
{
|
{
|
||||||
delete (mThreadCompareRole);
|
delete (mThreadCompareRole);
|
||||||
|
delete(mWikiQueue);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WikiEditDialog::mergeModeToggle()
|
void WikiEditDialog::mergeModeToggle()
|
||||||
|
|
|
@ -119,6 +119,7 @@ FriendSelectionWidget::FriendSelectionWidget(QWidget *parent)
|
||||||
|
|
||||||
FriendSelectionWidget::~FriendSelectionWidget()
|
FriendSelectionWidget::~FriendSelectionWidget()
|
||||||
{
|
{
|
||||||
|
delete(mIdQueue);
|
||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,7 @@
|
||||||
#define IMAGE_VOTEDOWN ":/images/vote_down.png"
|
#define IMAGE_VOTEDOWN ":/images/vote_down.png"
|
||||||
|
|
||||||
GxsCommentTreeWidget::GxsCommentTreeWidget(QWidget *parent)
|
GxsCommentTreeWidget::GxsCommentTreeWidget(QWidget *parent)
|
||||||
:QTreeWidget(parent), mRsTokenService(NULL), mCommentService(NULL), mTokenQueue(NULL)
|
:QTreeWidget(parent), mTokenQueue(NULL), mRsTokenService(NULL), mCommentService(NULL)
|
||||||
{
|
{
|
||||||
// QTreeWidget* widget = this;
|
// QTreeWidget* widget = this;
|
||||||
|
|
||||||
|
@ -73,6 +73,13 @@ GxsCommentTreeWidget::GxsCommentTreeWidget(QWidget *parent)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
GxsCommentTreeWidget::~GxsCommentTreeWidget()
|
||||||
|
{
|
||||||
|
if (mTokenQueue) {
|
||||||
|
delete(mTokenQueue);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void GxsCommentTreeWidget::setCurrentMsgId(QTreeWidgetItem *current, QTreeWidgetItem *previous)
|
void GxsCommentTreeWidget::setCurrentMsgId(QTreeWidgetItem *current, QTreeWidgetItem *previous)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -84,7 +91,7 @@ void GxsCommentTreeWidget::setCurrentMsgId(QTreeWidgetItem *current, QTreeWidget
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void GxsCommentTreeWidget::customPopUpMenu(const QPoint& point)
|
void GxsCommentTreeWidget::customPopUpMenu(const QPoint& /*point*/)
|
||||||
{
|
{
|
||||||
QMenu contextMnu( this );
|
QMenu contextMnu( this );
|
||||||
QAction* action = contextMnu.addAction(QIcon(IMAGE_MESSAGE), tr("Reply to Comment"), this, SLOT(replyToComment()));
|
QAction* action = contextMnu.addAction(QIcon(IMAGE_MESSAGE), tr("Reply to Comment"), this, SLOT(replyToComment()));
|
||||||
|
|
|
@ -36,6 +36,7 @@ class GxsCommentTreeWidget : public QTreeWidget, public TokenResponse
|
||||||
|
|
||||||
public:
|
public:
|
||||||
GxsCommentTreeWidget(QWidget *parent = 0);
|
GxsCommentTreeWidget(QWidget *parent = 0);
|
||||||
|
~GxsCommentTreeWidget();
|
||||||
void setup(RsTokenService *token_service, RsGxsCommentService *comment_service);
|
void setup(RsTokenService *token_service, RsGxsCommentService *comment_service);
|
||||||
|
|
||||||
void requestComments(const RsGxsGrpMsgIdPair& threadId);
|
void requestComments(const RsGxsGrpMsgIdPair& threadId);
|
||||||
|
|
|
@ -79,6 +79,13 @@ GxsGroupDialog::GxsGroupDialog(TokenQueue *tokenExternalQueue, RsTokenService *t
|
||||||
init();
|
init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
GxsGroupDialog::~GxsGroupDialog()
|
||||||
|
{
|
||||||
|
if (mInternalTokenQueue) {
|
||||||
|
delete(mInternalTokenQueue);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void GxsGroupDialog::init()
|
void GxsGroupDialog::init()
|
||||||
{
|
{
|
||||||
// connect up the buttons.
|
// connect up the buttons.
|
||||||
|
|
|
@ -143,6 +143,8 @@ public:
|
||||||
*/
|
*/
|
||||||
GxsGroupDialog(TokenQueue *tokenExternalQueue, RsTokenService *tokenService, Mode mode, RsGxsGroupId groupId, uint32_t enableFlags, uint32_t defaultFlags, QWidget *parent = NULL);
|
GxsGroupDialog(TokenQueue *tokenExternalQueue, RsTokenService *tokenService, Mode mode, RsGxsGroupId groupId, uint32_t enableFlags, uint32_t defaultFlags, QWidget *parent = NULL);
|
||||||
|
|
||||||
|
~GxsGroupDialog();
|
||||||
|
|
||||||
uint32_t mode() { return mMode; }
|
uint32_t mode() { return mMode; }
|
||||||
|
|
||||||
// overloaded from TokenResponse
|
// overloaded from TokenResponse
|
||||||
|
|
|
@ -53,6 +53,7 @@ GxsMessageFramePostWidget::~GxsMessageFramePostWidget()
|
||||||
delete(mFillThread);
|
delete(mFillThread);
|
||||||
mFillThread = NULL;
|
mFillThread = NULL;
|
||||||
}
|
}
|
||||||
|
delete(mTokenQueue);
|
||||||
}
|
}
|
||||||
|
|
||||||
void GxsMessageFramePostWidget::setGroupId(const RsGxsGroupId &groupId)
|
void GxsMessageFramePostWidget::setGroupId(const RsGxsGroupId &groupId)
|
||||||
|
|
|
@ -84,6 +84,15 @@ CreateGxsChannelMsg::CreateGxsChannelMsg(const RsGxsGroupId &cId)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CreateGxsChannelMsg::~CreateGxsChannelMsg()
|
||||||
|
{
|
||||||
|
#ifdef CHANNELS_FRAME_CATCHER
|
||||||
|
delete fCatcher;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
delete(mChannelQueue);
|
||||||
|
}
|
||||||
|
|
||||||
void CreateGxsChannelMsg::contextMenu(QPoint /*point*/)
|
void CreateGxsChannelMsg::contextMenu(QPoint /*point*/)
|
||||||
{
|
{
|
||||||
QList<RetroShareLink> links ;
|
QList<RetroShareLink> links ;
|
||||||
|
@ -142,13 +151,6 @@ void CreateGxsChannelMsg::pasteLink()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
CreateGxsChannelMsg::~CreateGxsChannelMsg()
|
|
||||||
{
|
|
||||||
#ifdef CHANNELS_FRAME_CATCHER
|
|
||||||
delete fCatcher;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Dropping */
|
/* Dropping */
|
||||||
|
|
||||||
void CreateGxsChannelMsg::dragEnterEvent(QDragEnterEvent *event)
|
void CreateGxsChannelMsg::dragEnterEvent(QDragEnterEvent *event)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue