[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeutils/kcalc
From: Evan Teran <eteran () alum ! rit ! edu>
Date: 2010-08-27 16:49:11
Message-ID: 20100827164911.15EA5AC857 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1168870 by teran:
using const_iterators
using intializer lists
explicitly using quint64 type instead of unsigned long long, it is both shorter to type
and more expresive in that it is a specific bit width
M +3 -3 kcalc_bitset.cpp
M +4 -4 kcalc_bitset.h
M +8 -12 stats.cpp
--- trunk/KDE/kdeutils/kcalc/kcalc_bitset.cpp #1168869:1168870
@@ -110,7 +110,7 @@
}
}
-void KCalcBitset::setValue(unsigned long long value)
+void KCalcBitset::setValue(quint64 value)
{
if (value_ == value) return;
@@ -122,14 +122,14 @@
}
}
-unsigned long long KCalcBitset::getValue()
+quint64 KCalcBitset::getValue()
{
return value_;
}
void KCalcBitset::slotToggleBit(int bit)
{
- unsigned long long nv = getValue() ^(1LL << bit);
+ quint64 nv = getValue() ^(1LL << bit);
setValue(nv);
emit valueChanged(value_);
}
--- trunk/KDE/kdeutils/kcalc/kcalc_bitset.h #1168869:1168870
@@ -28,18 +28,18 @@
Q_OBJECT
public:
KCalcBitset(QWidget *parent = 0);
- unsigned long long getValue();
+ quint64 getValue();
public slots:
- void setValue(unsigned long long value);
+ void setValue(quint64 value);
void slotToggleBit(int bit);
signals:
- void valueChanged(unsigned long long value);
+ void valueChanged(quint64 value);
private:
QButtonGroup *bit_button_group_;
- unsigned long long value_;
+ quint64 value_;
};
class BitButton : public QAbstractButton
--- trunk/KDE/kdeutils/kcalc/stats.cpp #1168869:1168870
@@ -29,9 +29,8 @@
#include <stdio.h>
#endif
-KStats::KStats()
+KStats::KStats() : error_flag_(false)
{
- error_flag_ = false;
}
KStats::~KStats()
@@ -70,9 +69,8 @@
{
KNumber result = 0;
- QVector<KNumber>::iterator p;
- for (p = data_.begin(); p != data_.end(); ++p) {
+ for (QVector<KNumber>::const_iterator p = data_.begin(); p != data_.end(); ++p) {
result += *p;
}
@@ -101,15 +99,15 @@
return data_.at(0);
// need to copy data_-list, because sorting afterwards
- QVector<KNumber> tmp_mData(data_);
- qSort(tmp_mData);
+ QVector<KNumber> tmp_data(data_);
+ qSort(tmp_data);
if (bound & 1) { // odd
index = (bound - 1) / 2 + 1;
- result = tmp_mData.at(index - 1);
+ result = tmp_data.at(index - 1);
} else { // even
index = bound / 2;
- result = ((tmp_mData.at(index - 1)) + (tmp_mData.at(index))) / KNumber(2);
+ result = ((tmp_data.at(index - 1)) + (tmp_data.at(index))) / KNumber(2);
}
return result;
@@ -120,11 +118,10 @@
{
KNumber result = KNumber::Zero;
KNumber mean_value;
- QVector<KNumber>::iterator p;
mean_value = mean();
- for (p = data_.begin(); p != data_.end(); ++p) {
+ for (QVector<KNumber>::const_iterator p = data_.begin(); p != data_.end(); ++p) {
result += (*p - mean_value) * (*p - mean_value);
}
@@ -136,9 +133,8 @@
{
KNumber result = 0;
- QVector<KNumber>::iterator p;
- for (p = data_.begin(); p != data_.end(); ++p) {
+ for (QVector<KNumber>::const_iterator p = data_.begin(); p != data_.end(); ++p) {
result += ((*p) * (*p));
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic