diff options
-rw-r--r-- | utils/rbutilqt/base/talkfile.cpp | 12 | ||||
-rw-r--r-- | utils/rbutilqt/base/talkgenerator.cpp | 1 |
2 files changed, 8 insertions, 5 deletions
diff --git a/utils/rbutilqt/base/talkfile.cpp b/utils/rbutilqt/base/talkfile.cpp index 4c9cae5a16..c9876a81f9 100644 --- a/utils/rbutilqt/base/talkfile.cpp +++ b/utils/rbutilqt/base/talkfile.cpp | |||
@@ -169,16 +169,20 @@ bool TalkFileCreator::createTalkList(QDir startDir) | |||
169 | else // its a File | 169 | else // its a File |
170 | { | 170 | { |
171 | // insert into List | 171 | // insert into List |
172 | if( !fileInf.fileName().isEmpty() && !fileInf.fileName().endsWith(".talk") && m_talkFiles) | 172 | if(!fileInf.fileName().isEmpty() |
173 | && !fileInf.fileName().endsWith(".talk") | ||
174 | && m_talkFiles) | ||
173 | { | 175 | { |
174 | //test if we should ignore this file | 176 | //test if we should ignore this file |
175 | bool match = false; | 177 | bool match = false; |
176 | for(int i=0; i < m_ignoreFiles.size();i++) | 178 | for(int i=0; i < m_ignoreFiles.size();i++) |
177 | { | 179 | { |
178 | QRegExp rx(m_ignoreFiles[i].trimmed()); | 180 | QRegularExpression rx( |
179 | rx.setPatternSyntax(QRegExp::Wildcard); | 181 | QRegularExpression::wildcardToRegularExpression( |
180 | if(rx.exactMatch(fileInf.fileName())) | 182 | (m_ignoreFiles[i].trimmed()))); |
183 | if(rx.match(fileInf.fileName()).hasMatch()) | ||
181 | match = true; | 184 | match = true; |
185 | |||
182 | } | 186 | } |
183 | if(match) | 187 | if(match) |
184 | continue; | 188 | continue; |
diff --git a/utils/rbutilqt/base/talkgenerator.cpp b/utils/rbutilqt/base/talkgenerator.cpp index 6798d53829..eb000bf188 100644 --- a/utils/rbutilqt/base/talkgenerator.cpp +++ b/utils/rbutilqt/base/talkgenerator.cpp | |||
@@ -275,7 +275,6 @@ QString TalkGenerator::correctString(QString s) | |||
275 | LOG_INFO() << "corrected string" << s << "to" << corrected; | 275 | LOG_INFO() << "corrected string" << s << "to" << corrected; |
276 | 276 | ||
277 | return corrected; | 277 | return corrected; |
278 | m_abort = true; | ||
279 | } | 278 | } |
280 | 279 | ||
281 | void TalkGenerator::setLang(QString name) | 280 | void TalkGenerator::setLang(QString name) |