Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-25 23:49:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

retroshare-gui: fix missing include in jsonapipage

Browse Source 
Fix compile error, warnings and typo
This commit is contained in:
Gioacchino Mazzurco 2020-10-07 10:58:52 +02:00
parent 5006ee1399
commit eca11d0885
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/retroshare/rsgxsforums.h
View File

@ -38,7 +38,7 @@
class RsGxsForums; class RsGxsForums;
/** /**
* Pointer to global instance of RsGxsChannels service implementation * Pointer to global instance of RsGxsForums service implementation
* @jsonapi{development} * @jsonapi{development}
*/ */
extern RsGxsForums* rsGxsForums; extern RsGxsForums* rsGxsForums;

19
retroshare-gui/src/gui/settings/JsonApiPage.h
View File

@ -1,7 +1,7 @@
/******************************************************************************* /*******************************************************************************
* gui/settings/JsonApiPage.h * * gui/settings/JsonApiPage.h *
* * * *
* Copyright (C) 2018 Gioacchino Mazzurco <gio@eigenlab.org> * * Copyright (C) 2018-2020 Gioacchino Mazzurco <gio@eigenlab.org> *
* * * *
* This program is free software: you can redistribute it and/or modify * * This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Affero General Public License as * * it under the terms of the GNU Affero General Public License as *
@ -20,7 +20,8 @@
#pragma once #pragma once
#include <retroshare-gui/configpage.h> #include "retroshare-gui/configpage.h"
#include "gui/common/FilesDefs.h"
#include "ui_JsonApiPage.h" #include "ui_JsonApiPage.h"
class JsonApiPage : public ConfigPage class JsonApiPage : public ConfigPage
@ -30,14 +31,16 @@ class JsonApiPage : public ConfigPage
public: public:
JsonApiPage(QWidget * parent = nullptr, Qt::WindowFlags flags = 0); 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 virtual QString pageName() const override { return tr("JSON API"); }
{ return FilesDefs::getPixmapFromQtResourcePath(":/icons/svg/empty-circle.svg"); } virtual QString helpText() const override;
virtual QString pageName() const { return tr("JSON API"); }
virtual QString helpText() const;
/** Call this after start of libretroshare/Retroshare /** Call this after start of libretroshare/Retroshare
* checks the settings and starts JSON API if required */ * checks the settings and starts JSON API if required */