New upstream version 3.4.4+dfsg.upstream/3.4.4+dfsg

4 files changed, 22 insertions, 12 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgcategory.cpp b/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgcategory.cpp
index a5c661e..6f5451d 100644
--- a/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgcategory.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgcategory.cpp
@@ -11,7 +11,7 @@ CfgCategory::CfgCategory(const CfgCategory &other) :
     lastCreatedCfgCategory = this;
     lastCreatedCfgMain->childs[name] = this;
     cfgParent = lastCreatedCfgMain;
-    for (CfgEntry* entry : childs)
+    for (CfgEntry*& entry : childs)
         entry->parent = this;
 }
 
@@ -26,7 +26,10 @@ CfgCategory::CfgCategory(const QString &name, const QString &title) :
 
 CfgEntry *CfgCategory::getEntryByName(const QString& name)
 {
-    return childs[name];
+    if (childs.contains(name))
+        return childs[name];
+
+    return nullptr;
 }
 
 QString CfgCategory::toString() const
@@ -44,32 +47,32 @@ void CfgCategory::translateTitle()
     // This needs to be "QObject::tr" and not just "tr", because this guarantees proper message context for retranslating
     // titles for objects initialized in global scope (as CfgCategories are).
     title = QObject::tr(title.toUtf8().constData());
-    for (CfgEntry* entry : childs)
+    for (CfgEntry*& entry : childs)
         entry->translateTitle();
 
 }
 
 void CfgCategory::reset()
 {
-    for (CfgEntry* entry : childs)
+    for (CfgEntry*& entry : childs)
         entry->reset();
 }
 
 void CfgCategory::savepoint(bool transaction)
 {
-    for (CfgEntry* entry : childs)
+    for (CfgEntry*& entry : childs)
         entry->savepoint(transaction);
 }
 
 void CfgCategory::restore()
 {
-    for (CfgEntry* entry : childs)
+    for (CfgEntry*& entry : childs)
         entry->restore();
 }
 
 void CfgCategory::release()
 {
-    for (CfgEntry* entry : childs)
+    for (CfgEntry*& entry : childs)
         entry->release();
 }
 
@@ -80,7 +83,8 @@ void CfgCategory::commit()
 
 void CfgCategory::rollback()
 {
-    rollback();
+    for (CfgEntry*& entry : childs)
+        entry->rollback();
 }
 
 void CfgCategory::begin()
diff --git a/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgentry.cpp b/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgentry.cpp
index 9a91ea8..bdbfd29 100644
--- a/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgentry.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgentry.cpp
@@ -56,7 +56,7 @@ QVariant CfgEntry::get() const
     return cfgVal;
 }
 
-QVariant CfgEntry::getDefultValue() const
+QVariant CfgEntry::getDefaultValue() const
 {
     if (defValueFunc)
         return (*defValueFunc)();
@@ -99,6 +99,11 @@ QString CfgEntry::getTitle() const
     return title;
 }
 
+QString CfgEntry::getName() const
+{
+    return name;
+}
+
 void CfgEntry::translateTitle()
 {
     // This needs to be "QObject::tr" and not just "tr". See CfgCategory::translateTitle() for details.
@@ -107,7 +112,7 @@ void CfgEntry::translateTitle()
 
 void CfgEntry::reset()
 {
-    set(getDefultValue());
+    set(getDefaultValue());
 }
 
 bool CfgEntry::isPersistable() const
diff --git a/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgentry.h b/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgentry.h
index 4c1bbb0..1b5bdd9 100644
--- a/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgentry.h
+++ b/SQLiteStudio3/coreSQLiteStudio/config_builder/cfgentry.h
@@ -23,12 +23,13 @@ class API_EXPORT CfgEntry : public QObject
         virtual ~CfgEntry();
 
         QVariant get() const;
-        QVariant getDefultValue() const;
+        QVariant getDefaultValue() const;
         void set(const QVariant& value);
         operator QString() const;
         void defineDefaultValueFunction(DefaultValueProviderFunc func);
         QString getFullKey() const;
         QString getTitle() const;
+        QString getName() const;
         void translateTitle();
         void reset();
         bool isPersistable() const;
diff --git a/SQLiteStudio3/coreSQLiteStudio/config_builder/cfglazyinitializer.cpp b/SQLiteStudio3/coreSQLiteStudio/config_builder/cfglazyinitializer.cpp
index 7e554a8..1f5fa5e 100644
--- a/SQLiteStudio3/coreSQLiteStudio/config_builder/cfglazyinitializer.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/config_builder/cfglazyinitializer.cpp
@@ -18,7 +18,7 @@ void CfgLazyInitializer::init()
     if (!instances)
         instances = new QList<CfgLazyInitializer*>();
 
-    for (CfgLazyInitializer* initializer : *instances)
+    for (CfgLazyInitializer*& initializer : *instances)
         initializer->doInitialize();
 }