Miroirs/eliot
1
0
Fork 0
mirror of git://git.savannah.nongnu.org/eliot.git synced 2025-01-18 10:26:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed a bug and added a sanity checks (no duplicate entries in the word list)

Browse source
This commit is contained in:
Olivier Teulière 2010-05-16 10:05:09 +00:00
parent 80ca8844d9
commit 32a252c96b
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
qt/dic_wizard.cpp
View file

@ -99,11 +99,13 @@ bool WizardInfoPage::validatePage()
if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
return false;
QSet<QString> words;
QMap<QChar, int> lettersWithLine;
int lineNb = 1;
QTextStream in(&file);
while (!in.atEnd()) {
QString line = in.readLine().toUpper();
words.insert(line);
for (int i = 0; i < line.size(); ++i)
{
if (!lettersWithLine.contains(line[i]))
@ -136,7 +138,17 @@ bool WizardInfoPage::validatePage()
QMessageBox::Ok);
errorBox.setInformativeText(_q("Please correct the word list."));
errorBox.exec();
return false;
}
// Detect duplicate entries in the word list
if (words.size() != lineNb - 1)
{
QString msg = _q("The word list contains duplicate entries.");
QMessageBox errorBox(QMessageBox::Critical, _q("Eliot"), msg,
QMessageBox::Ok);
errorBox.setInformativeText(_q("Please correct the word list."));
errorBox.exec();
return false;
}
@ -234,7 +246,7 @@ void WizardLettersDefPage::loadLettersFromWordList()
m_model->setData(m_model->index(rowNum, 3),
(bool)QString("AEIOUY").contains(ch));
m_model->setData(m_model->index(rowNum, 4),
(bool)QString("AEIOU").contains(ch));
!(bool)QString("AEIOU").contains(ch));
}
// Add another line for the joker