From e0225efef35068800241d02ff4cee25c1a9e8a9e Mon Sep 17 00:00:00 2001 From: Phenom Date: Sat, 18 Mar 2017 11:19:42 +0100 Subject: [PATCH] Fix Clang warnings: 'ChatLobbyDialog::init' hides overloaded virtual function warning: 'ChatLobbyDialog::init' hides overloaded virtual function [- Woverloaded-virtual] virtual void init(); ^ /retroshare-gui/src/gui/chat/ChatDialog.h:87: hidden overloaded virtual function 'ChatDialog::init' declared here: different number of parameters (2 vs 0) virtual void init(ChatId id, const QString &title); ^ --- retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp | 5 +++++ retroshare-gui/src/gui/chat/ChatLobbyDialog.h | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp index 4056156bb..c5dec3a67 100644 --- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp +++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp @@ -304,6 +304,11 @@ void ChatLobbyDialog::showInPeopleTab() idDialog->navigate(nickname); } +void ChatLobbyDialog::init(ChatId /*id*/, const QString &/*title*/) +{ + init(); +} + void ChatLobbyDialog::init() { ChatLobbyInfo linfo ; diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.h b/retroshare-gui/src/gui/chat/ChatLobbyDialog.h index 40fb44014..2dd66a554 100644 --- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.h +++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.h @@ -71,7 +71,8 @@ protected: virtual ~ChatLobbyDialog(); void processSettings(bool load); - virtual void init(); + virtual void init(ChatId id, const QString &title); + void init(); virtual bool canClose(); virtual void addChatMsg(const ChatMessage &msg);