Fix issues caused by wrong interpretation of group separators in effects.

[1] http://kdenlive.org/mantis/view.php?id=2292
[2] http://kdenlive.org/mantis/view.php?id=2275

svn path=/trunk/kdenlive/; revision=5844

diff --git a/src/documentvalidator.cpp b/src/documentvalidator.cpp
index 185d597e36934db512640e7c1b97a17ca1dd992d..7a6b5208391df9f8c8c0a0d9b9289f5575951ee8 100644 (file)
--- a/src/documentvalidator.cpp
+++ b/src/documentvalidator.cpp
@@ -63,8 +63,6 @@ bool DocumentValidator::validate(const double currentVersion)
         documentLocale = QLocale(mlt.attribute("LC_NUMERIC"));
     }
 
-    documentLocale.setNumberOptions(QLocale::OmitGroupSeparator);
-
     if (documentLocale != QLocale()) {
         QLocale::setDefault(documentLocale);
         // locale conversion might need to be redone

diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp
index 955f0c55ff73f7285d7ec07db5b27dd5e9444308..2ed0bc631b4c2e2c24c2585370b9fee01ecfd649 100644 (file)
--- a/src/effectstackedit.cpp
+++ b/src/effectstackedit.cpp
@@ -647,6 +647,7 @@ void EffectStackEdit::collectAllParameters()
 {
     if (m_valueItems.isEmpty() || m_params.isNull()) return;
     QLocale locale;
+    locale.setNumberOptions(QLocale::OmitGroupSeparator);
     const QDomElement oldparam = m_params.cloneNode().toElement();
     QDomElement newparam = oldparam.cloneNode().toElement();
     QDomNodeList namenode = newparam.elementsByTagName("parameter");

diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp
index 11a7a9cf4079de8786bcf80ee04382cdc8d5d221..23484f674f44fc3e6ec3ae863be1115466af2c2a 100644 (file)
--- a/src/kdenlivedoc.cpp
+++ b/src/kdenlivedoc.cpp
@@ -99,9 +99,7 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup
         m_documentProperties[i.key()] = i.value();
     }
 
-    QLocale locale = QLocale::system();
-    locale.setNumberOptions(QLocale::OmitGroupSeparator);
-    if (QLocale() != locale) {
+    if (QLocale() != QLocale::system()) {
         setlocale(LC_NUMERIC, "");
         QLocale::setDefault(QLocale::system());
         // locale conversion might need to be redone