mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
removed dependency of FriendDialog on RsAutoUpdatePage which is not needed anymore
This commit is contained in:
parent
9b78447109
commit
cdeee0198e
@ -59,8 +59,7 @@
|
|||||||
static FriendsDialog *instance = NULL;
|
static FriendsDialog *instance = NULL;
|
||||||
|
|
||||||
/** Constructor */
|
/** Constructor */
|
||||||
FriendsDialog::FriendsDialog(QWidget *parent)
|
FriendsDialog::FriendsDialog(QWidget *parent) : MainPage(parent)
|
||||||
: RsAutoUpdatePage(1500,parent)
|
|
||||||
{
|
{
|
||||||
/* Invoke the Qt Designer generated object setup routine */
|
/* Invoke the Qt Designer generated object setup routine */
|
||||||
ui.setupUi(this);
|
ui.setupUi(this);
|
||||||
@ -192,11 +191,6 @@ void FriendsDialog::processSettings(bool bLoad)
|
|||||||
Settings->endGroup();
|
Settings->endGroup();
|
||||||
}
|
}
|
||||||
|
|
||||||
void FriendsDialog::showEvent(QShowEvent *event)
|
|
||||||
{
|
|
||||||
RsAutoUpdatePage::showEvent(event);
|
|
||||||
}
|
|
||||||
|
|
||||||
void FriendsDialog::chatMessageReceived(const ChatMessage &msg)
|
void FriendsDialog::chatMessageReceived(const ChatMessage &msg)
|
||||||
{
|
{
|
||||||
if(msg.chat_id.isBroadcast())
|
if(msg.chat_id.isBroadcast())
|
||||||
@ -226,10 +220,6 @@ void FriendsDialog::chatStatusReceived(const ChatId &chat_id, const QString &sta
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void FriendsDialog::updateDisplay()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void FriendsDialog::addFriend()
|
void FriendsDialog::addFriend()
|
||||||
{
|
{
|
||||||
std::string groupId = ui.friendList->getSelectedGroupId();
|
std::string groupId = ui.friendList->getSelectedGroupId();
|
||||||
|
@ -21,8 +21,6 @@
|
|||||||
#ifndef _FRIENDSDIALOG_H
|
#ifndef _FRIENDSDIALOG_H
|
||||||
#define _FRIENDSDIALOG_H
|
#define _FRIENDSDIALOG_H
|
||||||
|
|
||||||
#include "retroshare-gui/RsAutoUpdatePage.h"
|
|
||||||
|
|
||||||
#include "ui_FriendsDialog.h"
|
#include "ui_FriendsDialog.h"
|
||||||
|
|
||||||
#define IMAGE_NETWORK ":/icons/png/network.png"
|
#define IMAGE_NETWORK ":/icons/png/network.png"
|
||||||
@ -33,7 +31,7 @@ class NetworkView;
|
|||||||
class IdDialog;
|
class IdDialog;
|
||||||
class CirclesDialog;
|
class CirclesDialog;
|
||||||
|
|
||||||
class FriendsDialog : public RsAutoUpdatePage
|
class FriendsDialog : public MainPage
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
@ -59,8 +57,6 @@ public:
|
|||||||
|
|
||||||
virtual UserNotify *getUserNotify(QObject *parent);
|
virtual UserNotify *getUserNotify(QObject *parent);
|
||||||
|
|
||||||
virtual void updateDisplay() ; // overloaded from RsAutoUpdatePage
|
|
||||||
|
|
||||||
static bool isGroupChatActive();
|
static bool isGroupChatActive();
|
||||||
static void groupChatActivate();
|
static void groupChatActivate();
|
||||||
|
|
||||||
@ -71,9 +67,6 @@ public:
|
|||||||
|
|
||||||
IdDialog *idDialog;
|
IdDialog *idDialog;
|
||||||
|
|
||||||
protected:
|
|
||||||
void showEvent (QShowEvent *event);
|
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void chatMessageReceived(const ChatMessage& msg);
|
void chatMessageReceived(const ChatMessage& msg);
|
||||||
void chatStatusReceived(const ChatId& chat_id, const QString& status_string);
|
void chatStatusReceived(const ChatId& chat_id, const QString& status_string);
|
||||||
|
Loading…
Reference in New Issue
Block a user