From 4d96b4c7b0a7560edd1cbb47f4f31938541a53dd Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Sat, 6 Oct 2012 10:51:50 +0200
Subject: Fix a couple of warnings and remove an unused variable.

Change-Id: I1617ef882e9bcaaaafe58a932fadd803851ec88f
---
 rbutil/rbutilqt/base/ttscarbon.h | 3 ---
 rbutil/rbutilqt/base/ttsmssp.h   | 3 +--
 rbutil/rbutilqt/base/ttssapi4.h  | 3 +--
 rbutil/rbutilqt/base/utils.cpp   | 3 +++
 rbutil/rbutilqt/base/ziputil.h   | 1 -
 5 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'rbutil')

diff --git a/rbutil/rbutilqt/base/ttscarbon.h b/rbutil/rbutilqt/base/ttscarbon.h
index 831a2f7fdf..4d7cef24d8 100644
--- a/rbutil/rbutilqt/base/ttscarbon.h
+++ b/rbutil/rbutilqt/base/ttscarbon.h
@@ -67,9 +67,6 @@ class TTSCarbon : public TTSBase
         unsigned int extended2int(unsigned char* buf);
         int convertAiffToWav(const char* aiff, const char* wav);
 
-
-    protected:
-       // static QMap<QString,QString> ttsList;
 };
 
 #endif // TTSCARBON_H
diff --git a/rbutil/rbutilqt/base/ttsmssp.h b/rbutil/rbutilqt/base/ttsmssp.h
index 72300e8f79..6727ed5d37 100644
--- a/rbutil/rbutilqt/base/ttsmssp.h
+++ b/rbutil/rbutilqt/base/ttsmssp.h
@@ -26,10 +26,9 @@
 
 class TTSMssp: public TTSSapi
 {
-    //! Enum to identify the settings
     Q_OBJECT
     public:
-        TTSMssp(QObject* parent=NULL)
+        TTSMssp(QObject* parent=NULL) : TTSSapi(parent)
         {
             m_TTSTemplate = "cscript //nologo \"%exe\" "
                 "/language:%lang /voice:\"%voice\" "
diff --git a/rbutil/rbutilqt/base/ttssapi4.h b/rbutil/rbutilqt/base/ttssapi4.h
index bcfb036107..7964cbfd2b 100644
--- a/rbutil/rbutilqt/base/ttssapi4.h
+++ b/rbutil/rbutilqt/base/ttssapi4.h
@@ -26,10 +26,9 @@
 
 class TTSSapi4: public TTSSapi
 {
-    //! Enum to identify the settings
     Q_OBJECT
     public:
-        TTSSapi4(QObject* parent=NULL)
+        TTSSapi4(QObject* parent=NULL) : TTSSapi(parent)
         {
             m_TTSTemplate = "cscript //nologo \"%exe\" "
                 "/language:%lang /voice:\"%voice\" "
diff --git a/rbutil/rbutilqt/base/utils.cpp b/rbutil/rbutilqt/base/utils.cpp
index eec03fe0ad..6261c36424 100644
--- a/rbutil/rbutilqt/base/utils.cpp
+++ b/rbutil/rbutilqt/base/utils.cpp
@@ -787,6 +787,9 @@ bool Utils::ejectDevice(QString device)
     if(result == noErr && found)
         return true;
 
+#endif
+#if defined(Q_OS_LINUX)
+    (void)device;
 #endif
     return false;
 }
diff --git a/rbutil/rbutilqt/base/ziputil.h b/rbutil/rbutilqt/base/ziputil.h
index 5ea76a03a1..49a1bd3f06 100644
--- a/rbutil/rbutilqt/base/ziputil.h
+++ b/rbutil/rbutilqt/base/ziputil.h
@@ -46,7 +46,6 @@ class ZipUtil : public QObject
     private:
         QList<QuaZipFileInfo> contentProperties();
         QuaZip* m_zip;
-        QuaZipFile* m_file;
 
 };
 #endif
-- 
cgit v1.2.3