diff --git a/widgets/radiobutton.h b/widgets/radiobutton.h index 311887850..014e48d65 100644 --- a/widgets/radiobutton.h +++ b/widgets/radiobutton.h @@ -55,7 +55,7 @@ public: RadioButton(QGraphicsItem *parent = 0); virtual ~RadioButton(); - // QGraphicsItem overriden virtual methods + // QGraphicsItem overridden virtual methods QRectF boundingRect() const; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); diff --git a/widgets/vboxlayout.cpp b/widgets/vboxlayout.cpp index 00d87de76..fca66ff6e 100644 --- a/widgets/vboxlayout.cpp +++ b/widgets/vboxlayout.cpp @@ -88,30 +88,30 @@ void VBoxLayout::setGeometry(const QRectF& geometry) qDebug("Geometry %p : %f, %f by %f, %f", this, geometry.x(), geometry.y(), geometry.width(), geometry.height()); - QList childs; - QList expandingChilds; + QList children; + QList expandingChildren; QList sizes; QSizeF available = geometry.size() - QSizeF(2 * margin(), 2 * margin()); foreach (LayoutItem *l, d->childList) { kDebug() << "testing layout item " << l << endl; if (l->expandingDirections() & Qt::Vertical) { - expandingChilds += l; + expandingChildren += l; } else { - childs += l; + children += l; } } - foreach (LayoutItem *l, childs) { + foreach (LayoutItem *l, children) { QSizeF hint = l->sizeHint(); sizes.insert(indexOf(l), QSizeF(available.width(), hint.height())); available -= QSizeF(0.0, hint.height() + spacing()); } - qreal expandHeight = (available.height() - ((expandingChilds.count() - 1) * spacing())) / expandingChilds.count(); + qreal expandHeight = (available.height() - ((expandingChildren.count() - 1) * spacing())) / expandingChildren.count(); - foreach (LayoutItem *l, expandingChilds) { + foreach (LayoutItem *l, expandingChildren) { sizes.insert(indexOf(l),QSizeF(available.width(), expandHeight)); }