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

Extracted a new widget ChatWidget for the basic chat handling from the PopupChatDialog and use it in ChatLobbyDialog too.

Browse source 
Added an own ui for the ChatLobbyDialog.
Saved settings of the ChatLobbyDialog.
Changed parameters of RsStatus interface from "std::string" to "const std::string&"
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4806 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-01-17 20:36:36 +00:00
parent 7d7101a62d
commit 35c7605704
38 changed files with 3720 additions and 2552 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libretroshare/src/retroshare/rsstatus.h
View file

@ -88,7 +88,7 @@ class RsStatus
* This retrieves the status info one peer
* @param statusInfo is populated with client's peer's status
*/
virtual bool getStatus(std::string &id, StatusInfo &statusInfo) = 0;
virtual bool getStatus(const std::string &id, StatusInfo &statusInfo) = 0;
/**
* send the client's status to his/her peers
@ -96,7 +96,7 @@ class RsStatus
* @param status the status of the peers
* @return will return false if status info does not belong to client
*/
virtual bool sendStatus(std::string id, uint32_t status) = 0;
virtual bool sendStatus(const std::string &id, uint32_t status) = 0;
};

4
libretroshare/src/rsserver/p3status.cc
View file

@ -47,12 +47,12 @@ bool p3Status::getStatusList(std::list<StatusInfo>& statusInfo){
return mStatusSrv->getStatusList(statusInfo);
}
bool p3Status::getStatus(std::string &id, StatusInfo &statusInfo)
bool p3Status::getStatus(const std::string &id, StatusInfo &statusInfo)
{
return mStatusSrv->getStatus(id, statusInfo);
}
bool p3Status::sendStatus(std::string id, uint32_t status){
bool p3Status::sendStatus(const std::string &id, uint32_t status){
return mStatusSrv->sendStatus(id, status);
}

4
libretroshare/src/rsserver/p3status.h
View file

@ -45,8 +45,8 @@ public:
virtual bool getOwnStatus(StatusInfo& statusInfo);
virtual bool getStatusList(std::list<StatusInfo>& statusInfo);
virtual bool getStatus(std::string &id, StatusInfo &statusInfo);
virtual bool sendStatus(std::string id, uint32_t status);
virtual bool getStatus(const std::string &id, StatusInfo &statusInfo);
virtual bool sendStatus(const std::string &id, uint32_t status);
private:

5
libretroshare/src/services/p3chatservice.cc
View file

@ -366,8 +366,9 @@ bool p3ChatService::isLobbyId(const std::string& id,ChatLobbyId& lobby_id)
lobby_id = it->second ;
return true ;
}
else
return false ;
lobby_id = 0;
return false ;
}
bool p3ChatService::sendPrivateChat(const std::string &id, const std::wstring &msg)

2
libretroshare/src/services/p3statusservice.cc
View file

@ -106,7 +106,7 @@ bool p3StatusService::getStatusList(std::list<StatusInfo>& statusInfo)
return true;
}
bool p3StatusService::getStatus(std::string &id, StatusInfo &statusInfo)
bool p3StatusService::getStatus(const std::string &id, StatusInfo &statusInfo)
{
#ifdef STATUS_DEBUG
std::cerr << "p3StatusService::getStatus() " << std::endl;

2
libretroshare/src/services/p3statusservice.h
View file

@ -65,7 +65,7 @@ virtual void statusChange(const std::list<pqipeer> &plist);
*/
virtual bool getOwnStatus(StatusInfo& statusInfo);
virtual bool getStatusList(std::list<StatusInfo>& statusInfo);
virtual bool getStatus(std::string &id, StatusInfo &statusInfo);
virtual bool getStatus(const std::string &id, StatusInfo &statusInfo);
/* id = "", status is sent to all online peers */
virtual bool sendStatus(const std::string &id, uint32_t status);