fix merge with master

diff --git a/trunk/src/plugins/google/src/GooglePlugin.cpp b/trunk/src/plugins/google/src/GooglePlugin.cpp
index a93a37c..4e53601 100644 (file)
--- a/trunk/src/plugins/google/src/GooglePlugin.cpp
+++ b/trunk/src/plugins/google/src/GooglePlugin.cpp
@@ -36,7 +36,6 @@ GooglePlugin::GooglePlugin(QObject *parent): CommonDictInterface(parent),
     _settings->setValue("connection_accepted","true");
     _dictDialog = new GoogleDictDialog(this,this);
     _icon = QIcon(":/icons/drawing.png");
-    _hash=123456;
 
     stopped = false;
     languages=initLanguages();
@@ -48,6 +47,7 @@ GooglePlugin::GooglePlugin(QObject *parent): CommonDictInterface(parent),
 
 GooglePlugin::~GooglePlugin() {
     delete _settings;
+    delete _dictDialog;
 }
 
 

diff --git a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index dff8863..a876953 100644 (file)
--- a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@ -309,11 +309,14 @@ DictDialog* XdxfPlugin::dictDialog() {
 
 
 CommonDictInterface* XdxfPlugin::getNew(const Settings *settings) const {
-    XdxfPlugin *plugin = new XdxfPlugin(); // VAL: ??
+
+    qDebug()<<"tu";
+    XdxfPlugin *plugin = new XdxfPlugin();
+    qDebug()<<"tu2";
     if(settings){
+            qDebug()<<"tu3";
         plugin->setSettings(settings);
     }
-    delete settings;
     return  plugin;
 }
 
@@ -353,8 +356,9 @@ bool XdxfPlugin::isCached() {
 
 
 void XdxfPlugin::setSettings(const Settings *settings) {
+    qDebug()<<"tu4";
     if(settings) {
-
+        qDebug()<<"tu5";
         bool isPathChange=false;
         QString oldPath = _settings->value("path");
         if(oldPath != settings->value("path")) {