Merge branch 'master' into google

[mdictionary] / src / plugins / xdxf / TranslationXdxf.h

diff --git a/src/plugins/xdxf/TranslationXdxf.h b/src/plugins/xdxf/TranslationXdxf.h
index 4abd748..518faa5 100644 (file)
--- a/src/plugins/xdxf/TranslationXdxf.h
+++ b/src/plugins/xdxf/TranslationXdxf.h
@@ -24,25 +24,22 @@
 #define TRANSLATIONXDXF_H
 
 #include <QString>
-#include "../../common/translation.h"
+#include "../../include/translation.h"
 #include "xdxfplugin.h"
 
 class TranslationXdxf : public Translation
 {
 public:
     TranslationXdxf();
-    TranslationXdxf(QString _key,QString _dictionaryInfo, XdxfPlugin *xdxfPlugin);
-    ~TranslationXdxf();
+    TranslationXdxf(QString _key,
+                    QString _dictionaryInfo,
+                    XdxfPlugin *xdxfPlugin);
 
     //! \return word to be translated
     QString key() const;
 
-    /*! \returns dictionary information (plugin name, languages, <logo> etc)\
-        to be displayed in translation table header*/
-    QString dictionaryInfo() const;
-
-    //! \return parsed raw format into html
-    QString toHtml() const;
+    //! \return parsed raw format into xml
+    QString toXml() const;
 
     /*! sets the word for which we want to find a translation
         \param word for which we want to find a translation */
@@ -51,12 +48,12 @@ public:
     //! sets information about dictionary
     void setDictionaryInfo(QString);
 
-    //! \retrun whether given translation is taken from bookmarks
+    //! \return whether given translation is taken from bookmarks
     bool isBookmark() const {
         return _bookmark;
    }
 
-    //! returns coresponding dict object
+    //! returns corresponding dict object
     uint dict() const {return _dictHash;}
 
 private: