Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-02 11:16:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tweaks to the GUI for removal of RsIface class.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6585 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2013-08-21 21:39:40 +00:00
parent f93ed1fb6e
commit a45a70a1d5
5 changed files with 13 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

11
retroshare-gui/src/gui/AboutDialog.cpp
View file

@ -24,7 +24,7 @@
#include "HelpDialog.h"
#include <retroshare/rsdisc.h>
#include <retroshare/rsiface.h>
#include <retroshare/rspeers.h>
#include "settings/rsharesettings.h"
#include <QtGui/QHBoxLayout>
@ -53,9 +53,8 @@ AboutDialog::AboutDialog(QWidget* parent)
/* get libretroshare version */
std::map<std::string, std::string>::iterator vit;
std::map<std::string, std::string> versions;
const RsConfig &conf = rsiface->getConfig();
bool retv = rsDisc->getDiscVersions(versions);
if (retv && versions.end() != (vit = versions.find(conf.ownId)))
if (retv && versions.end() != (vit = versions.find(rsPeers->getOwnId())))
{
QString version = QString::fromStdString(vit->second);
setWindowTitle(tr("About RetroShare %1").arg(version));
@ -140,9 +139,8 @@ void AboutDialog::updateTitle() {
/* get libretroshare version */
std::map<std::string, std::string>::iterator vit;
std::map<std::string, std::string> versions;
const RsConfig &conf = rsiface->getConfig();
bool retv = rsDisc->getDiscVersions(versions);
if (retv && versions.end() != (vit = versions.find(conf.ownId)))
if (retv && versions.end() != (vit = versions.find(rsPeers->getOwnId())))
{
QString version = QString::fromStdString(vit->second);
@ -188,9 +186,8 @@ AWidget::AWidget() {
/* get libretroshare version */
std::map<std::string, std::string>::iterator vit;
std::map<std::string, std::string> versions;
const RsConfig &conf = rsiface->getConfig();
bool retv = rsDisc->getDiscVersions(versions);
if (retv && versions.end() != (vit = versions.find(conf.ownId)))
if (retv && versions.end() != (vit = versions.find(rsPeers->getOwnId())))
{
QString version = QString::fromStdString("RetroShare version : \n") + QString::fromStdString(vit->second);
p.drawText(QRect(10, 20, width()-10, 60), version);