Merge branch 'master' into google

[mdictionary] / src / include / translation.h

diff --git a/src/include/translation.h b/src/include/translation.h
index 20e1453..bfcf326 100644 (file)
--- a/src/include/translation.h
+++ b/src/include/translation.h
@@ -36,7 +36,7 @@ class CommonDictInterface;
 
 
 /*! Translation is kind of GoF proxy, it stores key:translation pair and
-  provides it in lazy way -> key is available always, but translation is fetched
+  provides it in a lazy way -> key is available always, but translation is fetched
   as late as possible*/
 class Translation {
   public:
@@ -51,12 +51,8 @@ class Translation {
         return this->key()==translation->key();
     }
 
-    /*! \returns dictionary information (plugin name, languages, <logo> etc)\
-         to be displayed in translation table header */
-    virtual QString dictionaryInfo() const = 0;
-
-    //! \return parsed raw format into html
-    virtual QString toHtml() const = 0;
+    //! \return parsed raw format into xml
+    virtual QString toXml() const = 0;
 
     //! \return whether given translation is taken from bookmarks
     virtual bool isBookmark() const {
@@ -68,7 +64,7 @@ class Translation {
        _bookmark = b;
    }
 
-    //! returns coresponding dict object
+    //! \returns corresponding dict object
    virtual uint dict() const {return 0;}
 
  protected: