diff --git a/libretroshare/src/plugins/pluginmanager.cc b/libretroshare/src/plugins/pluginmanager.cc index e3ff4cdd3..ea7099943 100644 --- a/libretroshare/src/plugins/pluginmanager.cc +++ b/libretroshare/src/plugins/pluginmanager.cc @@ -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) { } diff --git a/plugins/VOIP/VOIPPlugin.cpp b/plugins/VOIP/VOIPPlugin.cpp index cbf537ba0..f65002df3 100644 --- a/plugins/VOIP/VOIPPlugin.cpp +++ b/plugins/VOIP/VOIPPlugin.cpp @@ -72,7 +72,7 @@ PopupChatDialog *VOIPPlugin::qt_allocate_new_popup_chat_dialog() 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 { diff --git a/plugins/VOIP/gui/VoipStatistics.h b/plugins/VOIP/gui/VoipStatistics.h index 7f4dcfa38..86639d082 100644 --- a/plugins/VOIP/gui/VoipStatistics.h +++ b/plugins/VOIP/gui/VoipStatistics.h @@ -30,6 +30,8 @@ class VoipStatisticsWidget ; class VoipStatistics: public RsAutoUpdatePage, public Ui::VoipStatistics { + Q_OBJECT + public: VoipStatistics(QWidget *parent = NULL) ; ~VoipStatistics(); @@ -49,6 +51,8 @@ class VoipStatistics: public RsAutoUpdatePage, public Ui::VoipStatistics class VoipStatisticsWidget: public QWidget { + Q_OBJECT + public: VoipStatisticsWidget(QWidget *parent = NULL) ; diff --git a/retroshare-gui/src/gui/RsAutoUpdatePage.cpp b/retroshare-gui/src/gui/RsAutoUpdatePage.cpp index de1e7c1af..fb8ce1816 100644 --- a/retroshare-gui/src/gui/RsAutoUpdatePage.cpp +++ b/retroshare-gui/src/gui/RsAutoUpdatePage.cpp @@ -1,4 +1,3 @@ -#include #include #include "RsAutoUpdatePage.h" diff --git a/retroshare-gui/src/gui/TransfersDialog.cpp b/retroshare-gui/src/gui/TransfersDialog.cpp index c061ab1f1..ce82bc333 100644 --- a/retroshare-gui/src/gui/TransfersDialog.cpp +++ b/retroshare-gui/src/gui/TransfersDialog.cpp @@ -307,7 +307,7 @@ TransfersDialog::TransfersDialog(QWidget *parent) for(int i=0;inbPlugins();++i) 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(); // ui.tunnelInfoWidget->setWidget(trdl);