From 4dba74acbd3192618733125e499a64d162dbe3db Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Sun, 13 May 2018 02:27:16 +0200
Subject: [PATCH] Beter whitespace

---
 demo/src/Bindings.cpp    | 6 +++---
 src/cpp.cpp              | 4 ++--
 tests/test_list_rust.cpp | 5 +++--
 tests/test_tree_rust.cpp | 5 +++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/demo/src/Bindings.cpp b/demo/src/Bindings.cpp
index ff25bbc..1e55512 100644
--- a/demo/src/Bindings.cpp
+++ b/demo/src/Bindings.cpp
@@ -815,10 +815,10 @@ QVariant TimeSeries::cos(int row) const
 
 bool TimeSeries::setCos(int row, const QVariant& value)
 {
-    bool set = false;
     if (!value.canConvert(qMetaTypeId<float>())) {
         return false;
     }
+    bool set = false;
     set = time_series_set_data_cos(m_d, row, value.value<float>());
     if (set) {
         QModelIndex index = createIndex(row, 0, row);
@@ -836,10 +836,10 @@ QVariant TimeSeries::sin(int row) const
 
 bool TimeSeries::setSin(int row, const QVariant& value)
 {
-    bool set = false;
     if (!value.canConvert(qMetaTypeId<float>())) {
         return false;
     }
+    bool set = false;
     set = time_series_set_data_sin(m_d, row, value.value<float>());
     if (set) {
         QModelIndex index = createIndex(row, 0, row);
@@ -857,10 +857,10 @@ QVariant TimeSeries::time(int row) const
 
 bool TimeSeries::setTime(int row, const QVariant& value)
 {
-    bool set = false;
     if (!value.canConvert(qMetaTypeId<float>())) {
         return false;
     }
+    bool set = false;
     set = time_series_set_data_time(m_d, row, value.value<float>());
     if (set) {
         QModelIndex index = createIndex(row, 0, row);
diff --git a/src/cpp.cpp b/src/cpp.cpp
index faf8d30..57cce0a 100644
--- a/src/cpp.cpp
+++ b/src/cpp.cpp
@@ -162,6 +162,7 @@ void writeModelGetterSetter(QTextStream& cpp, const QString& index,
         cpp << QString("bool %1::set%2(const QModelIndex& index, const QVariant& value)\n{\n")
                 .arg(o.name, upperInitial(ip.name));
     }
+    cpp << QString("    if (!value.canConvert(qMetaTypeId<%1>())) {\n        return false;\n    }\n").arg(ip.type.name);
     cpp << "    bool set = false;\n";
     if (ip.optional) {
         QString test = "!value.isValid()";
@@ -173,10 +174,9 @@ void writeModelGetterSetter(QTextStream& cpp, const QString& index,
                 .arg(lcname, snakeCase(ip.name), idx) << endl;
         cpp << "    } else\n";
     }
-    cpp << QString("    if (!value.canConvert(qMetaTypeId<%1>())) {\n        return false;\n    }\n").arg(ip.type.name);
     QString val = QString("value.value<%1>()").arg(ip.type.name);
     if (ip.type.isComplex()) {
-        cpp << QString("    const %1 s = %2;").arg(ip.type.name, val);
+        cpp << QString("    const %1 s = %2;\n").arg(ip.type.name, val);
         if (ip.type.name == "QString") {
             val = "s.utf16(), s.length()";
         } else {
diff --git a/tests/test_list_rust.cpp b/tests/test_list_rust.cpp
index 3cd2adb..65c0df2 100644
--- a/tests/test_list_rust.cpp
+++ b/tests/test_list_rust.cpp
@@ -110,11 +110,12 @@ QVariant Persons::userName(int row) const
 
 bool Persons::setUserName(int row, const QVariant& value)
 {
-    bool set = false;
     if (!value.canConvert(qMetaTypeId<QString>())) {
         return false;
     }
-    const QString s = value.value<QString>();    set = persons_set_data_user_name(m_d, row, s.utf16(), s.length());
+    bool set = false;
+    const QString s = value.value<QString>();
+    set = persons_set_data_user_name(m_d, row, s.utf16(), s.length());
     if (set) {
         QModelIndex index = createIndex(row, 0, row);
         emit dataChanged(index, index);
diff --git a/tests/test_tree_rust.cpp b/tests/test_tree_rust.cpp
index 3d0d1c2..ad686d4 100644
--- a/tests/test_tree_rust.cpp
+++ b/tests/test_tree_rust.cpp
@@ -126,11 +126,12 @@ QVariant Persons::userName(const QModelIndex& index) const
 
 bool Persons::setUserName(const QModelIndex& index, const QVariant& value)
 {
-    bool set = false;
     if (!value.canConvert(qMetaTypeId<QString>())) {
         return false;
     }
-    const QString s = value.value<QString>();    set = persons_set_data_user_name(m_d, index.internalId(), s.utf16(), s.length());
+    bool set = false;
+    const QString s = value.value<QString>();
+    set = persons_set_data_user_name(m_d, index.internalId(), s.utf16(), s.length());
     if (set) {
         emit dataChanged(index, index);
     }