Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed utf8 characters in the transfer tab name of plugins.

Browse Source 
Added Q_OBJECT to the VoipStatistics classes.
Removed compiler warnings.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5002 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-02-28 18:25:57 +00:00
parent 0d8f65d480
commit 30564fe6ad
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/plugins/pluginmanager.cc
View File

@ -408,7 +408,7 @@ RsCacheService::RsCacheService(uint16_t service_type,uint32_t config_type,uint32
{ {
} }
RsPQIService::RsPQIService(uint16_t service_type,uint32_t config_type,uint32_t tick_delay_in_seconds, RsPluginHandler* pgHandler) RsPQIService::RsPQIService(uint16_t service_type,uint32_t config_type,uint32_t /*tick_delay_in_seconds*/, RsPluginHandler* /*pgHandler*/)
: p3Service(service_type),p3Config(config_type) : p3Service(service_type),p3Config(config_type)
{ {
} }

2
plugins/VOIP/VOIPPlugin.cpp
View File

@ -72,7 +72,7 @@ PopupChatDialog *VOIPPlugin::qt_allocate_new_popup_chat_dialog() const
std::string VOIPPlugin::qt_transfers_tab_name() const std::string VOIPPlugin::qt_transfers_tab_name() const
{ {
return QObject::tr("RTT Statistics").toStdString() ; return QObject::tr("RTT Statistics").toUtf8().constData() ;
} }
RsAutoUpdatePage *VOIPPlugin::qt_transfers_tab() const RsAutoUpdatePage *VOIPPlugin::qt_transfers_tab() const
{ {

4
plugins/VOIP/gui/VoipStatistics.h
View File

@ -30,6 +30,8 @@ class VoipStatisticsWidget ;
class VoipStatistics: public RsAutoUpdatePage, public Ui::VoipStatistics class VoipStatistics: public RsAutoUpdatePage, public Ui::VoipStatistics
{ {
Q_OBJECT
public: public:
VoipStatistics(QWidget *parent = NULL) ; VoipStatistics(QWidget *parent = NULL) ;
~VoipStatistics(); ~VoipStatistics();
@ -49,6 +51,8 @@ class VoipStatistics: public RsAutoUpdatePage, public Ui::VoipStatistics
class VoipStatisticsWidget: public QWidget class VoipStatisticsWidget: public QWidget
{ {
Q_OBJECT
public: public:
VoipStatisticsWidget(QWidget *parent = NULL) ; VoipStatisticsWidget(QWidget *parent = NULL) ;

1
retroshare-gui/src/gui/RsAutoUpdatePage.cpp
View File

@ -1,4 +1,3 @@
#include <iostream>
#include <QTimer> #include <QTimer>
#include "RsAutoUpdatePage.h" #include "RsAutoUpdatePage.h"

2
retroshare-gui/src/gui/TransfersDialog.cpp
View File

@ -307,7 +307,7 @@ TransfersDialog::TransfersDialog(QWidget *parent)
for(int i=0;i<rsPlugins->nbPlugins();++i) for(int i=0;i<rsPlugins->nbPlugins();++i)
if(rsPlugins->plugin(i) != NULL && rsPlugins->plugin(i)->qt_transfers_tab() != NULL) if(rsPlugins->plugin(i) != NULL && rsPlugins->plugin(i)->qt_transfers_tab() != NULL)
ui.tabWidget->addTab( rsPlugins->plugin(i)->qt_transfers_tab(),QString::fromStdString(rsPlugins->plugin(i)->qt_transfers_tab_name()) ) ; ui.tabWidget->addTab( rsPlugins->plugin(i)->qt_transfers_tab(),QString::fromUtf8(rsPlugins->plugin(i)->qt_transfers_tab_name().c_str()) ) ;
// TurtleRouterDialog *trdl = new TurtleRouterDialog(); // TurtleRouterDialog *trdl = new TurtleRouterDialog();
// ui.tunnelInfoWidget->setWidget(trdl); // ui.tunnelInfoWidget->setWidget(trdl);