From eca11d0885b07b8c2733040499ed9d221271a912 Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Wed, 7 Oct 2020 10:58:52 +0200 Subject: [PATCH] retroshare-gui: fix missing include in jsonapipage Fix compile error, warnings and typo --- libretroshare/src/retroshare/rsgxsforums.h | 2 +- retroshare-gui/src/gui/settings/JsonApiPage.h | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/libretroshare/src/retroshare/rsgxsforums.h b/libretroshare/src/retroshare/rsgxsforums.h index da79a03a5..a5908c902 100644 --- a/libretroshare/src/retroshare/rsgxsforums.h +++ b/libretroshare/src/retroshare/rsgxsforums.h @@ -38,7 +38,7 @@ class RsGxsForums; /** - * Pointer to global instance of RsGxsChannels service implementation + * Pointer to global instance of RsGxsForums service implementation * @jsonapi{development} */ extern RsGxsForums* rsGxsForums; diff --git a/retroshare-gui/src/gui/settings/JsonApiPage.h b/retroshare-gui/src/gui/settings/JsonApiPage.h index f516a541d..04bb9e669 100644 --- a/retroshare-gui/src/gui/settings/JsonApiPage.h +++ b/retroshare-gui/src/gui/settings/JsonApiPage.h @@ -1,7 +1,7 @@ /******************************************************************************* * gui/settings/JsonApiPage.h * * * - * Copyright (C) 2018 Gioacchino Mazzurco * + * Copyright (C) 2018-2020 Gioacchino Mazzurco * * * * This program is free software: you can redistribute it and/or modify * * it under the terms of the GNU Affero General Public License as * @@ -20,7 +20,8 @@ #pragma once -#include +#include "retroshare-gui/configpage.h" +#include "gui/common/FilesDefs.h" #include "ui_JsonApiPage.h" class JsonApiPage : public ConfigPage @@ -30,14 +31,16 @@ class JsonApiPage : public ConfigPage public: JsonApiPage(QWidget * parent = nullptr, Qt::WindowFlags flags = 0); - ~JsonApiPage() {} + ~JsonApiPage() override = default; - /** Loads the settings for this page */ + virtual QPixmap iconPixmap() const override + { + return FilesDefs::getPixmapFromQtResourcePath( + ":/icons/svg/empty-circle.svg" ); + } - virtual QPixmap iconPixmap() const - { return FilesDefs::getPixmapFromQtResourcePath(":/icons/svg/empty-circle.svg"); } - virtual QString pageName() const { return tr("JSON API"); } - virtual QString helpText() const; + virtual QString pageName() const override { return tr("JSON API"); } + virtual QString helpText() const override; /** Call this after start of libretroshare/Retroshare * checks the settings and starts JSON API if required */