diff options
| -rw-r--r-- | alphabetparameters.cpp | 6 | ||||
| -rw-r--r-- | quacker/lister.cpp | 3 | ||||
| -rw-r--r-- | quacker/settings.cpp | 2 | ||||
| -rw-r--r-- | test/testharness.cpp | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/alphabetparameters.cpp b/alphabetparameters.cpp index 851d8ff..4830313 100644 --- a/alphabetparameters.cpp +++ b/alphabetparameters.cpp @@ -214,7 +214,7 @@ LetterString AlphabetParameters::encode(const UVString &word, UVString *leftover if (lookupIt == lookupEnd) { for (alphabetIt = m_alphabet.begin(); alphabetIt != alphabetEnd; ++alphabetIt) - if ((*alphabetIt).blankText() == query) + if (alphabetIt->blankText() == query) break; if (alphabetIt == alphabetEnd) @@ -224,7 +224,7 @@ LetterString AlphabetParameters::encode(const UVString &word, UVString *leftover } blank = true; - ret += blank? setBlankness((*alphabetIt).letter()) : (*alphabetIt).letter(); + ret += blank? setBlankness(alphabetIt->letter()) : alphabetIt->letter(); } else { ret += blank? setBlankness(m_alphabet[lookupIt->second].letter()) : m_alphabet[lookupIt->second].letter(); } @@ -241,7 +241,7 @@ LetterString AlphabetParameters::encode(const UVString &word, UVString *leftover string AlphabetParameters::findAlphabetFile(const string &alphabet) { - return DataManager::self()->findDataFile("alphabets", alphabet); + return DataManager::self()->findDataFile("alphabets", alphabet + ".quackle_alphabet"); } //////// diff --git a/quacker/lister.cpp b/quacker/lister.cpp index 278bff1..be3e335 100644 --- a/quacker/lister.cpp +++ b/quacker/lister.cpp @@ -667,7 +667,6 @@ void NumAnagramsFilter::apply() { int twl = 0; int british = 0; - int playability = 0; QString alphagram(QuackleIO::DictFactory::querier()->alphagram((*it).word)); for (Dict::WordList::Iterator word = map[alphagram].begin(); word != map[alphagram].end(); ++word) @@ -676,8 +675,6 @@ void NumAnagramsFilter::apply() british++; else twl++; - - playability += (*word).playability; } if ((twl == numTwlAnagrams) && (british == numOswOnlyAnagrams)) diff --git a/quacker/settings.cpp b/quacker/settings.cpp index 1febdb5..ce8583f 100644 --- a/quacker/settings.cpp +++ b/quacker/settings.cpp @@ -283,7 +283,7 @@ void Settings::setQuackleToUseAlphabetName(const QString &alphabetName) string alphabetNameStr = alphabetName.toStdString(); if (QUACKLE_ALPHABET_PARAMETERS->alphabetName() != alphabetNameStr) { - QString alphabetFileStr = QuackleIO::Util::stdStringToQString(Quackle::AlphabetParameters::findAlphabetFile(alphabetNameStr + ".quackle_alphabet")); + QString alphabetFileStr = QuackleIO::Util::stdStringToQString(Quackle::AlphabetParameters::findAlphabetFile(alphabetNameStr)); QuackleIO::FlexibleAlphabetParameters *flexure = new QuackleIO::FlexibleAlphabetParameters; flexure->setAlphabetName(alphabetNameStr); diff --git a/test/testharness.cpp b/test/testharness.cpp index 3f390c1..172e403 100644 --- a/test/testharness.cpp +++ b/test/testharness.cpp @@ -193,7 +193,7 @@ void TestHarness::startUp() m_dataManager.setBackupLexicon("twl06"); m_dataManager.setAppDataDirectory("../data"); - QString alphabetFile = QuackleIO::Util::stdStringToQString(Quackle::AlphabetParameters::findAlphabetFile(QuackleIO::Util::qstringToStdString(m_alphabet) + ".quackle_alphabet")); + QString alphabetFile = QuackleIO::Util::stdStringToQString(Quackle::AlphabetParameters::findAlphabetFile(QuackleIO::Util::qstringToStdString(m_alphabet))); QuackleIO::FlexibleAlphabetParameters *flexure = new QuackleIO::FlexibleAlphabetParameters; if (flexure->load(alphabetFile)) { |