Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-25 23:45:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1275 from sehraf/pr_fix-IDdialog-chat-link

Browse source 
fix Qt 5.11 and id dialog chat link
This commit is contained in:
csoler 2018-05-26 11:09:41 +02:00 • committed by GitHub
commit 65beb2cf2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
retroshare-gui/src/gui/Identity/IdDialog.cpp
View file

@ -1994,7 +1994,8 @@ QString IdDialog::createUsageString(const RsIdentityUsage& u) const
} }
case RsIdentityUsage::CHAT_LOBBY_MSG_VALIDATION: // Chat lobby msgs are signed, so each time one comes, or a chat lobby event comes, a signature verificaiton happens. case RsIdentityUsage::CHAT_LOBBY_MSG_VALIDATION: // Chat lobby msgs are signed, so each time one comes, or a chat lobby event comes, a signature verificaiton happens.
{ {
RetroShareLink l = RetroShareLink::createChatRoom(ChatId(ChatLobbyId(u.mAdditionalId)),QString::number(u.mAdditionalId)); ChatId id = ChatId(ChatLobbyId(u.mAdditionalId));
RetroShareLink l = RetroShareLink::createChatRoom(id, QString::fromStdString(id.toStdString()));
return tr("Message in chat room %1").arg(l.toHtml()) ; return tr("Message in chat room %1").arg(l.toHtml()) ;
} }
case RsIdentityUsage::GLOBAL_ROUTER_SIGNATURE_CHECK: // Global router message validation case RsIdentityUsage::GLOBAL_ROUTER_SIGNATURE_CHECK: // Global router message validation

1
retroshare-gui/src/gui/Posted/PostedItem.cpp
View file

@ -22,6 +22,7 @@
*/ */
#include <QDateTime> #include <QDateTime>
#include <QStyle>
#include "rshare.h" #include "rshare.h"
#include "PostedItem.h" #include "PostedItem.h"

2
retroshare-gui/src/gui/chat/ChatTabWidget.cpp
View file

@ -20,6 +20,8 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include <QTabBar>
#include "ChatTabWidget.h" #include "ChatTabWidget.h"
#include "ui_ChatTabWidget.h" #include "ui_ChatTabWidget.h"
#include "ChatDialog.h" #include "ChatDialog.h"

1
retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
View file

@ -23,6 +23,7 @@
#include <QTimer> #include <QTimer>
#include <QFileInfo> #include <QFileInfo>
#include <QStyle>
#include "rshare.h" #include "rshare.h"
#include "GxsChannelPostItem.h" #include "GxsChannelPostItem.h"

1
retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
View file

@ -23,6 +23,7 @@
#include <QTimer> #include <QTimer>
#include <QFileInfo> #include <QFileInfo>
#include <QStyle>
#include "rshare.h" #include "rshare.h"
#include "GxsForumMsgItem.h" #include "GxsForumMsgItem.h"