Merge branch 'master' into google

[mdictionary] / trunk / src / plugins / xdxf / src / xdxfplugin.cpp

diff --git a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index 0988ed1..64d5fce 100644 (file)
--- a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@ -20,6 +20,7 @@
 *******************************************************************************/
 
 /*! \file xdxfplugin.cpp
+\author Jakub Jaszczynski <j.j.jaszczynski@gmail.com>
 */
 
 #include "xdxfplugin.h"
@@ -50,12 +51,7 @@ XdxfPlugin::XdxfPlugin(QObject *parent) : CommonDictInterface(parent),
 
 
 
-XdxfPlugin::~XdxfPlugin()
-{
-//  QString connection(db.connectionName());
-//   db.close();
-//  QSqlDatabase::removeDatabase(connection);
-
+XdxfPlugin::~XdxfPlugin() {
     delete _settings;
 }
 
@@ -73,7 +69,6 @@ QString XdxfPlugin::name() const {
 }
 
 QString XdxfPlugin::type() const {
-//    return _settings->value("type");
     return _type;
 }
 
@@ -299,12 +294,10 @@ void XdxfPlugin::setPath(QString path){
 
 CommonDictInterface* XdxfPlugin::getNew(const Settings *settings) const {
     XdxfPlugin *plugin = new XdxfPlugin();
-    static int a=0;
     if(settings){
         plugin->setPath(settings->value("path"));
         QStringList list = settings->keys();
 
-        a=a+1;
         plugin->db_name = plugin->_settings->value("type")
                          + plugin->_settings->value("path");
         plugin->db = QSqlDatabase::addDatabase("QSQLITE", plugin->db_name);
@@ -377,7 +370,7 @@ void XdxfPlugin::setSettings(Settings *settings) {
 
     delete settings;
 
-    emit settingsChanged();
+    Q_EMIT settingsChanged();
 }
 
 
@@ -409,9 +402,7 @@ void XdxfPlugin::getDictionaryInfo() {
     QString format = "png";
     QString initialPath = QDir::currentPath() + tr("/xdxf.") + format;
 
-    _infoNote="path=\""+initialPath+"\">"+"\n" + _name + " [" + _langFrom +
-            "-" + _langTo + "] "+ "(" + _type + ")";
-
+    _infoNote="path=\""+initialPath+"\"> \n" + _name + " [" + _langFrom + "-" + _langTo + "] (" + _type + ")";
     dictionaryFile.close();
 }