[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [simon] /: String fixes: Deprecating "wordlist"
From:       Peter Grasch <grasch () simon-listens ! org>
Date:       2013-02-04 13:49:49
Message-ID: 20130204134949.03224A6091 () git ! kde ! org
[Download RAW message or body]

Git commit d428e74ff560a404fd602fb0280bcff69d6ad5c8 by Peter Grasch.
Committed on 04/02/2013 at 11:26.
Pushed by grasch into branch 'master'.

String fixes: Deprecating "wordlist"

M  +1    -1    simon/src/simonmodelmanagementui/AddWord/addwordview.cpp
M  +2    -2    simon/src/simonmodelmanagementui/ImportDict/importdict.cpp
M  +1    -1    simon/src/simonmodelmanagementui/ImportGrammar/importgrammarwizard.cpp
M  +1    -1    simon/src/simonmodelmanagementui/grammarview.ui
M  +1    -9    simon/src/simonmodelmanagementui/vocabularyview.cpp
M  +1    -1    simon/src/simonrecognitioncontrol/recognitioncontrol.cpp
M  +1    -2    simonlib/simonscenarios/trainingmanager.cpp

http://commits.kde.org/simon/d428e74ff560a404fd602fb0280bcff69d6ad5c8

diff --git a/simon/src/simonmodelmanagementui/AddWord/addwordview.cpp \
b/simon/src/simonmodelmanagementui/AddWord/addwordview.cpp index cc43073..b0961f9 \
                100644
--- a/simon/src/simonmodelmanagementui/AddWord/addwordview.cpp
+++ b/simon/src/simonmodelmanagementui/AddWord/addwordview.cpp
@@ -190,7 +190,7 @@ QWizardPage* AddWordView::createFinishedPage()
 
 
 /**
- * \brief Adds the list of words to the wordlistmanager
+ * \brief Adds the list of words to the current scenario
  */
 void AddWordView::commitList()
 {
diff --git a/simon/src/simonmodelmanagementui/ImportDict/importdict.cpp \
b/simon/src/simonmodelmanagementui/ImportDict/importdict.cpp index 86e6f52..fdc194d \
                100644
--- a/simon/src/simonmodelmanagementui/ImportDict/importdict.cpp
+++ b/simon/src/simonmodelmanagementui/ImportDict/importdict.cpp
@@ -41,7 +41,7 @@ deleteFileWhenDone(false)
 
 
 /**
- * \brief Parses the wordlist of an existing dictionary
+ * \brief Parses the list of words of an existing dictionary
  * \author Peter Grasch
  */
 void ImportDict::parseWordList(QString pathToDict, QString encoding, int type, bool \
deleteFileWhenDone) @@ -65,7 +65,7 @@ QList<Word*> ImportDict::getCurrentWordList()
 /**
  * \brief The main execution loop
  * Does the real work.
- * Uses the members pathToDict to get the location and writes the finished wordlist \
to the member wordList + * Uses the members pathToDict to get the location and writes \
                the finished list of word to the member wordList
  * \author Peter Grasch
  */
 void ImportDict::run()
diff --git a/simon/src/simonmodelmanagementui/ImportGrammar/importgrammarwizard.cpp \
b/simon/src/simonmodelmanagementui/ImportGrammar/importgrammarwizard.cpp index \
                8dfde7c..2097670 100644
--- a/simon/src/simonmodelmanagementui/ImportGrammar/importgrammarwizard.cpp
+++ b/simon/src/simonmodelmanagementui/ImportGrammar/importgrammarwizard.cpp
@@ -52,7 +52,7 @@ QWizardPage* ImportGrammarWizard::createIntroPage()
     "grammar parser which will look up every single word in your dictionary-"
     "corpus. If the word is found its terminal will be added to the sentence. "
     "This way the parsers will find valid grammatical sentences on terminal "
-    "level.\n\nThis process requires a large shadow-lexicon containing terminal \
information or targeted input " +    "level.\n\nThis process requires a large shadow \
dictionary containing terminal information or targeted input "  "material."));
 
   return intro;
diff --git a/simon/src/simonmodelmanagementui/grammarview.ui \
b/simon/src/simonmodelmanagementui/grammarview.ui index 351a22d..bd94156 100644
--- a/simon/src/simonmodelmanagementui/grammarview.ui
+++ b/simon/src/simonmodelmanagementui/grammarview.ui
@@ -108,7 +108,7 @@
        <item>
         <widget class="KPushButton" name="pbMerge">
          <property name="toolTip">
-          <string>Using this procedure you can keep your grammar structures to a \
minimum and improve the readability of grammar and wordlist.</string> +          \
<string>Using this procedure you can keep your grammar structures to a minimum and \
improve the readability of grammar and vocabulary.</string>  </property>
          <property name="text">
           <string>Merge Categories</string>
diff --git a/simon/src/simonmodelmanagementui/vocabularyview.cpp \
b/simon/src/simonmodelmanagementui/vocabularyview.cpp index 1728612..922b146 100644
--- a/simon/src/simonmodelmanagementui/vocabularyview.cpp
+++ b/simon/src/simonmodelmanagementui/vocabularyview.cpp
@@ -21,16 +21,8 @@
 #include "vocabularyviewprivate.h"
 #include <KLocalizedString>
 
-/**
- * @brief Constructor
- *
- * Creates a new WordlistView Objects, creates the Links
- * and initializes the list of vocabulary
- *
- * @author Peter Grasch
- */
 VocabularyView::VocabularyView(QWidget *parent)
-: InlineWidget(i18n("Word list"),
+: InlineWidget(i18n("Vocabulary"),
   KIcon("format-justify-fill"),
   i18n("View and modify the vocabulary."), parent),
   d(new VocabularyViewPrivate(this))
diff --git a/simon/src/simonrecognitioncontrol/recognitioncontrol.cpp \
b/simon/src/simonrecognitioncontrol/recognitioncontrol.cpp index 0584bbf..9641190 \
                100644
--- a/simon/src/simonrecognitioncontrol/recognitioncontrol.cpp
+++ b/simon/src/simonrecognitioncontrol/recognitioncontrol.cpp
@@ -1588,7 +1588,7 @@ void RecognitionControl::wordUndefined(const QString& word)
 {
   int ret = KMessageBox::questionYesNoCancel(0,
     i18n("The word \"%1\" is used in your training samples but it is not contained "
-    "in your wordlist.\n\nWhat do you want to do?", word), QString(),
+    "in your vocabulary.\n\nWhat do you want to do?", word), QString(),
     KGuiItem(i18n("Remove samples containing the word"), KIcon("list-remove")),
     KGuiItem(i18n("Add the word"), KIcon("list-add")));
 
diff --git a/simonlib/simonscenarios/trainingmanager.cpp \
b/simonlib/simonscenarios/trainingmanager.cpp index d4e100b..50f5af5 100644
--- a/simonlib/simonscenarios/trainingmanager.cpp
+++ b/simonlib/simonscenarios/trainingmanager.cpp
@@ -226,10 +226,9 @@ bool TrainingManager::refreshTraining(int sampleRate, const \
QByteArray& prompts)  }
 
 /**
- * \brief Calculates the relevance of the given text with the given wordlist
+ * \brief Calculates the relevance of the given text
  * \author Peter Grasch, Susanne Tschernegg
  * @param text The text to check
- * @param wlist The wordlist as reference
  * @return An index of how well simon would recognize it - the lower the worse
  */
 float TrainingManager::calcRelevance ( const TrainingText *text )


[prev in list] [next in list] [prev in thread] [next in thread]