[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeutils/kcalc/knumber
From: Evan Teran <eteran () alum ! rit ! edu>
Date: 2010-09-04 0:47:21
Message-ID: 20100904004721.D896AAC884 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1171502 by teran:
once again, returning a const copy does nothing, removing const
M +21 -21 knumber.cpp
M +21 -21 knumber.h
M +4 -4 knumber_priv.cpp
M +5 -5 knumber_priv.h
--- trunk/KDE/kdeutils/kcalc/knumber/knumber.cpp #1171501:1171502
@@ -32,10 +32,10 @@
using namespace std;
-KNumber const KNumber::Zero(0);
-KNumber const KNumber::One(1);
-KNumber const KNumber::MinusOne(-1);
-KNumber const KNumber::NotDefined("nan");
+const KNumber KNumber::Zero(0);
+const KNumber KNumber::One(1);
+const KNumber KNumber::MinusOne(-1);
+const KNumber KNumber::NotDefined("nan");
bool KNumber::FloatOutput = false;
bool KNumber::FractionInput = false;
bool KNumber::SplitOffIntegerOutput = false;
@@ -312,7 +312,7 @@
-QString const KNumber::toQString(int width, int prec) const
+QString KNumber::toQString(int width, int prec) const
{
QString tmp_str;
@@ -398,32 +398,32 @@
mpf_set_default_prec(bin_prec);
}
-KNumber const KNumber::abs() const
+KNumber KNumber::abs() const
{
return KNumber(num_->abs());
}
-KNumber const KNumber::cbrt() const
+KNumber KNumber::cbrt() const
{
return KNumber(num_->cbrt());
}
-KNumber const KNumber::sqrt() const
+KNumber KNumber::sqrt() const
{
return KNumber(num_->sqrt());
}
-KNumber const KNumber::factorial() const
+KNumber KNumber::factorial() const
{
return KNumber(num_->factorial());
}
-KNumber const KNumber::integerPart() const
+KNumber KNumber::integerPart() const
{
return KNumber(num_->intPart());
}
-KNumber const KNumber::power(const KNumber &exp) const
+KNumber KNumber::power(const KNumber &exp) const
{
if (*this == Zero) {
if (exp == Zero)
@@ -449,31 +449,31 @@
}
-KNumber const KNumber::operator-() const
+KNumber KNumber::operator-() const
{
return KNumber(num_->change_sign());
}
-KNumber const KNumber::operator+(const KNumber &arg2) const
+KNumber KNumber::operator+(const KNumber &arg2) const
{
KNumber tmp_num(num_->add(*arg2.num_));
tmp_num.simplifyRational();
return tmp_num;
}
-KNumber const KNumber::operator-(const KNumber &arg2) const
+KNumber KNumber::operator-(const KNumber &arg2) const
{
return *this + (-arg2);
}
-KNumber const KNumber::operator*(const KNumber &arg2) const
+KNumber KNumber::operator*(const KNumber &arg2) const
{
KNumber tmp_num(num_->multiply(*arg2.num_));
tmp_num.simplifyRational();
return tmp_num;
}
-KNumber const KNumber::operator/(const KNumber &arg2) const
+KNumber KNumber::operator/(const KNumber &arg2) const
{
KNumber tmp_num(num_->divide(*arg2.num_));
tmp_num.simplifyRational();
@@ -481,7 +481,7 @@
}
-KNumber const KNumber::operator%(const KNumber &arg2) const
+KNumber KNumber::operator%(const KNumber &arg2) const
{
if (type() != IntegerType || arg2.type() != IntegerType)
return Zero;
@@ -492,7 +492,7 @@
return KNumber(tmp_arg1->mod(*tmp_arg2));
}
-KNumber const KNumber::operator&(const KNumber &arg2) const
+KNumber KNumber::operator&(const KNumber &arg2) const
{
if (type() != IntegerType || arg2.type() != IntegerType)
return Zero;
@@ -504,7 +504,7 @@
}
-KNumber const KNumber::operator|(const KNumber &arg2) const
+KNumber KNumber::operator|(const KNumber &arg2) const
{
if (type() != IntegerType || arg2.type() != IntegerType)
return Zero;
@@ -516,7 +516,7 @@
}
-KNumber const KNumber::operator<<(const KNumber &arg2) const
+KNumber KNumber::operator<<(const KNumber &arg2) const
{
if (type() != IntegerType || arg2.type() != IntegerType)
return KNumber("nan");
@@ -527,7 +527,7 @@
return KNumber(tmp_arg1->shift(*tmp_arg2));
}
-KNumber const KNumber::operator>>(const KNumber &arg2) const
+KNumber KNumber::operator>>(const KNumber &arg2) const
{
if (type() != IntegerType || arg2.type() != IntegerType)
return KNumber("nan");
--- trunk/KDE/kdeutils/kcalc/knumber/knumber.h #1171501:1171502
@@ -65,10 +65,10 @@
class KDE_EXPORT KNumber
{
public:
- static KNumber const Zero;
- static KNumber const One;
- static KNumber const MinusOne;
- static KNumber const NotDefined;
+ static const KNumber Zero;
+ static const KNumber One;
+ static const KNumber MinusOne;
+ static const KNumber NotDefined;
/**
* KNumber tries to provide transparent access to the following type
@@ -176,7 +176,7 @@
* is ignored.
*
*/
- QString const toQString(int width = -1, int prec = -1) const;
+ QString toQString(int width = -1, int prec = -1) const;
/**
* Compute the absolute value, i.e. @p x.abs() returns the value
@@ -185,7 +185,7 @@
* 0\end{array}\right.\f]
* This method works for \f$ x = \infty \f$ and \f$ x = -\infty \f$.
*/
- KNumber const abs() const;
+ KNumber abs() const;
/**
* Compute the square root. If \f$ x < 0 \f$ (including \f$
@@ -198,7 +198,7 @@
*
* This method works for \f$ x = \infty \f$ giving \f$ \infty \f$.
*/
- KNumber const sqrt() const;
+ KNumber sqrt() const;
/**
* Compute the cube root.
@@ -213,9 +213,9 @@
* This method works for \f$ x = \infty \f$ giving \f$ \infty \f$,
* and for \f$ x = -\infty \f$ giving \f$ -\infty \f$.
*/
- KNumber const cbrt() const;
+ KNumber cbrt() const;
- KNumber const factorial() const;
+ KNumber factorial() const;
/**
* Truncates a @p KNumber to its integer type returning a number of
@@ -224,21 +224,21 @@
* If \f$ x = \pm\infty \f$, integerPart leaves the value unchanged,
* i.e. it returns \f$ \pm\infty \f$.
*/
- KNumber const integerPart() const;
+ KNumber integerPart() const;
- KNumber const power(const KNumber &exp) const;
+ KNumber power(const KNumber &exp) const;
- KNumber const operator+(const KNumber &arg2) const;
- KNumber const operator -() const;
- KNumber const operator-(const KNumber &arg2) const;
- KNumber const operator*(const KNumber &arg2) const;
- KNumber const operator/(const KNumber &arg2) const;
- KNumber const operator%(const KNumber &arg2) const;
+ KNumber operator+(const KNumber &arg2) const;
+ KNumber operator -() const;
+ KNumber operator-(const KNumber &arg2) const;
+ KNumber operator*(const KNumber &arg2) const;
+ KNumber operator/(const KNumber &arg2) const;
+ KNumber operator%(const KNumber &arg2) const;
- KNumber const operator&(const KNumber &arg2) const;
- KNumber const operator|(const KNumber &arg2) const;
- KNumber const operator<<(const KNumber &arg2) const;
- KNumber const operator>>(const KNumber &arg2) const;
+ KNumber operator&(const KNumber &arg2) const;
+ KNumber operator|(const KNumber &arg2) const;
+ KNumber operator<<(const KNumber &arg2) const;
+ KNumber operator>>(const KNumber &arg2) const;
operator bool() const;
operator qint32() const;
--- trunk/KDE/kdeutils/kcalc/knumber/knumber_priv.cpp #1171501:1171502
@@ -201,7 +201,7 @@
return *this;
}
-QString const detail::knumerror::ascii(int prec) const
+QString detail::knumerror::ascii(int prec) const
{
Q_UNUSED(prec);
@@ -218,7 +218,7 @@
}
}
-QString const detail::knuminteger::ascii(int prec) const
+QString detail::knuminteger::ascii(int prec) const
{
Q_UNUSED(prec);
char *tmp_ptr = 0;
@@ -234,7 +234,7 @@
return ret_str;
}
-QString const detail::knumfraction::ascii(int prec) const
+QString detail::knumfraction::ascii(int prec) const
{
Q_UNUSED(prec);
char *tmp_ptr = mpq_get_str(0, 10, mpq_);
@@ -244,7 +244,7 @@
return ret_str;
}
-QString const detail::knumfloat::ascii(int prec) const
+QString detail::knumfloat::ascii(int prec) const
{
QString ret_str;
char *tmp_ptr = 0;
--- trunk/KDE/kdeutils/kcalc/knumber/knumber_priv.h #1171501:1171502
@@ -49,7 +49,7 @@
virtual NumType type() const = 0;
- virtual QString const ascii(int prec = -1) const = 0;
+ virtual QString ascii(int prec = -1) const = 0;
virtual knumber * abs() const = 0;
virtual knumber * intPart() const = 0;
@@ -93,7 +93,7 @@
return SpecialType;
}
- virtual QString const ascii(int prec = -1) const;
+ virtual QString ascii(int prec = -1) const;
virtual knumber * abs() const;
virtual knumber * intPart() const;
@@ -156,7 +156,7 @@
return IntegerType;
}
- virtual QString const ascii(int prec = -1) const;
+ virtual QString ascii(int prec = -1) const;
virtual knumber * abs() const;
virtual knumber * intPart() const;
@@ -215,7 +215,7 @@
return FractionType;
}
- virtual QString const ascii(int prec = -1) const;
+ virtual QString ascii(int prec = -1) const;
bool isInteger() const;
@@ -267,7 +267,7 @@
return FloatType;
}
- virtual QString const ascii(int prec = -1) const;
+ virtual QString ascii(int prec = -1) const;
virtual knumber * abs() const;
virtual knumber * intPart() const;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic