delete cache file when path to dictionawy will be change

[mdictionary] / trunk / src / plugins / google / src / GoogleSettingsDialog.h

diff --git a/trunk/src/plugins/google/src/GoogleSettingsDialog.h b/trunk/src/plugins/google/src/GoogleSettingsDialog.h
index 362ba54..c286ef9 100644 (file)
--- a/trunk/src/plugins/google/src/GoogleSettingsDialog.h
+++ b/trunk/src/plugins/google/src/GoogleSettingsDialog.h
@@ -38,14 +38,9 @@ class GoogleSettingsDialog : public QDialog
 {
     Q_OBJECT
 public:
-<<<<<<< HEAD
-    explicit GoogleSettingsDialog(QWidget *parent = 0,Settings *pluginSettings=0);
-=======
     explicit GoogleSettingsDialog(QWidget *parent = 0,
-                                  QString langTo ="",
-                                  QString langFrom ="",
+                                  Settings *pluginSettings=0,
                                   QString acceptButtonLabel = tr("Add"));
->>>>>>> master
 
     /*!
         \param parent parent widget on which will be displayed dialog
@@ -53,15 +48,9 @@ public:
         \param langFrom language witch is display in the comboBox as a startup item
         \returns function return settings to GooglePlugin
     */
-<<<<<<< HEAD
-    static Settings* getSettings(QWidget *parent,Settings *pluginSettings=0);
-=======
     static Settings* getSettings(QWidget *parent,
-                                 QString langTo ="",
-                                 QString langFrom ="",
+                                 Settings *pluginSettings=0,
                                  QString acceptButtonLabel = tr("Add"));
->>>>>>> master
-
     /*!
         function set a new settings in plugin;
         \param plugin plugin whose settings you will change