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

fixed bad connect in notifyQt for chat window

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7635 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-10-25 13:14:55 +00:00
parent 067e5d4fac
commit c5e65486aa
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
retroshare-gui/src/gui/notifyqt.cpp
View file

@ -510,7 +510,7 @@ void NotifyQt::notifyChatLobbyEvent(uint64_t lobby_id,uint32_t event_type,const
void NotifyQt::notifyChatShow(const std::string& peer_id)
{
emit raiseChatWindow(RsPeerId(peer_id)) ;
emit raiseChatWindow(QString::fromStdString(peer_id)) ;
}
void NotifyQt::notifyChatStatus(const std::string& peer_id,const std::string& status_string,bool is_private)
@ -527,9 +527,9 @@ void NotifyQt::notifyChatStatus(const std::string& peer_id,const std::string& st
emit chatStatusChanged(QString::fromStdString(peer_id),QString::fromUtf8(status_string.c_str()),is_private) ;
}
void NotifyQt::raiseChatWindow_slot(const RsPeerId& peer_str)
void NotifyQt::raiseChatWindow_slot(const QString& peer_str)
{
ChatDialog::chatFriend(peer_str) ;
ChatDialog::chatFriend(RsPeerId(peer_str.toStdString())) ;
}
void NotifyQt::notifyTurtleSearchResult(uint32_t search_id,const std::list<TurtleFileInfo>& files)

4
retroshare-gui/src/gui/notifyqt.h
View file

@ -118,7 +118,7 @@ class NotifyQt: public QObject, public NotifyClient
void peerStatusChangedSummary() const;
void publicChatChanged(int type) const ;
void privateChatChanged(int list, int type) const ;
void raiseChatWindow(const RsPeerId&) const ;
void raiseChatWindow(const QString&) const ;
void groupsChanged(int type) const ;
void discInfoChanged() const ;
void downloadComplete(const QString& /* fileHash */);
@ -143,7 +143,7 @@ class NotifyQt: public QObject, public NotifyClient
void runningTick();
void handleSignatureEvent() ;
void handleChatLobbyTimeShift(int) ;
void raiseChatWindow_slot(const RsPeerId&) ;
void raiseChatWindow_slot(const QString&) ;
private:
NotifyQt();