Merge branch 'xdxf' of ssh://drop.maemo.org/git/mdictionary into gui

Conflicts:
	trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp

diff --git a/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp b/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
index af2a463..3622aa2 100644 (file)
--- a/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
@@ -121,4 +121,9 @@ bool XdxfPlugin::isAvailable() const {
     return true;
 }
 
+uint XdxfPlugin::hash() const
+{
+    return 1;
+}
+
 Q_EXPORT_PLUGIN2(xdxf, XdxfPlugin)

diff --git a/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.h b/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.h
index 74fe7f2..324bf92 100644 (file)
--- a/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.h
+++ b/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.h
@@ -44,6 +44,8 @@ public:
 
     QString search(QString key);
 
+    uint hash() const;
+
 public Q_SLOTS:
     /*! performs search in dictionary
       \param  word word to search in dictionary