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

SVN_SILENT: style fixes

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=712122
This commit is contained in:
Aaron J. Seigo 2007-09-13 17:04:04 +00:00
parent fc4b474f5c
commit e2b9f9df31
3 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
widgets/boxlayout.h
View File

@ -64,7 +64,7 @@ class PLASMA_EXPORT BoxLayout : public Layout
/** Inserts a new item into the layout at the specified index. */
void insertItem(int index, LayoutItem *l);
// reimplemented from Layout
virtual void addItem(LayoutItem *l);
virtual void removeItem(LayoutItem *l);

24
widgets/layout.cpp
View File

@ -88,9 +88,10 @@ void Layout::invalidate()
do {
parentLayout = dynamic_cast<Layout*>(layout->parent());
if ( parentLayout )
if (parentLayout) {
layout = parentLayout;
} while ( parentLayout );
}
} while (parentLayout);
layout->update();
}
@ -101,34 +102,34 @@ LayoutAnimator* Layout::animator() const
return d->animator;
}
void Layout::setAnimator(LayoutAnimator* animator)
void Layout::setAnimator(LayoutAnimator *animator)
{
d->animator = animator;
}
qreal Layout::margin() const
{
return d->margin;
return d->margin;
}
void Layout::setMargin(qreal m)
{
d->margin = m;
d->margin = m;
}
qreal Layout::spacing() const
{
return d->spacing;
return d->spacing;
}
void Layout::setSpacing(qreal s)
{
d->spacing = s;
d->spacing = s;
}
LayoutItem *Layout::parent() const
{
return d->parent;
return d->parent;
}
QSizeF Layout::minimumSize() const
@ -139,11 +140,12 @@ QSizeF Layout::maximumSize() const
{
return QSizeF(INFINITY,INFINITY);
}
void Layout::startAnimation()
{
if ( animator() && animator()->timeLine() ) {
animator()->timeLine()->setCurrentTime(0);
if ( animator()->timeLine()->state() == QTimeLine::NotRunning ) {
if (animator() && animator()->timeLine()) {
animator()->timeLine()->setCurrentTime(0);
if (animator()->timeLine()->state() == QTimeLine::NotRunning) {
animator()->timeLine()->start();
}
}

36
widgets/layout.h
View File

@ -41,42 +41,42 @@ class LayoutAnimator;
class PLASMA_EXPORT Layout : public LayoutItem
{
public:
public:
/**
* Constructor.
*/
explicit Layout(LayoutItem *parent);
explicit Layout(LayoutItem *parent);
/**
* Virtual Destructor.
*/
virtual ~Layout();
virtual ~Layout();
/**
* Returns the margin of this Layout.
*/
qreal margin() const;
qreal margin() const;
/**
* Sets the margin of this Layout.
*/
void setMargin(qreal m);
void setMargin(qreal m);
/**
* Returns the spacing between Layout elements of this Layout.
*/
qreal spacing() const;
qreal spacing() const;
/**
* Sets the spacing of this Layout.
*/
void setSpacing(qreal s);
void setSpacing(qreal s);
/**
* Returns the parent of this Layout.
*/
LayoutItem *parent() const;
LayoutItem *parent() const;
/**
* Sets the parent of this layout.
@ -86,42 +86,42 @@ class PLASMA_EXPORT Layout : public LayoutItem
/**
* Returns the number of elements of this Layout.
*/
virtual int count() const = 0;
virtual int count() const = 0;
/**
* Returns true if this Layout contains no elements, false otherwise.
*/
bool isEmpty() const;
bool isEmpty() const;
/**
* Adds a Item to this Layout.
* @param l Pointer to the Item to be added.
*/
virtual void addItem(LayoutItem *l) = 0;
virtual void addItem(LayoutItem *l) = 0;
/**
* Removes a Item from this Layout.
* @param l Pointer to the Item to be removed.
*/
virtual void removeItem(LayoutItem *l) = 0;
virtual void removeItem(LayoutItem *l) = 0;
/**
* Returns the index of a Item in this Layout.
* @param l Pointer to an Item to be queryed.
*/
virtual int indexOf(LayoutItem *l) const = 0;
virtual int indexOf(LayoutItem *l) const = 0;
/**
* Returns a Pointer to an Item in this Layout.
* @param i Index of the desired Item.
*/
virtual LayoutItem *itemAt(int i) const = 0;
virtual LayoutItem *itemAt(int i) const = 0;
/**
* Takes the Pointer of an Item in this Layout.
* @param i Index of the desired Item.
*/
virtual LayoutItem *takeAt(int i) = 0;
virtual LayoutItem *takeAt(int i) = 0;
/**
* Returns the object controlling animation of changes
@ -162,9 +162,9 @@ class PLASMA_EXPORT Layout : public LayoutItem
*/
void startAnimation();
private:
class Private;
Private *const d;
private:
class Private;
Private *const d;
};
}