mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-01-04 04:11:06 -05:00
suppressed chatDialog problem in PeersDialog.cpp
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1170 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
74c0df0d7e
commit
a17f70309e
@ -33,7 +33,6 @@
|
|||||||
|
|
||||||
#include "chat/PopupChatDialog.h"
|
#include "chat/PopupChatDialog.h"
|
||||||
#include "msgs/ChanMsgDialog.h"
|
#include "msgs/ChanMsgDialog.h"
|
||||||
#include "ChatDialog.h"
|
|
||||||
#include "connect/ConfCertDialog.h"
|
#include "connect/ConfCertDialog.h"
|
||||||
#include "profile/ProfileView.h"
|
#include "profile/ProfileView.h"
|
||||||
|
|
||||||
@ -84,7 +83,6 @@
|
|||||||
/** Constructor */
|
/** Constructor */
|
||||||
PeersDialog::PeersDialog(QWidget *parent)
|
PeersDialog::PeersDialog(QWidget *parent)
|
||||||
: MainPage(parent),
|
: MainPage(parent),
|
||||||
chatDialog(NULL),
|
|
||||||
historyKeeper(Rshare::dataDirectory() + "/his1.xml")
|
historyKeeper(Rshare::dataDirectory() + "/his1.xml")
|
||||||
{
|
{
|
||||||
/* Invoke the Qt Designer generated object setup routine */
|
/* Invoke the Qt Designer generated object setup routine */
|
||||||
@ -182,10 +180,10 @@ PeersDialog::PeersDialog(QWidget *parent)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void PeersDialog::setChatDialog(ChatDialog *cd)
|
/*void PeersDialog::setChatDialog(ChatDialog *cd)
|
||||||
{
|
{
|
||||||
chatDialog = cd;
|
chatDialog = cd;
|
||||||
}
|
}*/
|
||||||
|
|
||||||
|
|
||||||
void PeersDialog::peertreeWidgetCostumPopupMenu( QPoint point )
|
void PeersDialog::peertreeWidgetCostumPopupMenu( QPoint point )
|
||||||
|
Loading…
Reference in New Issue
Block a user