Merge branch 'master' into xdxf

Conflicts:
	trunk/src/includes/CommonDictInterface.h
	trunk/src/includes/settings.h
	trunk/src/includes/translation.h

diff --cc trunk/src/includes/CommonDictInterface.h
index 5a0c466,62c6874..e094144
--- 1/trunk/src/includes/CommonDictInterface.h
--- 2/trunk/src/includes/CommonDictInterface.h
+++ b/trunk/src/includes/CommonDictInterface.h
@@@ -28,11 -29,10 +28,10 @@@
  #include <QDialog>
  #include <QObject>
  #include <QList>
- #include "CommonDictInterface.h"
  #include "translation.h"
- #include "settings.h"
+ class Settings;
  
 -
 +Q_DECLARE_INTERFACE (CommonDictInterface, "xdxfInterface")
  
  //! Interface for dict engines plugins
  class CommonDictInterface : public QObject {
@@@ -65,13 -63,14 +64,17 @@@
      //! return new, clean copy of plugin with setting set as in Settings*
      virtual CommonDictInterface* getNew(const Settings*) const = 0;
  
 -    //! returns whether plugin can start searching 
 +    //! returns whether plugin can start searching
      virtual bool isAvailable() const = 0;
  
++    //! returns the actual translation of a word given in key
 +    virtual QString search(QString key) = 0;
 +
+     //! \returns unique value (unique for every dictionary not plugin
+     virtual uint hash() const = 0;
+ 
   public Q_SLOTS:
--    /*! performes search in dictionary
++    /*! performs search in dictionary
          \param  word word to search in dictionary
          \param limit limit on number of results
  
@@@ -92,5 -91,5 +95,6 @@@
      void loaded(CommonDictInterface*);
  };
  
- #endif // COMMONDICTINTERFACE_H
+ Q_DECLARE_INTERFACE(CommonDictInterface, "CommonDictInterface/0.1");
 +
+ #endif

diff --cc trunk/src/includes/settings.h
index db2655f,14a0c2d..d07d920
--- 1/trunk/src/includes/settings.h
--- 2/trunk/src/includes/settings.h
+++ b/trunk/src/includes/settings.h
@@@ -47,5 -44,4 +46,4 @@@ class Settings 
      virtual void setType(const CommonDictInterface*) = 0;
  };
  
- 
 -#endif
 +#endif // SETTINGS_H

diff --cc trunk/src/includes/translation.h
index bf0ce1a,7664736..e3f46ee
--- 1/trunk/src/includes/translation.h
--- 2/trunk/src/includes/translation.h
+++ b/trunk/src/includes/translation.h
@@@ -25,8 -25,8 +25,9 @@@
  #define TRANSLATION_H
  
  #include <QString>
+ #include <QMetaType>
  
 +
  //! Keeping raw form of translation to be parsed only when needed
  class Translation {
    public: