diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -10,7 +10,7 @@ ecm_mark_nongui_executable(gentrigrams) TARGET_LINK_LIBRARIES(parsetrigrams PUBLIC Qt5::Core) -TARGET_LINK_LIBRARIES(gentrigrams PUBLIC Qt5::Core) +TARGET_LINK_LIBRARIES(gentrigrams PUBLIC Qt5::Core KF5::SonnetCore) INSTALL(TARGETS parsetrigrams EXPORT KF5SonnetTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) INSTALL(TARGETS gentrigrams EXPORT KF5SonnetTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/data/gentrigrams.cpp b/data/gentrigrams.cpp --- a/data/gentrigrams.cpp +++ b/data/gentrigrams.cpp @@ -25,6 +25,7 @@ #include #include #include +#include "guesslanguage.h" int main(int argc, char *argv[]) { @@ -75,9 +76,8 @@ qDebug() << "Weeding out..."; QMap::iterator i = orderedTrigrams.begin(); - while (orderedTrigrams.size() > 300) { - orderedTrigrams.erase(i); - i++; + while (orderedTrigrams.size() > Sonnet::MAXGRAMS) { + i = orderedTrigrams.erase(i); } qDebug() << "Weeded!"; diff --git a/src/core/guesslanguage.h b/src/core/guesslanguage.h --- a/src/core/guesslanguage.h +++ b/src/core/guesslanguage.h @@ -28,6 +28,9 @@ namespace Sonnet { +// Amount of trigrams in each file +static const int MAXGRAMS = 300; + class GuessLanguagePrivate; /** diff --git a/src/core/guesslanguage.cpp b/src/core/guesslanguage.cpp --- a/src/core/guesslanguage.cpp +++ b/src/core/guesslanguage.cpp @@ -61,9 +61,6 @@ namespace Sonnet { -// Amount of trigrams in each file -static const int MAXGRAMS = 300; - class GuessLanguagePrivate { public: