aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--backends/text-to-speech/linux/linux-text-to-speech.h2
-rw-r--r--backends/text-to-speech/windows/windows-text-to-speech.h2
-rw-r--r--common/text-to-speech.cpp2
-rw-r--r--common/text-to-speech.h6
-rw-r--r--engines/testbed/speech.cpp2
-rw-r--r--gui/themes/scummclassic/classic_layout.stx10
-rw-r--r--gui/themes/scummclassic/classic_layout_lowres.stx8
-rw-r--r--gui/themes/scummmodern/scummmodern_layout.stx10
-rw-r--r--gui/themes/scummmodern/scummmodern_layout_lowres.stx8
-rw-r--r--gui/themes/scummremastered/remastered_layout.stx2
-rw-r--r--gui/widgets/popup.cpp2
-rw-r--r--gui/widgets/tab.cpp2
12 files changed, 28 insertions, 28 deletions
diff --git a/backends/text-to-speech/linux/linux-text-to-speech.h b/backends/text-to-speech/linux/linux-text-to-speech.h
index 33f15daccb..33135d29d9 100644
--- a/backends/text-to-speech/linux/linux-text-to-speech.h
+++ b/backends/text-to-speech/linux/linux-text-to-speech.h
@@ -66,7 +66,7 @@ public:
virtual bool isSpeaking();
virtual bool isPaused();
virtual bool isReady();
-
+
virtual void setVoice(unsigned index);
virtual void setRate(int rate);
virtual void setPitch(int pitch);
diff --git a/backends/text-to-speech/windows/windows-text-to-speech.h b/backends/text-to-speech/windows/windows-text-to-speech.h
index cbf3eb07df..cc94107291 100644
--- a/backends/text-to-speech/windows/windows-text-to-speech.h
+++ b/backends/text-to-speech/windows/windows-text-to-speech.h
@@ -60,7 +60,7 @@ public:
virtual bool isSpeaking();
virtual bool isPaused();
virtual bool isReady();
-
+
virtual void setVoice(unsigned index);
virtual void setRate(int rate);
diff --git a/common/text-to-speech.cpp b/common/text-to-speech.cpp
index f9dc4c69aa..cdfc8ab77f 100644
--- a/common/text-to-speech.cpp
+++ b/common/text-to-speech.cpp
@@ -36,7 +36,7 @@ TTSVoice::TTSVoice()
*_refCount = 1;
}
-TTSVoice::TTSVoice(Gender gender, Age age, void *data, String description)
+TTSVoice::TTSVoice(Gender gender, Age age, void *data, String description)
: _gender(gender)
, _age(age)
, _data(data)
diff --git a/common/text-to-speech.h b/common/text-to-speech.h
index 68676567a3..d4f6c68048 100644
--- a/common/text-to-speech.h
+++ b/common/text-to-speech.h
@@ -144,7 +144,7 @@ public:
DROP
};
/**
- * The constructor sets the language to the translation manager language if
+ * The constructor sets the language to the translation manager language if
* USE_TRANSLATION is defined, or english when it isn't defined. It sets the rate,
* pitch and volume to their middle values.
*/
@@ -209,7 +209,7 @@ public:
* Returns true, if the TTS engine is ready to speak (isn't speaking and isn't paused)
*/
virtual bool isReady() { return false; }
-
+
/**
* Sets a voice to be used by the TTS.
*
@@ -284,7 +284,7 @@ public:
* have the needed gender.
*
* @param gender Gender, which indices should be returned
- *
+ *
* @return Array of indices into _availableVoices
*/
Array<int> getVoiceIndicesByGender (TTSVoice::Gender gender);
diff --git a/engines/testbed/speech.cpp b/engines/testbed/speech.cpp
index cf51f1a0a7..895a926f99 100644
--- a/engines/testbed/speech.cpp
+++ b/engines/testbed/speech.cpp
@@ -311,7 +311,7 @@ TestExitStatus Speechtests::testStateStacking() {
ttsMan->pushState();
Common::Array<int> femaleVoices = ttsMan->getVoiceIndicesByGender(Common::TTSVoice::FEMALE);
Common::Array<Common::TTSVoice> allVoices = ttsMan->getVoicesArray();
- if (femaleVoices.size() == 0)
+ if (femaleVoices.size() == 0)
ttsMan->setVoice(1 % allVoices.size());
else
ttsMan->setVoice(femaleVoices[0]);
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 14f1bb733c..84bd056d9d 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -824,7 +824,7 @@
</dialog>
<dialog name = 'GlobalOptions_Cloud_ConnectionWizard' overlays = 'Dialog.GlobalOptions'>
- <layout type = 'vertical' padding = '0, 0, 0, 0'>
+ <layout type = 'vertical' padding = '0, 0, 0, 0'>
<widget name = 'Container'/>
</layout>
</dialog>
@@ -918,11 +918,11 @@
<dialog name='GlobalOptions_Accessibility' overlays='Dialog.GlobalOptions.TabWidget'>
<layout type='vertical' padding='16,16,16,16' spacing='16'>
- <widget name='TTSCheckbox'
- type='Checkbox'
+ <widget name='TTSCheckbox'
+ type='Checkbox'
/>
- <widget name='TTSVoiceSelection'
- type='PopUp'
+ <widget name='TTSVoiceSelection'
+ type='PopUp'
/>
</layout>
</dialog>
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index f2bbb00e95..e1d90fff50 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -919,11 +919,11 @@
</dialog>
<dialog name='GlobalOptions_Accessibility' overlays='Dialog.GlobalOptions.TabWidget'>
<layout type='vertical' padding='16,16,16,16' spacing='16'>
- <widget name='TTSCheckbox'
- type='Checkbox'
+ <widget name='TTSCheckbox'
+ type='Checkbox'
/>
- <widget name='TTSVoiceSelection'
- type='PopUp'
+ <widget name='TTSVoiceSelection'
+ type='PopUp'
/>
</layout>
</dialog>
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index 28a72659c3..a45dd3edca 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -838,7 +838,7 @@
</dialog>
<dialog name = 'GlobalOptions_Cloud_ConnectionWizard' overlays = 'Dialog.GlobalOptions'>
- <layout type = 'vertical' padding = '0, 0, 0, 0'>
+ <layout type = 'vertical' padding = '0, 0, 0, 0'>
<widget name = 'Container'/>
</layout>
</dialog>
@@ -932,11 +932,11 @@
<dialog name='GlobalOptions_Accessibility' overlays='Dialog.GlobalOptions.TabWidget'>
<layout type='vertical' padding='16,16,16,16' spacing='16'>
- <widget name='TTSCheckbox'
- type='Checkbox'
+ <widget name='TTSCheckbox'
+ type='Checkbox'
/>
- <widget name='TTSVoiceSelection'
- type='PopUp'
+ <widget name='TTSVoiceSelection'
+ type='PopUp'
/>
</layout>
</dialog>
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index 85745349e4..62c0ff2ae0 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -918,11 +918,11 @@
<dialog name='GlobalOptions_Accessibility' overlays='Dialog.GlobalOptions.TabWidget'>
<layout type='vertical' padding='16,16,16,16' spacing='16'>
- <widget name='TTSCheckbox'
- type='Checkbox'
+ <widget name='TTSCheckbox'
+ type='Checkbox'
/>
- <widget name='TTSVoiceSelection'
- type='PopUp'
+ <widget name='TTSVoiceSelection'
+ type='PopUp'
/>
</layout>
</dialog>
diff --git a/gui/themes/scummremastered/remastered_layout.stx b/gui/themes/scummremastered/remastered_layout.stx
index 7543304541..092bbc0134 100644
--- a/gui/themes/scummremastered/remastered_layout.stx
+++ b/gui/themes/scummremastered/remastered_layout.stx
@@ -838,7 +838,7 @@
</dialog>
<dialog name = 'GlobalOptions_Cloud_ConnectionWizard' overlays = 'Dialog.GlobalOptions'>
- <layout type = 'vertical' padding = '0, 0, 0, 0'>
+ <layout type = 'vertical' padding = '0, 0, 0, 0'>
<widget name = 'Container'/>
</layout>
</dialog>
diff --git a/gui/widgets/popup.cpp b/gui/widgets/popup.cpp
index 2fce6e126f..970e35ab23 100644
--- a/gui/widgets/popup.cpp
+++ b/gui/widgets/popup.cpp
@@ -55,7 +55,7 @@ public:
void handleMouseUp(int x, int y, int button, int clickCount) override;
void handleMouseWheel(int x, int y, int direction) override; // Scroll through entries with scroll wheel
void handleMouseMoved(int x, int y, int button) override; // Redraw selections depending on mouse position
- void handleMouseLeft(int button) override;
+ void handleMouseLeft(int button) override;
void handleKeyDown(Common::KeyState state) override; // Scroll through entries with arrow keys etc.
protected:
diff --git a/gui/widgets/tab.cpp b/gui/widgets/tab.cpp
index 103f57291a..8c136ba467 100644
--- a/gui/widgets/tab.cpp
+++ b/gui/widgets/tab.cpp
@@ -237,7 +237,7 @@ void TabWidget::handleMouseMoved(int x, int y, int button) {
_lastRead = tabID;
}
}
- else
+ else
_lastRead = -1;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 05:28:56 +0000