[Tora-cvs] SF.net SVN: tora:[4968] trunk/tora/src/core

[<ibr...@us...>]

Revision: 4968
          http://sourceforge.net/p/tora/code/4968
Author:   ibre5041
Date:     2013-12-05 13:50:05 +0000 (Thu, 05 Dec 2013)
Log Message:
-----------
No prev values in toQValue

Modified Paths:
--------------
    trunk/tora/src/core/toqvalue.cpp
    trunk/tora/src/core/toqvalue.h

Modified: trunk/tora/src/core/toqvalue.cpp
===================================================================
--- trunk/tora/src/core/toqvalue.cpp	2013-12-04 18:18:30 UTC (rev 4967)
+++ trunk/tora/src/core/toqvalue.cpp	2013-12-05 13:50:05 UTC (rev 4968)
@@ -46,31 +46,31 @@
 static int NumberDecimals;
 
 
-toQValue::toQValue(int i): Modified(false)
+toQValue::toQValue(int i)
 {
     Value = i;
 }
 
-toQValue::toQValue(double i): Modified(false)
+toQValue::toQValue(double i)
 {
     Value = i;
 }
 
-toQValue::toQValue(qlonglong d): Modified(false)
+toQValue::toQValue(qlonglong d)
 {
     Value = d;
 }
 
-toQValue::toQValue(qulonglong d): Modified(false)
+toQValue::toQValue(qulonglong d)
 {
     Value = d;
 }
-toQValue::toQValue(toRowDesc d): Modified(false)
+toQValue::toQValue(toRowDesc d)
 {
     Value.setValue(d);
 }
 
-toQValue::toQValue(const toQValue &copy): Value(copy.Value), OldValue(copy.OldValue), Modified(copy.Modified)
+toQValue::toQValue(const toQValue &copy): Value(copy.Value)
 {
     /** Be destructive only if complexType is held
      *  There should be no copying of data read from a query,
@@ -84,8 +84,6 @@
 const toQValue &toQValue::operator = (const toQValue & copy)
 {
     Value = copy.Value;
-    OldValue = copy.OldValue;
-    Modified = copy.Modified;
     /** Be destructive only if complexType is held
      *  There should be no copying of data read from a query,
      *  but toQValue is also used for query parameters(toQList and others)
@@ -96,12 +94,12 @@
     return *this;
 }
 
-toQValue::toQValue(const QString &str): Modified(false)
+toQValue::toQValue(const QString &str)
 {
     Value = str;
 }
 
-toQValue::toQValue(): Modified(false)
+toQValue::toQValue()
 {
 }
 
@@ -464,3 +462,13 @@
 
     return s.arg(size, 0, 'f', 0);
 }
+
+bool toQValue::updateNewValue(toQValue value)
+{
+    if (Value.type() == QVariant::UserType)
+        return false;
+    if(value.isComplexType())
+        return false;
+    Value = value.Value;
+    return true;
+}

Modified: trunk/tora/src/core/toqvalue.h
===================================================================
--- trunk/tora/src/core/toqvalue.h	2013-12-04 18:18:30 UTC (rev 4967)
+++ trunk/tora/src/core/toqvalue.h	2013-12-05 13:50:05 UTC (rev 4968)
@@ -60,9 +60,7 @@
  */
 class TORA_EXPORT toQValue
 {
-    QVariant Value, OldValue;
-    bool    Modified;
-
+    QVariant Value;
 public:
     /**
      * This is helper class for visualization of complex types
@@ -218,35 +216,8 @@
 
     QString toSIsize() const;
 
-    int updateNewValue(toQValue value)
-    {
-        if (Value.type() == QVariant::UserType)
-            return false;
-        if(!Modified)
-        {
-            Modified = true;
-            OldValue = Value;
-        }
-        if(value.isComplexType())
-            return false;
-        Value = value.Value;
-        return true;
-    }
+    bool updateNewValue(toQValue value);
 
-    void popOldValue()
-    {
-        if(Modified)
-        {
-            Modified = false;
-            Value = OldValue;
-        }
-    }
-
-    bool isModified() const
-    {
-        return Modified;
-    }
-
     /** Set numberformat.
      * @param format 0 = Default, 1 = Scientific, 2 = Fixed Decimals
      * @param decimals Number on decimals for fixed decimals.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.