CVS commit by goossens: a small, errr... how should i put it... const-ipation M +8 -8 kdmthemer.cpp 1.59 M +3 -3 kdmthemer.h 1.22 --- kdenonbeta/kdmthemes/kdmthemer.cpp #1.58:1.59 @@ -206,5 +206,5 @@ void KdmThemer::mousePressEvent (QMouseE } -void KdmThemer::generateItems(KdmWidget *parent, QDomNode *node) +void KdmThemer::generateItems(KdmWidget *parent, const QDomNode &node) { @@ -234,5 +234,5 @@ void KdmThemer::generateItems(KdmWidget */ - if (!node) // It's the first node, get its child nodes + if (node.isNull()) // It's the first node, get its child nodes { QDomElement theme=themeFile->tree()->documentElement(); @@ -256,5 +256,5 @@ void KdmThemer::generateItems(KdmWidget else { - subnodeList=node->childNodes(); + subnodeList=node.childNodes(); subnodeRect=parentRect; } @@ -486,5 +486,5 @@ QRect KdmThemer::generateItem(KdmWidget // Step 3: Now add all the possible childs kdDebug()<<"Element loaded Ok. Reading child nodes\n"; - if (newItem) generateItems(newItem,&node); + if (newItem) generateItems(newItem,node); //FIXME needs to return a meaningful QRect! @@ -557,10 +557,10 @@ QRect KdmThemer::generateBox(KdmWidget * // Now add all the childs - generateItems(boxItem,&node); + generateItems(boxItem,node); return (boxItem->area()); } -QRect KdmThemer::generateFixed(KdmWidget *parent,QDomNode &node) +QRect KdmThemer::generateFixed(KdmWidget *parent, const QDomNode &node) { @@ -581,5 +581,5 @@ QRect KdmThemer::generateFixed(KdmWidget // Now draw all the childs - generateItems(newFixed,&node); + generateItems(newFixed,node); return(newFixed->area()); @@ -587,5 +587,5 @@ QRect KdmThemer::generateFixed(KdmWidget } -QStringList KdmThemer::findModes(QDomNode &node) +QStringList KdmThemer::findModes(const QDomNode &node) { --- kdenonbeta/kdmthemes/kdmthemer.h #1.21:1.22 @@ -98,5 +98,5 @@ class KdmThemer: public QWidget */ - QStringList findModes(QDomNode &node); + QStringList findModes(const QDomNode &node); @@ -136,5 +136,5 @@ class KdmThemer: public QWidget */ - void generateItems(KdmWidget *parent=0, QDomNode *node=0); + void generateItems(KdmWidget *parent=0, const QDomNode &node=QDomNode()); /* @@ -159,5 +159,5 @@ class KdmThemer: public QWidget */ - QRect generateFixed(KdmWidget *parent, QDomNode &node); + QRect generateFixed(KdmWidget *parent, const QDomNode &node);