First Backbone draft ready

[mdictionary] / trunk / src / includes / settings.h

diff --git a/trunk/src/includes/settings.h b/trunk/src/includes/settings.h
index 4313692..14a0c2d 100644 (file)
--- a/trunk/src/includes/settings.h
+++ b/trunk/src/includes/settings.h
@@ -20,23 +20,28 @@
 *******************************************************************************/
 
 //Created by Bartosz Szatkowski
+
+#ifndef SETTINGS_H
+#define SETTINGS_H
+
 #include <QString>
 #include "CommonDictInterface.h"
 
 //! Plugin specific configuration 
 class Settings {
   public:
-<<<<<<< HEAD
     //! \retrun value fo given key
     //! \param key
-    QString value(const QString key) const = 0;
+    virtual QString value(const QString key) const = 0;
 
     //! sets key to value
-    void setValue(const QString key, const QString value) = 0;
+    virtual void setValue(const QString key, const QString value) = 0;
 
     //! \return dict CommonDictInterface
-    CommonDictInterface type() const = 0;
+    virtual CommonDictInterface* type() const = 0;
 
     //! sets settings type to given dictionary
-    void setType(const CommonDictInterface) = 0;
-}
+    virtual void setType(const CommonDictInterface*) = 0;
+};
+
+#endif