diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-10-06 10:51:50 +0200 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-10-06 13:53:09 +0200 |
| commit | 4d96b4c7b0a7560edd1cbb47f4f31938541a53dd (patch) | |
| tree | 4992776eb977e9bdc0fe8374a37564dff86fff1a | |
| parent | c659f9979a482521950c6db74221330dc1895219 (diff) | |
| download | rockbox-4d96b4c7b0a7560edd1cbb47f4f31938541a53dd.zip rockbox-4d96b4c7b0a7560edd1cbb47f4f31938541a53dd.tar.gz rockbox-4d96b4c7b0a7560edd1cbb47f4f31938541a53dd.tar.bz2 rockbox-4d96b4c7b0a7560edd1cbb47f4f31938541a53dd.tar.xz | |
Fix a couple of warnings and remove an unused variable.
Change-Id: I1617ef882e9bcaaaafe58a932fadd803851ec88f
| -rw-r--r-- | rbutil/rbutilqt/base/ttscarbon.h | 3 | ||||
| -rw-r--r-- | rbutil/rbutilqt/base/ttsmssp.h | 3 | ||||
| -rw-r--r-- | rbutil/rbutilqt/base/ttssapi4.h | 3 | ||||
| -rw-r--r-- | rbutil/rbutilqt/base/utils.cpp | 3 | ||||
| -rw-r--r-- | rbutil/rbutilqt/base/ziputil.h | 1 |
5 files changed, 5 insertions, 8 deletions
diff --git a/rbutil/rbutilqt/base/ttscarbon.h b/rbutil/rbutilqt/base/ttscarbon.h index 831a2f7..4d7cef2 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 72300e8..6727ed5 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 bcfb036..7964cbf 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 eec03fe..6261c36 100644 --- a/rbutil/rbutilqt/base/utils.cpp +++ b/rbutil/rbutilqt/base/utils.cpp @@ -788,6 +788,9 @@ bool Utils::ejectDevice(QString device) 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 5ea76a0..49a1bd3 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 |