From 9aa6478910eba298959522cc8979e4ce410a1fa0 Mon Sep 17 00:00:00 2001
From: thunder2 <retroshare.project@gmail.com>
Date: Sun, 30 Sep 2012 09:38:13 +0000
Subject: [PATCH] VOIP: Fixed some compiler warnings and removed unnecessary
 translations.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5622 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 plugins/VOIP/gui/AudioInputConfig.ui      | 3 ---
 plugins/VOIP/gui/AudioPopupChatDialog.cpp | 1 +
 plugins/VOIP/gui/AudioWizard.ui           | 2 +-
 plugins/VOIP/gui/PluginGUIHandler.cpp     | 6 +++---
 plugins/VOIP/gui/SpeexProcessor.cpp       | 2 +-
 plugins/VOIP/gui/VoipStatistics.ui        | 8 +-------
 6 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/plugins/VOIP/gui/AudioInputConfig.ui b/plugins/VOIP/gui/AudioInputConfig.ui
index 806d1ba6f..e696e09a6 100644
--- a/plugins/VOIP/gui/AudioInputConfig.ui
+++ b/plugins/VOIP/gui/AudioInputConfig.ui
@@ -10,9 +10,6 @@
     <height>378</height>
    </rect>
   </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
   <layout class="QVBoxLayout" name="qwVadLayout">
    <item>
     <widget class="QPushButton" name="qpbAudioWizard">
diff --git a/plugins/VOIP/gui/AudioPopupChatDialog.cpp b/plugins/VOIP/gui/AudioPopupChatDialog.cpp
index f4fd778e9..590f94224 100644
--- a/plugins/VOIP/gui/AudioPopupChatDialog.cpp
+++ b/plugins/VOIP/gui/AudioPopupChatDialog.cpp
@@ -5,6 +5,7 @@
 #include "interface/rsvoip.h"
 
 AudioPopupChatDialog::AudioPopupChatDialog(QWidget *parent)
+	: PopupChatDialog(parent)
 {
 	audioListenToggleButton = new QPushButton ;
 	audioListenToggleButton->setMinimumSize(QSize(28,28)) ;
diff --git a/plugins/VOIP/gui/AudioWizard.ui b/plugins/VOIP/gui/AudioWizard.ui
index d89e8b7ac..ce4e1c970 100644
--- a/plugins/VOIP/gui/AudioWizard.ui
+++ b/plugins/VOIP/gui/AudioWizard.ui
@@ -188,7 +188,7 @@
       <item>
        <widget class="QLabel" name="label_2">
         <property name="text">
-         <string>todo shortcut</string>
+         <string notr="true">todo shortcut</string>
         </property>
        </widget>
       </item>
diff --git a/plugins/VOIP/gui/PluginGUIHandler.cpp b/plugins/VOIP/gui/PluginGUIHandler.cpp
index 6c3a236c5..2b2fe8ab2 100644
--- a/plugins/VOIP/gui/PluginGUIHandler.cpp
+++ b/plugins/VOIP/gui/PluginGUIHandler.cpp
@@ -6,17 +6,17 @@
 #include <gui/chat/ChatDialog.h>
 #include <gui/AudioPopupChatDialog.h>
 
-void PluginGUIHandler::ReceivedInvitation(const QString& peer_id) 
+void PluginGUIHandler::ReceivedInvitation(const QString& /*peer_id*/)
 {
         std::cerr << "****** Plugin GUI handler: received Invitation!" << std::endl;
 }
 
-void PluginGUIHandler::ReceivedVoipHangUp(const QString& peer_id) 
+void PluginGUIHandler::ReceivedVoipHangUp(const QString& /*peer_id*/)
 {
 	std::cerr << "****** Plugin GUI handler: received HangUp!" << std::endl;
 }
 
-void PluginGUIHandler::ReceivedVoipAccept(const QString& peer_id) 
+void PluginGUIHandler::ReceivedVoipAccept(const QString& /*peer_id*/)
 {
 	std::cerr << "****** Plugin GUI handler: received VoipAccept!" << std::endl;
 }
diff --git a/plugins/VOIP/gui/SpeexProcessor.cpp b/plugins/VOIP/gui/SpeexProcessor.cpp
index d159cc55d..edfd1ce3f 100644
--- a/plugins/VOIP/gui/SpeexProcessor.cpp
+++ b/plugins/VOIP/gui/SpeexProcessor.cpp
@@ -431,7 +431,7 @@ bool SpeexOutputProcessor::isSequential() const {
         return true;
 }
 
-void SpeexOutputProcessor::speex_jitter_init(SpeexJitter *jit, void *decoder, int sampling_rate)
+void SpeexOutputProcessor::speex_jitter_init(SpeexJitter *jit, void *decoder, int /*sampling_rate*/)
 {
    jit->dec = decoder;
    speex_decoder_ctl(decoder, SPEEX_GET_FRAME_SIZE, &jit->frame_size);
diff --git a/plugins/VOIP/gui/VoipStatistics.ui b/plugins/VOIP/gui/VoipStatistics.ui
index ae1c3c650..c9ffa07c1 100644
--- a/plugins/VOIP/gui/VoipStatistics.ui
+++ b/plugins/VOIP/gui/VoipStatistics.ui
@@ -13,10 +13,6 @@
   <property name="windowTitle">
    <string>VoipTest Statistics</string>
   </property>
-  <property name="windowIcon">
-   <iconset resource="images.qrc">
-    <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
-  </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QSplitter" name="splitter">
@@ -48,8 +44,6 @@
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="images.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>