From 07b67e9cc90bea746d92711289a212de50ad2fcf Mon Sep 17 00:00:00 2001
From: Phenom <retrosharephenom@gmail.com>
Date: Sun, 19 Mar 2017 10:40:34 +0100
Subject: [PATCH] Fix Clang warnings: 'PopupDistantChatDialog::init' hides
 overloaded virtual function

warning: 'PopupDistantChatDialog::init' hides overloaded virtual
function [-Woverloaded-virtual]
                virtual void init(const DistantChatPeerId& peer_id);
/retroshare-gui/src/gui/chat/PopupChatDialog.h:49: hidden overloaded
virtual function 'PopupChatDialog::init' declared here: different number
of parameters (2 vs 1)
        virtual void init(const ChatId &chat_id, const QString &title);
---
 retroshare-gui/src/gui/chat/ChatDialog.cpp          |  2 +-
 .../src/gui/chat/PopupDistantChatDialog.cpp         | 13 ++++++++-----
 .../src/gui/chat/PopupDistantChatDialog.h           |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/retroshare-gui/src/gui/chat/ChatDialog.cpp b/retroshare-gui/src/gui/chat/ChatDialog.cpp
index 2a52ccf35..9fe8220ab 100644
--- a/retroshare-gui/src/gui/chat/ChatDialog.cpp
+++ b/retroshare-gui/src/gui/chat/ChatDialog.cpp
@@ -109,7 +109,7 @@ void ChatDialog::init(const ChatId &id, const QString &title)
             {
                 PopupDistantChatDialog* pdcd = new PopupDistantChatDialog(id.toDistantChatId());
                 
-                pdcd->init(id.toDistantChatId());
+                pdcd->init(id, "");
                 cd = pdcd;
             } 
             else 
diff --git a/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp b/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp
index 4992b5ff5..dea397310 100644
--- a/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp
+++ b/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp
@@ -63,9 +63,12 @@ PopupDistantChatDialog::PopupDistantChatDialog(const DistantChatPeerId& tunnel_i
 	updateDisplay() ;
 }
 
-void PopupDistantChatDialog::init(const DistantChatPeerId &peer_id)
+void PopupDistantChatDialog::init(const ChatId &chat_id, const QString &/*title*/)
 {
-    _tunnel_id = peer_id;
+    if (!chat_id.isDistantChatId())
+        return;
+
+    _tunnel_id = chat_id.toDistantChatId();
     DistantChatPeerInfo tinfo;
     
     if(!rsMsgs->getDistantChatStatus(_tunnel_id,tinfo))
@@ -74,15 +77,15 @@ void PopupDistantChatDialog::init(const DistantChatPeerId &peer_id)
     RsIdentityDetails iddetails ;
     
     if(rsIdentity->getIdDetails(tinfo.to_id,iddetails))
-	    PopupChatDialog::init(ChatId(peer_id), QString::fromUtf8(iddetails.mNickname.c_str())) ;
+	    PopupChatDialog::init(chat_id, QString::fromUtf8(iddetails.mNickname.c_str())) ;
     else
-	    PopupChatDialog::init(ChatId(peer_id), QString::fromStdString(tinfo.to_id.toStdString())) ;
+	    PopupChatDialog::init(chat_id, QString::fromStdString(tinfo.to_id.toStdString())) ;
 
     // Do not use setOwnId, because we don't want the user to change the GXS avatar from the chat window
     // it will not be transmitted.
 
     ui.ownAvatarWidget->setOwnId() ;			// sets the flag
-    ui.ownAvatarWidget->setId(ChatId(peer_id)) ;	// sets the actual Id
+    ui.ownAvatarWidget->setId(chat_id) ;	// sets the actual Id
 }
 
 void PopupDistantChatDialog::updateDisplay()
diff --git a/retroshare-gui/src/gui/chat/PopupDistantChatDialog.h b/retroshare-gui/src/gui/chat/PopupDistantChatDialog.h
index dfe75b9de..ff05f70c0 100644
--- a/retroshare-gui/src/gui/chat/PopupDistantChatDialog.h
+++ b/retroshare-gui/src/gui/chat/PopupDistantChatDialog.h
@@ -38,7 +38,7 @@ class PopupDistantChatDialog: public PopupChatDialog
 		/** Default destructor */
 		virtual ~PopupDistantChatDialog();
 	
-		virtual void init(const DistantChatPeerId& peer_id);
+		virtual void init(const ChatId& chat_id, const QString &title);
 		virtual void closeEvent(QCloseEvent *e) ;
 	
         virtual QString getPeerName(const ChatId &id) const ;