diff options
-rw-r--r-- | rbutil/rbutilqt/base/talkfile.cpp | 22 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/ttsfestival.cpp | 9 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/ttssapi.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/voicefile.cpp | 14 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/zipinstaller.cpp | 12 |
5 files changed, 31 insertions, 30 deletions
diff --git a/rbutil/rbutilqt/base/talkfile.cpp b/rbutil/rbutilqt/base/talkfile.cpp index 1b1dd934ed..cef53c852b 100644 --- a/rbutil/rbutilqt/base/talkfile.cpp +++ b/rbutil/rbutilqt/base/talkfile.cpp | |||
@@ -49,19 +49,17 @@ bool TalkFileCreator::createTalkFiles() | |||
49 | QCoreApplication::processEvents(); | 49 | QCoreApplication::processEvents(); |
50 | 50 | ||
51 | // generate entries | 51 | // generate entries |
52 | TalkGenerator generator(this); | ||
53 | // no string corrections yet: do not set language for TalkGenerator. | ||
54 | connect(&generator, &TalkGenerator::done, this, &TalkFileCreator::done); | ||
55 | connect(&generator, &TalkGenerator::logItem, this, &TalkFileCreator::logItem); | ||
56 | connect(&generator, &TalkGenerator::logProgress, this, &TalkFileCreator::logProgress); | ||
57 | connect(this, &TalkFileCreator::aborted, &generator, &TalkGenerator::abort); | ||
58 | |||
59 | if(generator.process(&m_talkList) == TalkGenerator::eERROR) | ||
52 | { | 60 | { |
53 | TalkGenerator generator(this); | 61 | doAbort(); |
54 | // no string corrections yet: do not set language for TalkGenerator. | 62 | return false; |
55 | connect(&generator,SIGNAL(done(bool)),this,SIGNAL(done(bool))); | ||
56 | connect(&generator,SIGNAL(logItem(QString,int)),this,SIGNAL(logItem(QString,int))); | ||
57 | connect(&generator,SIGNAL(logProgress(int,int)),this,SIGNAL(logProgress(int,int))); | ||
58 | connect(this,SIGNAL(aborted()),&generator,SLOT(abort())); | ||
59 | |||
60 | if(generator.process(&m_talkList) == TalkGenerator::eERROR) | ||
61 | { | ||
62 | doAbort(); | ||
63 | return false; | ||
64 | } | ||
65 | } | 63 | } |
66 | 64 | ||
67 | // Copying talk files | 65 | // Copying talk files |
diff --git a/rbutil/rbutilqt/base/ttsfestival.cpp b/rbutil/rbutilqt/base/ttsfestival.cpp index b50ad516c7..d0ca400909 100644 --- a/rbutil/rbutilqt/base/ttsfestival.cpp +++ b/rbutil/rbutilqt/base/ttsfestival.cpp | |||
@@ -58,14 +58,17 @@ void TTSFestival::generateSettings() | |||
58 | EncTtsSetting::eSTRINGLIST, tr("Voice:"), | 58 | EncTtsSetting::eSTRINGLIST, tr("Voice:"), |
59 | RbSettings::subValue("festival", RbSettings::TtsVoice), | 59 | RbSettings::subValue("festival", RbSettings::TtsVoice), |
60 | getVoiceList(), EncTtsSetting::eREFRESHBTN); | 60 | getVoiceList(), EncTtsSetting::eREFRESHBTN); |
61 | connect(setting,SIGNAL(refresh()),this,SLOT(updateVoiceList())); | 61 | connect(setting, &EncTtsSetting::refresh, |
62 | connect(setting,SIGNAL(dataChanged()),this,SLOT(clearVoiceDescription())); | 62 | this, &TTSFestival::updateVoiceList); |
63 | connect(setting, &EncTtsSetting::dataChanged, | ||
64 | this, &TTSFestival::clearVoiceDescription); | ||
63 | insertSetting(eVOICE,setting); | 65 | insertSetting(eVOICE,setting); |
64 | 66 | ||
65 | //voice description | 67 | //voice description |
66 | setting = new EncTtsSetting(this,EncTtsSetting::eREADONLYSTRING, | 68 | setting = new EncTtsSetting(this,EncTtsSetting::eREADONLYSTRING, |
67 | tr("Voice description:"),"",EncTtsSetting::eREFRESHBTN); | 69 | tr("Voice description:"),"",EncTtsSetting::eREFRESHBTN); |
68 | connect(setting,SIGNAL(refresh()),this,SLOT(updateVoiceDescription())); | 70 | connect(setting, &EncTtsSetting::refresh, |
71 | this, &TTSFestival::updateVoiceDescription); | ||
69 | insertSetting(eVOICEDESC,setting); | 72 | insertSetting(eVOICEDESC,setting); |
70 | } | 73 | } |
71 | 74 | ||
diff --git a/rbutil/rbutilqt/base/ttssapi.cpp b/rbutil/rbutilqt/base/ttssapi.cpp index ab972445f3..1b326b301e 100644 --- a/rbutil/rbutilqt/base/ttssapi.cpp +++ b/rbutil/rbutilqt/base/ttssapi.cpp | |||
@@ -46,7 +46,7 @@ void TTSSapi::generateSettings() | |||
46 | EncTtsSetting::eSTRINGLIST, tr("Language:"), | 46 | EncTtsSetting::eSTRINGLIST, tr("Language:"), |
47 | RbSettings::subValue(m_TTSType, RbSettings::TtsLanguage), | 47 | RbSettings::subValue(m_TTSType, RbSettings::TtsLanguage), |
48 | langmap.keys()); | 48 | langmap.keys()); |
49 | connect(setting,SIGNAL(dataChanged()),this,SLOT(updateVoiceList())); | 49 | connect(setting, &EncTtsSetting::dataChanged, this, &TTSSapi::updateVoiceList); |
50 | insertSetting(eLANGUAGE,setting); | 50 | insertSetting(eLANGUAGE,setting); |
51 | // voice | 51 | // voice |
52 | setting = new EncTtsSetting(this, | 52 | setting = new EncTtsSetting(this, |
@@ -55,7 +55,7 @@ void TTSSapi::generateSettings() | |||
55 | getVoiceList(RbSettings::subValue(m_TTSType, | 55 | getVoiceList(RbSettings::subValue(m_TTSType, |
56 | RbSettings::TtsLanguage).toString()), | 56 | RbSettings::TtsLanguage).toString()), |
57 | EncTtsSetting::eREFRESHBTN); | 57 | EncTtsSetting::eREFRESHBTN); |
58 | connect(setting,SIGNAL(refresh()),this,SLOT(updateVoiceList())); | 58 | connect(setting, &EncTtsSetting::refresh, this, &TTSSapi::updateVoiceList); |
59 | insertSetting(eVOICE,setting); | 59 | insertSetting(eVOICE,setting); |
60 | //speed | 60 | //speed |
61 | int speed = RbSettings::subValue(m_TTSType, RbSettings::TtsSpeed).toInt(); | 61 | int speed = RbSettings::subValue(m_TTSType, RbSettings::TtsSpeed).toInt(); |
diff --git a/rbutil/rbutilqt/base/voicefile.cpp b/rbutil/rbutilqt/base/voicefile.cpp index 98ab96b8ab..eabf7a721a 100644 --- a/rbutil/rbutilqt/base/voicefile.cpp +++ b/rbutil/rbutilqt/base/voicefile.cpp | |||
@@ -166,9 +166,9 @@ bool VoiceFileCreator::createVoiceFile() | |||
166 | getter = new HttpGet(this); | 166 | getter = new HttpGet(this); |
167 | getter->setFile(downloadFile); | 167 | getter->setFile(downloadFile); |
168 | 168 | ||
169 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 169 | connect(getter, &HttpGet::done, this, &VoiceFileCreator::downloadDone); |
170 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SIGNAL(logProgress(int, int))); | 170 | connect(getter, &HttpGet::dataReadProgress, this, &VoiceFileCreator::logProgress); |
171 | connect(this, SIGNAL(aborted()), getter, SLOT(abort())); | 171 | connect(this, &VoiceFileCreator::aborted, getter, &HttpGet::abort); |
172 | emit logItem(tr("Downloading voice info..."),LOGINFO); | 172 | emit logItem(tr("Downloading voice info..."),LOGINFO); |
173 | getter->getFile(genlangUrl); | 173 | getter->getFile(genlangUrl); |
174 | return true; | 174 | return true; |
@@ -284,10 +284,10 @@ void VoiceFileCreator::create(void) | |||
284 | // set language for string correction. If not set no correction will be made. | 284 | // set language for string correction. If not set no correction will be made. |
285 | if(useCorrection) | 285 | if(useCorrection) |
286 | generator.setLang(m_lang); | 286 | generator.setLang(m_lang); |
287 | connect(&generator,SIGNAL(done(bool)),this,SIGNAL(done(bool))); | 287 | connect(&generator, &TalkGenerator::done, this, &VoiceFileCreator::done); |
288 | connect(&generator,SIGNAL(logItem(QString,int)),this,SIGNAL(logItem(QString,int))); | 288 | connect(&generator, &TalkGenerator::logItem, this, &VoiceFileCreator::logItem); |
289 | connect(&generator,SIGNAL(logProgress(int,int)),this,SIGNAL(logProgress(int,int))); | 289 | connect(&generator, &TalkGenerator::logProgress, this, &VoiceFileCreator::logProgress); |
290 | connect(this,SIGNAL(aborted()),&generator,SLOT(abort())); | 290 | connect(this, &VoiceFileCreator::aborted, &generator, &TalkGenerator::abort); |
291 | 291 | ||
292 | if(generator.process(&m_talkList, m_wavtrimThreshold) == TalkGenerator::eERROR) | 292 | if(generator.process(&m_talkList, m_wavtrimThreshold) == TalkGenerator::eERROR) |
293 | { | 293 | { |
diff --git a/rbutil/rbutilqt/base/zipinstaller.cpp b/rbutil/rbutilqt/base/zipinstaller.cpp index 3376169911..8de6c53b16 100644 --- a/rbutil/rbutilqt/base/zipinstaller.cpp +++ b/rbutil/rbutilqt/base/zipinstaller.cpp | |||
@@ -34,7 +34,7 @@ void ZipInstaller::install() | |||
34 | LOG_INFO() << "initializing installation"; | 34 | LOG_INFO() << "initializing installation"; |
35 | 35 | ||
36 | m_runner = 0; | 36 | m_runner = 0; |
37 | connect(this, SIGNAL(cont()), this, SLOT(installContinue())); | 37 | connect(this, &ZipInstaller::cont, this, &ZipInstaller::installContinue); |
38 | m_url = m_urllist.at(m_runner); | 38 | m_url = m_urllist.at(m_runner); |
39 | m_logsection = m_loglist.at(m_runner); | 39 | m_logsection = m_loglist.at(m_runner); |
40 | m_logver = m_verlist.at(m_runner); | 40 | m_logver = m_verlist.at(m_runner); |
@@ -94,9 +94,9 @@ void ZipInstaller::installStart() | |||
94 | } | 94 | } |
95 | m_getter->setFile(m_downloadFile); | 95 | m_getter->setFile(m_downloadFile); |
96 | 96 | ||
97 | connect(m_getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 97 | connect(m_getter, &HttpGet::done, this, &ZipInstaller::downloadDone); |
98 | connect(m_getter, SIGNAL(dataReadProgress(int, int)), this, SIGNAL(logProgress(int, int))); | 98 | connect(m_getter, &HttpGet::dataReadProgress, this, &ZipInstaller::logProgress); |
99 | connect(this, SIGNAL(internalAborted()), m_getter, SLOT(abort())); | 99 | connect(this, &ZipInstaller::internalAborted, m_getter, &HttpGet::abort); |
100 | 100 | ||
101 | m_getter->getFile(QUrl(m_url)); | 101 | m_getter->getFile(QUrl(m_url)); |
102 | } | 102 | } |
@@ -133,8 +133,8 @@ void ZipInstaller::downloadDone(bool error) | |||
133 | QCoreApplication::processEvents(); | 133 | QCoreApplication::processEvents(); |
134 | 134 | ||
135 | ZipUtil zip(this); | 135 | ZipUtil zip(this); |
136 | connect(&zip, SIGNAL(logProgress(int, int)), this, SIGNAL(logProgress(int, int))); | 136 | connect(&zip, &ZipUtil::logProgress, this, &ZipInstaller::logProgress); |
137 | connect(&zip, SIGNAL(logItem(QString, int)), this, SIGNAL(logItem(QString, int))); | 137 | connect(&zip, &ZipUtil::logItem, this, &ZipInstaller::logItem); |
138 | zip.open(m_file, QuaZip::mdUnzip); | 138 | zip.open(m_file, QuaZip::mdUnzip); |
139 | // check for free space. Make sure after installation will still be | 139 | // check for free space. Make sure after installation will still be |
140 | // some room for operating (also includes calculation mistakes due to | 140 | // some room for operating (also includes calculation mistakes due to |