alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

-clean up some coding standards

Browse Source 
-const up some variables

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=772901
This commit is contained in:
Bill Egert 2008-02-09 17:40:07 +00:00
parent f6be272915
commit 8917da5723
5 changed files with 85 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
layouts/flowlayout.cpp
View File

@ -175,11 +175,12 @@ void FlowLayout::relayout()
if( minItemHeight != 0) {
rowMax = (int)(rectHeight / (minItemHeight + space) );
} else {
kDebug() << "*************POSSIBLE DIVIDE BY ZERO **************";
kDebug() << "******POSSIBLE DIVIDE BY ZERO: minItemHeight *******";
rowMax = 1;
}
if( maxItemWidth == 0) {
kDebug() << "*************POSSIBLE DIVIDE BY ZERO **************";
kDebug() << "******POSSIBLE DIVIDE BY ZERO: maxItemWidth ********";
maxItemWidth = 20;
}

2
layouts/freelayout.cpp
View File

@ -97,7 +97,7 @@ void FreeLayout::relayout()
{
foreach (LayoutItem *child , d->children) {
if (child->geometry().size() != child->sizeHint()) {
QSizeF newSize = child->sizeHint().expandedTo(minimumSize()).boundedTo(maximumSize());
const QSizeF newSize = child->sizeHint().expandedTo(minimumSize()).boundedTo(maximumSize());
child->setGeometry(QRectF(child->geometry().topLeft(), newSize));
}
}

48
layouts/layout.cpp
View File

@ -159,18 +159,18 @@ void Layout::setAnimator(LayoutAnimator *animator)
qreal Layout::margin(Plasma::MarginEdge edge) const
{
switch (edge) {
case LeftMargin:
return d->leftMargin;
break;
case RightMargin:
return d->rightMargin;
break;
case TopMargin:
return d->topMargin;
break;
case BottomMargin:
return d->bottomMargin;
break;
case LeftMargin:
return d->leftMargin;
break;
case RightMargin:
return d->rightMargin;
break;
case TopMargin:
return d->topMargin;
break;
case BottomMargin:
return d->bottomMargin;
break;
}
return 0;
@ -179,18 +179,18 @@ qreal Layout::margin(Plasma::MarginEdge edge) const
void Layout::setMargin(Plasma::MarginEdge edge, qreal m)
{
switch (edge) {
case LeftMargin:
d->leftMargin = m;
break;
case RightMargin:
d->rightMargin = m;
break;
case TopMargin:
d->topMargin = m;
break;
case BottomMargin:
d->bottomMargin = m;
break;
case LeftMargin:
d->leftMargin = m;
break;
case RightMargin:
d->rightMargin = m;
break;
case TopMargin:
d->topMargin = m;
break;
case BottomMargin:
d->bottomMargin = m;
break;
}
}

105
layouts/layoutanimator.cpp
View File

@ -58,10 +58,11 @@ public:
qreal delta(qreal currentValue) const
{
if ( currentValue > lastValue )
if ( currentValue > lastValue ) {
return currentValue - lastValue;
else
} else {
return (1.0-lastValue) + currentValue;
}
}
QRectF interpolateGeometry(LayoutItem* item,qreal value) const
@ -80,7 +81,7 @@ public:
}
void prepareItemForState( LayoutItem *item , LayoutAnimator::State state ) {
// opacity setting for widgets
Widget *widget = dynamic_cast<Widget*>(item->graphicsItem());
if (widget) {
@ -115,7 +116,7 @@ void LayoutAnimator::setAutoDeleteOnRemoval(bool autoDelete)
if ( autoDelete ) {
connect( this , SIGNAL(stateChanged(Plasma::LayoutItem*,Plasma::LayoutAnimator::State,Plasma::LayoutAnimator::State)) , this ,
SLOT(itemAutoDeleter(Plasma::LayoutItem*,Plasma::LayoutAnimator::State,Plasma::LayoutAnimator::State)) );
} else {
} else {
disconnect( this , SIGNAL(stateChanged(Plasma::LayoutItem*,Plasma::LayoutAnimator::State,Plasma::LayoutAnimator::State)) , this ,
SLOT(itemAutoDeleter(Plasma::LayoutItem*,Plasma::LayoutAnimator::State,Plasma::LayoutAnimator::State)) );
}
@ -164,11 +165,7 @@ void LayoutAnimator::setCurrentState( LayoutItem* item , State state )
}
LayoutAnimator::State LayoutAnimator::state( LayoutItem* item ) const
{
if ( !d->states.contains(item) ) {
return DeadState;
} else {
return d->states[item];
}
return !d->states.contains(item) ? DeadState : d->states[item];
}
void LayoutAnimator::setTimeLine(QTimeLine* timeLine)
@ -220,28 +217,31 @@ void LayoutAnimator::moveEffectUpdateItem( qreal value , LayoutItem* item , Effe
{
Widget* widget = dynamic_cast<Widget*>(item->graphicsItem());
if ( widget && effect == FadeInMoveEffect )
if ( widget && effect == FadeInMoveEffect ) {
widget->setOpacity( qMin(qreal(1.0),widget->opacity()+d->delta(value)) );
else if ( widget && effect == FadeOutMoveEffect )
} else if ( widget && effect == FadeOutMoveEffect ) {
widget->setOpacity( qMax(qreal(0.0),widget->opacity()-d->delta(value)) );
}
if ( effect == FadeInMoveEffect || effect == FadeOutMoveEffect ) {
const QRectF finalGeometry = d->geometries[item].endGeometry;
if ( item->geometry() != finalGeometry )
item->setGeometry( finalGeometry );
}
else
if ( item->geometry() != finalGeometry ) {
item->setGeometry( finalGeometry );
}
} else {
item->setGeometry( d->interpolateGeometry(item,value) );
}
}
void LayoutAnimator::noEffectUpdateItem( qreal , LayoutItem* item )
{
const QRectF finalGeometry = d->geometries[item].endGeometry;
if ( item->geometry() != finalGeometry )
if ( item->geometry() != finalGeometry ) {
item->setGeometry( finalGeometry );
}
}
void LayoutAnimator::fadeEffectUpdateItem( qreal value , LayoutItem* item )
@ -249,18 +249,13 @@ void LayoutAnimator::fadeEffectUpdateItem( qreal value , LayoutItem* item )
Widget* widget = dynamic_cast<Widget*>(item->graphicsItem());
qreal threshold = 0;
if ( widget != 0 && d->geometries[item].startGeometry != d->geometries[item].endGeometry ) {
if ( widget != 0 && d->geometries[item].startGeometry != d->geometries[item].endGeometry ) {
widget->setOpacity( qAbs( (value*2)-1.0 ) );
threshold = 0.5;
}
QRectF newGeometry;
if ( value < threshold )
newGeometry = d->geometries[item].startGeometry;
else
newGeometry = d->geometries[item].endGeometry;
const QRectF newGeometry = ( value < threshold ) ? d->geometries[item].startGeometry : d->geometries[item].endGeometry;
item->setGeometry(newGeometry);
}
@ -269,19 +264,19 @@ void LayoutAnimator::animationFinished(LayoutItem* item)
{
switch ( state(item) )
{
case InsertedState:
setCurrentState(item,StandardState);
break;
case RemovedState:
d->states.remove(item);
d->geometries.remove(item);
emit stateChanged(item, RemovedState, DeadState);
break;
case StandardState:
d->geometries[item].startGeometry = d->geometries[item].endGeometry;
break;
default:
Q_ASSERT(false);
case InsertedState:
setCurrentState(item,StandardState);
break;
case RemovedState:
d->states.remove(item);
d->geometries.remove(item);
emit stateChanged(item, RemovedState, DeadState);
break;
case StandardState:
d->geometries[item].startGeometry = d->geometries[item].endGeometry;
break;
default:
Q_ASSERT(false);
}
}
@ -293,23 +288,23 @@ void LayoutAnimator::updateItem( qreal value , LayoutItem* item )
switch ( effect(d->states[item]) )
{
case NoEffect:
noEffectUpdateItem(value,item);
break;
case MoveEffect:
moveEffectUpdateItem(value,item,MoveEffect);
break;
case FadeInMoveEffect:
moveEffectUpdateItem(value,item,FadeInMoveEffect);
break;
case FadeOutMoveEffect:
moveEffectUpdateItem(value,item,FadeOutMoveEffect);
break;
case FadeEffect:
fadeEffectUpdateItem(value,item);
break;
default:
Q_ASSERT(false);
case NoEffect:
noEffectUpdateItem(value,item);
break;
case MoveEffect:
moveEffectUpdateItem(value,item,MoveEffect);
break;
case FadeInMoveEffect:
moveEffectUpdateItem(value,item,FadeInMoveEffect);
break;
case FadeOutMoveEffect:
moveEffectUpdateItem(value,item,FadeOutMoveEffect);
break;
case FadeEffect:
fadeEffectUpdateItem(value,item);
break;
default:
Q_ASSERT(false);
}
}

10
layouts/nodelayout.cpp
View File

@ -99,10 +99,14 @@ public:
QRectF calculateRectangle(LayoutItem * item, QRectF geometry = QRectF()) const
{
if (geometry == QRectF()) geometry = parent->geometry();
if (geometry == QRectF()) {
geometry = parent->geometry();
}
QRectF result;
if (!item || !items.contains(item)) return QRectF();
if (!item || !items.contains(item)) {
return QRectF();
}
result.setTopLeft(calculatePosition(items[item].first, geometry));
@ -134,7 +138,7 @@ public:
}
} else {
// Calculate size hint for current item
QRectF scaled = calculateRectangle(item, QRectF(0, 0, 1, 1));
const QRectF scaled = calculateRectangle(item, QRectF(0, 0, 1, 1));
// qMin(..., 1.0) so that for autosized elements we don't get smaller
// size than the item's size itself. The sizeHint for NodeLayout can