changed the usage of "QMenu*" to a local "QMenu"

removed usage of "new QMouseEvent", it was a memory leak
cleaned some includes

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2910 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-05-14 20:55:44 +00:00
parent e49cc6552c
commit c3c6480f4b
30 changed files with 68 additions and 297 deletions

View file

@ -62,7 +62,6 @@
#include <QMenu>
#include <QCursor>
#include <QPoint>
#include <QMouseEvent>
#include <QPixmap>
#include <QMessageBox>
#include <QHeaderView>
@ -255,8 +254,7 @@ void PeersDialog::contextMenu( QPoint point )
QMenu contextMnu(this);
contextMnu.addAction( pasteLinkAct);
QMouseEvent mevent(QEvent::MouseButtonPress, point, Qt::RightButton, Qt::RightButton, Qt::NoModifier);
contextMnu.exec( mevent.globalPos() );
contextMnu.exec(QCursor::pos());
}
void PeersDialog::peertreeWidgetCostumPopupMenu( QPoint point )
@ -267,9 +265,6 @@ void PeersDialog::peertreeWidgetCostumPopupMenu( QPoint point )
return;
}
QMenu contextMnu( this );
QMouseEvent *mevent = new QMouseEvent( QEvent::MouseButtonPress, point, Qt::RightButton, Qt::RightButton, Qt::NoModifier );
QAction* expandAll = new QAction(tr( "Expand all" ), this );
connect( expandAll , SIGNAL( triggered() ), ui.peertreeWidget, SLOT (expandAll()) );
@ -332,7 +327,8 @@ void PeersDialog::peertreeWidgetCostumPopupMenu( QPoint point )
QWidgetAction *widgetAction = new QWidgetAction(this);
widgetAction->setDefaultWidget(widget);
contextMnu.clear();
QMenu contextMnu( this );
contextMnu.addAction( widgetAction);
contextMnu.addAction( chatAct);
contextMnu.addAction( msgAct);
@ -347,7 +343,8 @@ void PeersDialog::peertreeWidgetCostumPopupMenu( QPoint point )
contextMnu.addSeparator();
contextMnu.addAction( expandAll);
contextMnu.addAction( collapseAll);
contextMnu.exec( mevent->globalPos() );
contextMnu.exec(QCursor::pos());
}
// replaced by shortcut