change html to xml in funcions names
[mdictionary] / src / mdictionary / backbone / backbone.cpp
index 62e1e12..4797fb6 100644 (file)
@@ -63,7 +63,7 @@ public:
     /*! \return translation text for corresponding Translation object */
     QString toHtml() const {
         QString trans;
-        trans = _tr->toHtml();
+        trans = _tr->toXml();
         return trans;
 
     }
@@ -91,8 +91,8 @@ void Backbone::init() {
    loadDicts(_configPath);
 
    connect(&_resultWatcher, SIGNAL(finished()), this, SLOT(translationReady()));
-   connect(&_htmlResultWatcher, SIGNAL(finished()), this,
-           SLOT(htmlTranslationReady()));
+   connect(&_xmlResultWatcher, SIGNAL(finished()), this,
+           SLOT(xmlTranslationReady()));
    connect(&_bookmarkWatcher, SIGNAL(finished()), this,
            SLOT(bookmarksListReady()));
    connect(&_bookmarkSearchWatcher, SIGNAL(finished()), this,
@@ -191,7 +191,7 @@ void Backbone::stopSearching() {
     foreach(CommonDictInterface* dict, _dicts.keys())
         dict->stop();
     stopped = true;
-    _innerHtmlResult.cancel();
+    _innerXmlResult.cancel();
     _innerResult.cancel();
     Q_EMIT searchCanceled();
 }
@@ -509,14 +509,14 @@ void Backbone::saveState(QSettings* set, Settings* plugSet, bool active
 
 
 
-QStringList Backbone::htmls() {
-    return _htmlResult;
+QStringList Backbone::xmls() {
+    return _xmlResult;
 }
 
 
 
-void Backbone::searchHtml(QList<Translation *> translations) {
-    _htmlResult.clear();
+void Backbone::searchXml(QList<Translation *> translations) {
+    _xmlResult.clear();
 
     QList<TranslationPtr> dummy;
     stopped = false;
@@ -533,24 +533,24 @@ void Backbone::searchHtml(QList<Translation *> translations) {
         }
     }
 
-   _innerHtmlResult = QtConcurrent::mapped(dummy,
+   _innerXmlResult = QtConcurrent::mapped(dummy,
                                             &TranslationPtr::toHtml);
-   _htmlResultWatcher.setFuture(_innerHtmlResult);
+   _xmlResultWatcher.setFuture(_innerXmlResult);
 }
 
 
 
-void Backbone::htmlTranslationReady() {
+void Backbone::xmlTranslationReady() {
 
-    QFutureIterator<QString> it(_innerHtmlResult);
+    QFutureIterator<QString> it(_innerXmlResult);
     QSet<QString> uniqe;
     while(it.hasNext())
         uniqe.insert(it.next());
-    _htmlResult.clear();
-    _htmlResult = uniqe.toList();
+    _xmlResult.clear();
+    _xmlResult = uniqe.toList();
 
     if(!stopped)
-        Q_EMIT htmlReady();
+        Q_EMIT xmlReady();
 
 }