Set version to v1.1

[mverbiste] / gui / conjugation.h

diff --git a/gui/conjugation.h b/gui/conjugation.h
index f940a3c..88062c8 100644 (file)
--- a/gui/conjugation.h
+++ b/gui/conjugation.h
@@ -27,12 +27,17 @@
 
 #include <vector>
 #include <string>
+#include <QtCore/QVector>
+#include <QtCore/QString>
 
 typedef std::vector<std::string> VS;
 typedef std::vector<VS> VVS;
 typedef std::vector<VVS> VVVS;
 
-
+#ifndef QT_NO_DEBUG
+#include <QtCore/QElapsedTimer>
+#include <QtCore/QDebug>
+#endif
 
 /** Obtains the conjugation of the given infinitive.
     @param  fvd             verb dictionary from which to obtain
@@ -45,10 +50,10 @@ typedef std::vector<VVS> VVVS;
                             modes where pronouns are used
 */
 void getConjugation(const verbiste::FrenchVerbDictionary &fvd,
-                        const std::string &infinitive,
-                        const std::string &tname,
-                        VVVS &dest,
-                        bool includePronouns = false);
+                    const std::string &infinitive,
+                    const std::string &tname,
+                    VVVS &dest,
+                    bool includePronouns = false);
 
 
 /** Get the tense name for a certain cell of the conjugation table.
@@ -94,5 +99,13 @@ std::string createTableCellText(verbiste::FrenchVerbDictionary &fvd,
                                 const std::string &openMark,
                                 const std::string &closeMark);
 
-
+/**
+ * Qt version of createTableCellText() above.
+ * Return a vertor of QStrings, which are conjugations.
+ **/
+QVector<QString> qgetConjugates(verbiste::FrenchVerbDictionary &fvd,
+                                const VVS &tense,
+                                const std::string &lowerCaseUTF8UserText,
+                                const std::string &openMark,
+                                const std::string &closeMark);
 #endif  /* _H_conjugation */