FCL/sf/mw/hb: comparison src/hbcore/inputfw/hbinputextradictionarycollection.cpp

equal deleted inserted replaced

-:627c4a0fd0e7
+:c3690ec91ef8
 **
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at developer.feedback@nokia.com.
 **
 ****************************************************************************/
+#include "hbinputextradictionarycollection.h"
 #include "hbinputextrauserdictionary.h"
 #include "hbinputextradictionaryfactory.h"
-#include "hbinputextradictionarycollection.h"
 /*!
 @proto
 @hbcore
 \class HbExtraDictionaryCollection
 HbExtraDictionaryCollectionPrivate();
 ~HbExtraDictionaryCollectionPrivate();
 void addDictionaries(QList<int>& newOnes);
 void addDictionary(int newId);
-void addDictionary(HbExtraUserDictionary* newOne);
+void addDictionary(HbExtraUserDictionary *newOne);
 void removeDictionary(int dictId);
-void removeDictionary(HbExtraUserDictionary* dict);
+void removeDictionary(HbExtraUserDictionary *dict);
 bool isAlreadyInList(int dictId) const;
-int isDisabled(int index) const { return ((0x0001 << index) & deactivated); }
+int isDisabled(int index) const {
-void enable(int index) { deactivated &= !(0x0001 << index);  }
+return ((0x0001 << index) & deactivated);
-void disable(int index) { deactivated |= (0x0001 << index); }
+}
+void enable(int index) {
+deactivated &= !(0x0001 << index);
+}
+void disable(int index) {
+deactivated |= (0x0001 << index);
+}
 int dictionaryIndex(int id) const;
 public:
-QList<HbExtraUserDictionary*> dictionaries;
+QList<HbExtraUserDictionary *> dictionaries;
 unsigned short deactivated;     // Bit vector
 };
 HbExtraDictionaryCollectionPrivate::HbExtraDictionaryCollectionPrivate() : deactivated(0)
 dictionaries.append(newDict);
 }
 }
 }
-void HbExtraDictionaryCollectionPrivate::addDictionary(HbExtraUserDictionary* newOne)
+void HbExtraDictionaryCollectionPrivate::addDictionary(HbExtraUserDictionary *newOne)
 {
 if (newOne && !isAlreadyInList(newOne->id())) {
 dictionaries.append(newOne);
 }
 }
 void HbExtraDictionaryCollectionPrivate::removeDictionary(int dictId)
 {
 int index = dictionaryIndex(dictId);
 if (index >= 0) {
 dictionaries.removeAt(index);
 }
 }
-void HbExtraDictionaryCollectionPrivate::removeDictionary(HbExtraUserDictionary* dict)
+void HbExtraDictionaryCollectionPrivate::removeDictionary(HbExtraUserDictionary *dict)
 {
 for (int i = 0; i < dictionaries.count(); i++) {
 if (dictionaries[i] == dict) {
 dictionaries.removeAt(i);
 }
 loading dictionaries.
 */
 HbExtraDictionaryCollection::HbExtraDictionaryCollection(QList<int> dictionaries) : d_ptr(new HbExtraDictionaryCollectionPrivate)
 {
 Q_D(HbExtraDictionaryCollection);
 d->addDictionaries(dictionaries);
 }
 /*!
 Destructs the object.
 */
 delete d_ptr;
 }
 /*!
 Adds given dictionary to the collection if it is avaivale. Uses HbExtraDictionaryFactory
 for loading the dictionary. Returns true if dictionary was found and succesfully added.
 */
 bool HbExtraDictionaryCollection::addDictionary(int id)
 {
 Q_D(HbExtraDictionaryCollection);
 if (d->dictionaries.count() < HbMaxDictionariesInCollection) {
 d->addDictionary(id);
 return true;
 }
 return false;
 }
 /*!
 Adds given dictionary to the collection.
 */
 bool HbExtraDictionaryCollection::addDictionary(HbExtraUserDictionary *dictionary)
 {
 Q_D(HbExtraDictionaryCollection);
 if (d->dictionaries.count() < HbMaxDictionariesInCollection) {
 d->addDictionary(dictionary);
 return true;
 }
 return false;
 }
 /*!
 Removes dictionary from the collection.
 */
 void HbExtraDictionaryCollection::removeDictionary(int id)
 {
 Q_D(HbExtraDictionaryCollection);
 d->removeDictionary(id);
 }
 /*!
 Removes dictionary from the collection.
 */
 void HbExtraDictionaryCollection::removeDictionary(HbExtraUserDictionary *dictionary)
 {
 Q_D(HbExtraDictionaryCollection);
 d->removeDictionary(dictionary);
 }
 /*!
 Returns list of all dictionaries in the collection. Also disabled dictionaries
 will be included.
 QList<int> results;
 for (int i = 0; i < d->dictionaries.count(); i++) {
 results.append(d->dictionaries[i]->id());
 }
 return QList<int>(results);
 }
 /*!
 Q_D(const HbExtraDictionaryCollection);
 int ret = 0;
 for (int i = 0; i < d->dictionaries.count(); i++) {
 ret += d->dictionaries[i]->numberOfWords();
 }
 return ret;
 }
 /*!
 Returns all the words in the collection that begin with contents of searchString.
 Search is case insensitive. Only enabled dictionaries are part of the search.
 Empty string will match to all words.
 */
-QStringList HbExtraDictionaryCollection::findMatches(const QString& aSearchString, Qt::CaseSensitivity caseSensitivity)
+QStringList HbExtraDictionaryCollection::findMatches(const QString &aSearchString, Qt::CaseSensitivity caseSensitivity)
 {
 Q_D(HbExtraDictionaryCollection);
 QStringList results;
 }
 /*!
 Diables given dictionary, but still keeps it as part of the collection.
 All access and search operators will skip disabled dictionary until it is
 enabled again.
 \sa enableDictionary
 */
 void HbExtraDictionaryCollection::disableDictionary(int id)
 {
 Q_D(HbExtraDictionaryCollection);
 int index =  d->dictionaryIndex(id);
 if (index >= 0) {
 d->disable(index);
 }
 }
 /*!
 Enables given dictionary.
 \sa disableDictionary
 */
 void HbExtraDictionaryCollection::enableDictionary(int id)
 {
 Q_D(HbExtraDictionaryCollection);
 int index =  d->dictionaryIndex(id);
 if (index >= 0) {
 d->enable(index);
 }
 }
 /*!
 Returns true if given dictionary is disabled.
 {
 Q_D(const HbExtraDictionaryCollection);
 int index =  d->dictionaryIndex(dictionaryId);
 if (index >= 0) {
 return d->isDisabled(index);
 }
 return false;
 }
 /*!
 Returns word at the given index in the set of enabled dictionaries. Returns empty string
 }
 /*!
 Returns true if given word exists in any of the active dictionaries in the collection.
 */
-bool HbExtraDictionaryCollection::hasWord(const QString& word) const
+bool HbExtraDictionaryCollection::hasWord(const QString &word) const
 {
 Q_D(const HbExtraDictionaryCollection);
 for (int i = 0; i < d->dictionaries.count(); i++) {
 if (!d->isDisabled(i)) {
 /*!
 Increments use count (frequency) for given word. Applied to all the instances of given word
 in enabled part of the collection.
 */
-void HbExtraDictionaryCollection::incrementUseCount(const QString& word)
+void HbExtraDictionaryCollection::incrementUseCount(const QString &word)
 {
 Q_D(const HbExtraDictionaryCollection);
 for (int i = 0; i < d->dictionaries.count(); i++) {
 if (!d->isDisabled(i)) {

changeset 6	c3690ec91ef8
parent 0	16d8024aca5e
child 30	80e4d18b72f5