[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [skrooge] /: Authorize long number for operations like 5490990004
From:       Stephane Mankowski <stephane () mankowski ! fr>
Date:       2013-05-31 17:08:37
Message-ID: 20130531170837.12D0AA6067 () git ! kde ! org
[Download RAW message or body]

Git commit dc78657107f3e50dee03a23cb33d2f536dc07ba7 by Stephane Mankowski.
Committed on 31/05/2013 at 18:52.
Pushed by smankowski into branch 'master'.

Authorize long number for operations like 5490990004

M  +1    -0    CHANGELOG
M  +2    -2    skgbankmodeler/skgoperationobject.cpp
M  +2    -2    skgbankmodeler/skgoperationobject.h
M  +3    -3    skgbasemodeler/skgservices.cpp
M  +2    -2    skgbasemodeler/skgservices.h
M  +2    -0    tests/skgbankmodelertest/skgtestoperation.cpp
M  +2    -0    tests/skgbasemodelertest/skgtestbase.cpp

http://commits.kde.org/skrooge/dc78657107f3e50dee03a23cb33d2f536dc07ba7

diff --git a/CHANGELOG b/CHANGELOG
index 621919f..a5559ae 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,7 @@ skrooge (1.8.0)
   *Correction: Bad date format detection when the second value is 9 (example: \
                3/9/04)
   *Correction: Remove the "Bank account " string in the name of the account name \
                created by an OFX import
   *Correction: Icon for "Amount entered"  
+  *Correction: Authorize long number for operations like 5490990004
   *New feature: Notifications and  error messages are now based on KMessageWidget
   *New feature: The restore file is now base on KMessageWidget
   *Performances: Better performances in dashboard
diff --git a/skgbankmodeler/skgoperationobject.cpp \
b/skgbankmodeler/skgoperationobject.cpp index 1e4f659..94651f9 100644
--- a/skgbankmodeler/skgoperationobject.cpp
+++ b/skgbankmodeler/skgoperationobject.cpp
@@ -184,12 +184,12 @@ QString SKGOperationObject::getComment() const
     return getAttribute("t_comment");
 }
 
-SKGError SKGOperationObject::setNumber(int iNumber)
+SKGError SKGOperationObject::setNumber(qlonglong iNumber)
 {
     return setAttribute("i_number", SKGServices::intToString(iNumber));
 }
 
-int SKGOperationObject::getNumber() const
+qlonglong SKGOperationObject::getNumber() const
 {
     return SKGServices::stringToInt(getAttribute("i_number"));
 }
diff --git a/skgbankmodeler/skgoperationobject.h \
b/skgbankmodeler/skgoperationobject.h index 0356f72..081fd1b 100644
--- a/skgbankmodeler/skgoperationobject.h
+++ b/skgbankmodeler/skgoperationobject.h
@@ -113,13 +113,13 @@ public:
      * @return an object managing the error
      *   @see SKGError
      */
-    virtual SKGError setNumber(int iNumber);
+    virtual SKGError setNumber(qlonglong iNumber);
 
     /**
      * Get the number of this operation
      * @return the number
      */
-    virtual int getNumber() const;
+    virtual qlonglong getNumber() const;
 
     /**
      * Set the number of operation
diff --git a/skgbasemodeler/skgservices.cpp b/skgbasemodeler/skgservices.cpp
index fed8e36..27635c9 100644
--- a/skgbasemodeler/skgservices.cpp
+++ b/skgbasemodeler/skgservices.cpp
@@ -101,19 +101,19 @@ QString SKGServices::getenv(const QString& iAttribute)
     return QString::fromUtf8(qgetenv(iAttribute.toUtf8().constData()));
 }
 
-QString SKGServices::intToString(int iNumber)
+QString SKGServices::intToString(qlonglong iNumber)
 {
     QString output;
     output.setNum(iNumber);
     return output;
 }
 
-int SKGServices::stringToInt(const QString& iNumber)
+qlonglong SKGServices::stringToInt(const QString& iNumber)
 {
     if (iNumber.isEmpty()) return 0;
 
     bool ok;
-    int output = iNumber.toInt(&ok);
+    qlonglong output = iNumber.toLongLong(&ok);
     if (!ok) {
         SKGTRACE << "WARNING: SKGServices::stringToInt(" << iNumber << ") failed" << \
endl;  }
diff --git a/skgbasemodeler/skgservices.h b/skgbasemodeler/skgservices.h
index 774b53b..947c90c 100644
--- a/skgbasemodeler/skgservices.h
+++ b/skgbasemodeler/skgservices.h
@@ -193,14 +193,14 @@ public:
      * @param iNumber the integer to convert
      * @return the converted QString
      */
-    static QString intToString(int iNumber);
+    static QString intToString(qlonglong iNumber);
 
     /**
      * Convert a QString into an integer
      * @param iNumber the QString to convert
      * @return the converted integer
      */
-    static int stringToInt(const QString& iNumber);
+    static qlonglong stringToInt(const QString& iNumber);
 
     /**
      * Convert a QString into a csv QString
diff --git a/tests/skgbankmodelertest/skgtestoperation.cpp \
b/tests/skgbankmodelertest/skgtestoperation.cpp index ed8401d..8d109ac 100644
--- a/tests/skgbankmodelertest/skgtestoperation.cpp
+++ b/tests/skgbankmodelertest/skgtestoperation.cpp
@@ -324,7 +324,9 @@ int main(int argc, char** argv)
             SKGTESTERROR("ACCOUNT:addOperation", account1.addOperation(op_1), true);
             SKGTESTERROR("OPE:setDate", op_1.setDate(now), true);
             SKGTESTERROR("OPE:setUnit", op_1.setUnit(unit_euro), true);
+            SKGTESTERROR("OPE:setUnit", op_1.setNumber(5490990004), true);
             SKGTESTERROR("OPE:save", op_1.save(), true);
+            SKGTEST("OPE:getNumber", op_1.getNumber(), qlonglong(5490990004));
 
             SKGSubOperationObject subop_1;
             SKGTESTERROR("OPE:addSubOperation", op_1.addSubOperation(subop_1), \
                true);
diff --git a/tests/skgbasemodelertest/skgtestbase.cpp \
b/tests/skgbasemodelertest/skgtestbase.cpp index 53511fd..98aa546 100644
--- a/tests/skgbasemodelertest/skgtestbase.cpp
+++ b/tests/skgbasemodelertest/skgtestbase.cpp
@@ -76,9 +76,11 @@ int main(int argc, char** argv)
     {
         SKGTEST("CONV:intToString", SKGServices::intToString(10), "10");
         SKGTEST("CONV:intToString", SKGServices::intToString((int) 3.5), "3");
+        SKGTEST("CONV:intToString", SKGServices::intToString(5490990004), \
"5490990004");  SKGTEST("CONV:stringToInt", SKGServices::stringToInt("56"), 56);
         SKGTEST("CONV:stringToInt", SKGServices::stringToInt("HELLO"), 0);
         SKGTEST("CONV:stringToInt", SKGServices::stringToInt("5HELLO"), 0);
+        SKGTEST("CONV:stringToInt", SKGServices::stringToInt("5490990004"), \
                5490990004);
         SKGTEST("CONV:doubleToString", SKGServices::doubleToString(10), "10");
         SKGTEST("CONV:doubleToString", SKGServices::doubleToString(5.3), "5.3");
         SKGTEST("CONV:doubleToString", SKGServices::doubleToString(11111115.33), \
"11111115.33");


[prev in list] [next in list] [prev in thread] [next in thread]