diff --git a/kmymoney/mymoney/mymoneymoney.h b/kmymoney/mymoney/mymoneymoney.h --- a/kmymoney/mymoney/mymoneymoney.h +++ b/kmymoney/mymoney/mymoneymoney.h @@ -53,11 +53,11 @@ public: // construction MyMoneyMoney(); - explicit MyMoneyMoney(const int iAmount, const signed64 denom); - explicit MyMoneyMoney(const long int iAmount, const signed64 denom); + explicit MyMoneyMoney(const int iAmount, const unsigned int denom); + explicit MyMoneyMoney(const long int iAmount, const unsigned int denom); explicit MyMoneyMoney(const QString& pszAmount); - explicit MyMoneyMoney(const signed64 Amount, const signed64 denom); - explicit MyMoneyMoney(const double dAmount, const signed64 denom = 100); + explicit MyMoneyMoney(const qint64 Amount, const unsigned int denom); + explicit MyMoneyMoney(const double dAmount, const unsigned int denom = 100); // copy constructor MyMoneyMoney(const MyMoneyMoney& Amount); @@ -188,7 +188,7 @@ // denom - denominator of the object // //////////////////////////////////////////////////////////////////////////////// -inline MyMoneyMoney::MyMoneyMoney(const double dAmount, const signed64 denom) : +inline MyMoneyMoney::MyMoneyMoney(const double dAmount, const unsigned int denom) : AlkValue(dAmount, denom) { } diff --git a/kmymoney/mymoney/mymoneymoney.cpp b/kmymoney/mymoney/mymoneymoney.cpp --- a/kmymoney/mymoney/mymoneymoney.cpp +++ b/kmymoney/mymoney/mymoneymoney.cpp @@ -147,9 +147,9 @@ // denom - denominator of the object // //////////////////////////////////////////////////////////////////////////////// -MyMoneyMoney::MyMoneyMoney(signed64 Amount, const signed64 denom) +MyMoneyMoney::MyMoneyMoney(qint64 Amount, const unsigned int denom) { - if (!denom) + if (denom == 0) throw MYMONEYEXCEPTION_CSTRING("Denominator 0 not allowed!"); *this = AlkValue(QString::fromLatin1("%1/%2").arg(Amount).arg(denom), eMyMoney::Money::_decimalSeparator); @@ -164,9 +164,9 @@ // denom - denominator of the object // //////////////////////////////////////////////////////////////////////////////// -MyMoneyMoney::MyMoneyMoney(const int iAmount, const signed64 denom) +MyMoneyMoney::MyMoneyMoney(const int iAmount, const unsigned int denom) { - if (!denom) + if (denom == 0) throw MYMONEYEXCEPTION_CSTRING("Denominator 0 not allowed!"); *this = AlkValue(iAmount, denom); } @@ -180,9 +180,9 @@ // denom - denominator of the object // //////////////////////////////////////////////////////////////////////////////// -MyMoneyMoney::MyMoneyMoney(const long int iAmount, const signed64 denom) +MyMoneyMoney::MyMoneyMoney(const long int iAmount, const unsigned int denom) { - if (!denom) + if (denom == 0) throw MYMONEYEXCEPTION_CSTRING("Denominator 0 not allowed!"); *this = AlkValue(QString::fromLatin1("%1/%2").arg(iAmount).arg(denom), eMyMoney::Money::_decimalSeparator); }