diff options
Diffstat (limited to 'rbutil/rbutilqt')
-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 831a2f7fdf..4d7cef24d8 100644 --- a/rbutil/rbutilqt/base/ttscarbon.h +++ b/rbutil/rbutilqt/base/ttscarbon.h | |||
@@ -67,9 +67,6 @@ class TTSCarbon : public TTSBase | |||
67 | unsigned int extended2int(unsigned char* buf); | 67 | unsigned int extended2int(unsigned char* buf); |
68 | int convertAiffToWav(const char* aiff, const char* wav); | 68 | int convertAiffToWav(const char* aiff, const char* wav); |
69 | 69 | ||
70 | |||
71 | protected: | ||
72 | // static QMap<QString,QString> ttsList; | ||
73 | }; | 70 | }; |
74 | 71 | ||
75 | #endif // TTSCARBON_H | 72 | #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 @@ | |||
26 | 26 | ||
27 | class TTSMssp: public TTSSapi | 27 | class TTSMssp: public TTSSapi |
28 | { | 28 | { |
29 | //! Enum to identify the settings | ||
30 | Q_OBJECT | 29 | Q_OBJECT |
31 | public: | 30 | public: |
32 | TTSMssp(QObject* parent=NULL) | 31 | TTSMssp(QObject* parent=NULL) : TTSSapi(parent) |
33 | { | 32 | { |
34 | m_TTSTemplate = "cscript //nologo \"%exe\" " | 33 | m_TTSTemplate = "cscript //nologo \"%exe\" " |
35 | "/language:%lang /voice:\"%voice\" " | 34 | "/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 @@ | |||
26 | 26 | ||
27 | class TTSSapi4: public TTSSapi | 27 | class TTSSapi4: public TTSSapi |
28 | { | 28 | { |
29 | //! Enum to identify the settings | ||
30 | Q_OBJECT | 29 | Q_OBJECT |
31 | public: | 30 | public: |
32 | TTSSapi4(QObject* parent=NULL) | 31 | TTSSapi4(QObject* parent=NULL) : TTSSapi(parent) |
33 | { | 32 | { |
34 | m_TTSTemplate = "cscript //nologo \"%exe\" " | 33 | m_TTSTemplate = "cscript //nologo \"%exe\" " |
35 | "/language:%lang /voice:\"%voice\" " | 34 | "/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 | |||
@@ -788,6 +788,9 @@ bool Utils::ejectDevice(QString device) | |||
788 | return true; | 788 | return true; |
789 | 789 | ||
790 | #endif | 790 | #endif |
791 | #if defined(Q_OS_LINUX) | ||
792 | (void)device; | ||
793 | #endif | ||
791 | return false; | 794 | return false; |
792 | } | 795 | } |
793 | 796 | ||
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 | |||
46 | private: | 46 | private: |
47 | QList<QuaZipFileInfo> contentProperties(); | 47 | QList<QuaZipFileInfo> contentProperties(); |
48 | QuaZip* m_zip; | 48 | QuaZip* m_zip; |
49 | QuaZipFile* m_file; | ||
50 | 49 | ||
51 | }; | 50 | }; |
52 | #endif | 51 | #endif |