From 1d8bb448115c0b7d68b3d717145b43325e7375e2 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@eigenlab.org>
Date: Fri, 5 Oct 2018 01:55:18 +0200
Subject: [PATCH] Fix warnings

---
 libretroshare/src/jsonapi/jsonapi.cpp    | 4 ++--
 libretroshare/src/pqi/p3peermgr.h        | 2 +-
 libretroshare/src/pqi/pqissl.h           | 2 +-
 libretroshare/src/pqi/pqisslpersongrp.h  | 2 +-
 libretroshare/src/retroshare/rsplugin.h  | 2 +-
 libretroshare/src/rsserver/rsaccounts.cc | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libretroshare/src/jsonapi/jsonapi.cpp b/libretroshare/src/jsonapi/jsonapi.cpp
index ad4fd801b..08290a06f 100644
--- a/libretroshare/src/jsonapi/jsonapi.cpp
+++ b/libretroshare/src/jsonapi/jsonapi.cpp
@@ -140,10 +140,10 @@ JsonApiServer::JsonApiServer(uint16_t port, const std::string& bindAddress,
 	}, false);
 
 	registerHandler("/rsControl/rsGlobalShutDown",
-	                [this](const std::shared_ptr<rb::Session> session)
+	                [](const std::shared_ptr<rb::Session> session)
 	{
 		size_t reqSize = session->get_request()->get_header("Content-Length", 0);
-		session->fetch( reqSize, [this](
+		session->fetch( reqSize, [](
 		                const std::shared_ptr<rb::Session> session,
 		                const rb::Bytes& body )
 		{
diff --git a/libretroshare/src/pqi/p3peermgr.h b/libretroshare/src/pqi/p3peermgr.h
index 70d74f141..510fdabce 100644
--- a/libretroshare/src/pqi/p3peermgr.h
+++ b/libretroshare/src/pqi/p3peermgr.h
@@ -103,7 +103,7 @@ class peerState
 };
 
 class RsNodeGroupItem;
-class RsGroupInfo;
+struct RsGroupInfo;
 
 std::string textPeerState(peerState &state);
 
diff --git a/libretroshare/src/pqi/pqissl.h b/libretroshare/src/pqi/pqissl.h
index 712e06a11..13d0eccce 100644
--- a/libretroshare/src/pqi/pqissl.h
+++ b/libretroshare/src/pqi/pqissl.h
@@ -76,7 +76,7 @@ class cert;
 
 class pqissllistener;
 class p3LinkMgr;
-class RsPeerCryptoParams ;
+struct RsPeerCryptoParams;
 
 class pqissl: public NetBinInterface
 {
diff --git a/libretroshare/src/pqi/pqisslpersongrp.h b/libretroshare/src/pqi/pqisslpersongrp.h
index aa574e617..ea94e616a 100644
--- a/libretroshare/src/pqi/pqisslpersongrp.h
+++ b/libretroshare/src/pqi/pqisslpersongrp.h
@@ -25,7 +25,7 @@
 #include "pqi/pqipersongrp.h"
 
 class p3PeerMgr;
-class RsPeerCryptoParams;
+struct RsPeerCryptoParams;
 class pqissl ;
 
 class pqisslpersongrp: public pqipersongrp
diff --git a/libretroshare/src/retroshare/rsplugin.h b/libretroshare/src/retroshare/rsplugin.h
index af553b785..c6b238496 100644
--- a/libretroshare/src/retroshare/rsplugin.h
+++ b/libretroshare/src/retroshare/rsplugin.h
@@ -65,7 +65,7 @@ class ToasterNotify;
 class ChatWidget;
 class ChatWidgetHolder;
 // for gxs based plugins
-class RsIdentity;
+struct RsIdentity;
 class RsNxsNetMgr;
 class RsGxsIdExchange;
 class RsGcxs;
diff --git a/libretroshare/src/rsserver/rsaccounts.cc b/libretroshare/src/rsserver/rsaccounts.cc
index 557981dcc..17ab2d8cc 100644
--- a/libretroshare/src/rsserver/rsaccounts.cc
+++ b/libretroshare/src/rsserver/rsaccounts.cc
@@ -811,7 +811,7 @@ static bool checkAccount(const std::string &accountdir, AccountDetails &account,
 	/* Use RetroShare's exe dir */
 	dataDirectory = ".";
 #elif defined(ANDROID)
-	dataDirectory = defaultBaseDirectory()+"/usr/share/retroshare";
+	dataDirectory = PathBaseDirectory()+"/usr/share/retroshare";
 #elif defined(DATA_DIR)
 	// cppcheck-suppress ConfigurationNotChecked
 	dataDirectory = DATA_DIR;