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

diff --cc trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index 071dcd5,188ea06..fdce4aa
--- 1/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
--- 2/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@@ -332,10 -332,9 +334,10 @@@ int XdxfPlugin::countWords() 
  
  
  bool XdxfPlugin::makeCache(QString dir) {
 +    cachingDialog->setVisible(true);
      QFileInfo dictFileN(_settings->value("path"));
      QString cachePathN;
-     cachePathN = dictFileN.dir().absolutePath() + "/"
+     cachePathN = QDir::homePath() + "/.mdictionary/"
                   + dictFileN.completeBaseName() + ".cache";
  
      QFile dictionaryFile(dictFileN.filePath());

diff --cc trunk/src/plugins/xdxf/src/xdxfplugin.h
index ce786e2,1d609b1..b86a33b
--- 1/trunk/src/plugins/xdxf/src/xdxfplugin.h
--- 2/trunk/src/plugins/xdxf/src/xdxfplugin.h
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.h
@@@ -29,8 -29,8 +29,9 @@@
  #include <QTime>
  #include <QSqlQuery>
  #include <QSqlDatabase>
+ #include <QSqlError>
  #include "XdxfDictDialog.h"
 +#include "XdxfCachingDialog.h"
  
  class TranslationXdxf;