Added the name attribute to the eVaf::PswGen::Storage::Data class.

diff --git a/src/apps/PswGen/GUI/gui.cpp b/src/apps/PswGen/GUI/gui.cpp
index 965d70ea7b4052fdf2f6b59f8faa269dc9634413..50eaca11a541c2acb0a89ec8d7e832cc24156320 100644 (file)
--- a/src/apps/PswGen/GUI/gui.cpp
+++ b/src/apps/PswGen/GUI/gui.cpp
@@ -187,7 +187,7 @@ void Module::generateClicked()
     if (mStorage) {
         QExplicitlySharedDataPointer<PswGen::Storage::Data> data = mStorage->query(wName->text());
         if (!data)
-            data = new Storage::Data(wLength->value());
+            data = new Storage::Data(wName->text(), wLength->value());
         else
             data->setLength(wLength->value());
         mStorage->save(wName->text(), data);

diff --git a/src/apps/PswGen/GUI/version.h b/src/apps/PswGen/GUI/version.h
index 690db50ddc7201f2cb0969f1d28535f9085f2a2c..e70248c56037b4a480d49a2b003340fa53fa10d8 100644 (file)
--- a/src/apps/PswGen/GUI/version.h
+++ b/src/apps/PswGen/GUI/version.h
@@ -25,12 +25,12 @@
 /**
  * Module/library version number in the form major,minor,release,build
  */
-#define VER_FILE_VERSION                0,1,1,1
+#define VER_FILE_VERSION                0,1,2,2
 
 /**
  * Module/library version number in the string format (shall end with \0)
  */
-#define VER_FILE_VERSION_STR            "0.1.1.1\0"
+#define VER_FILE_VERSION_STR            "0.1.2.2\0"
 
 /**
  * Module/library name (shall end with \0)

diff --git a/src/apps/PswGen/Storage/istorage.h b/src/apps/PswGen/Storage/istorage.h
index 8af8ba53dc0bd25d2e74fc5265eeef90a7d03153..48226d0ec7a6d66b18c2d1ab7171e991b01c7968 100644 (file)
--- a/src/apps/PswGen/Storage/istorage.h
+++ b/src/apps/PswGen/Storage/istorage.h
@@ -39,20 +39,25 @@ class Data : public QSharedData
 {
 public:
 
-    Data()
+    Data(QString const & name)
         : QSharedData()
         , mModified(false)
+        , mName(name)
         , mLength(0)
         , mFlags(0)
     {}
 
-    Data(int l, uint f = 0)
+    Data(QString const & name, int l, uint f = 0)
         : QSharedData()
         , mModified(false)
+        , mName(name)
         , mLength(l)
         , mFlags(f)
     {}
 
+    /// Name of the password
+    inline QString const & name() const { return mName; }
+
     /// Length of the generated password
     inline int length() const { return mLength; }
     inline void setLength(int value)
@@ -83,6 +88,7 @@ public:
 private:
 
     bool mModified;
+    QString mName;
     int mLength;
     uint mFlags;
 

diff --git a/src/apps/PswGen/Storage/module.cpp b/src/apps/PswGen/Storage/module.cpp
index e867a0e7d21f6d138e841c5268185a5157a7ce9b..b062b305453975aaef87fee517f455a9efe6d6c0 100644 (file)
--- a/src/apps/PswGen/Storage/module.cpp
+++ b/src/apps/PswGen/Storage/module.cpp
@@ -231,7 +231,7 @@ bool StorageImpl::loadData()
 
     while (q.next()) {
         QString name = q.value(0).toString();
-        QExplicitlySharedDataPointer<Storage::Data> data(new Storage::Data(q.value(1).toInt(), uint(q.value(2).toInt())));
+        QExplicitlySharedDataPointer<Storage::Data> data(new Storage::Data(name, q.value(1).toInt(), uint(q.value(2).toInt())));
         mData.insert(name, data);
     }
 

diff --git a/src/apps/PswGen/Storage/version.h b/src/apps/PswGen/Storage/version.h
index 33eaa3d93074282c16b13621d67c2d47b2fa3db8..2712b3680a1efc87efb04f3321cb3c1c25c0980f 100644 (file)
--- a/src/apps/PswGen/Storage/version.h
+++ b/src/apps/PswGen/Storage/version.h
@@ -25,12 +25,12 @@
 /**
  * Module/library version number in the form major,minor,release,build
  */
-#define VER_FILE_VERSION                0,1,1,1
+#define VER_FILE_VERSION                0,1,2,2
 
 /**
  * Module/library version number in the string format (shall end with \0)
  */
-#define VER_FILE_VERSION_STR            "0.1.1.1\0"
+#define VER_FILE_VERSION_STR            "0.1.2.2\0"
 
 /**
  * Module/library name (shall end with \0)