SVN_SILENT style guide fixes
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=738950
This commit is contained in:
parent
9b29f430db
commit
14c8999f12
@ -154,10 +154,11 @@ public:
|
|||||||
|
|
||||||
// qDebug() << "Item geometry: " << newGeometry;
|
// qDebug() << "Item geometry: " << newGeometry;
|
||||||
|
|
||||||
if ( q->animator() )
|
if (q->animator()) {
|
||||||
q->animator()->setGeometry(item, newGeometry);
|
q->animator()->setGeometry(item, newGeometry);
|
||||||
else
|
} else {
|
||||||
item->setGeometry(newGeometry);
|
item->setGeometry(newGeometry);
|
||||||
|
}
|
||||||
|
|
||||||
return newPos;
|
return newPos;
|
||||||
}
|
}
|
||||||
|
24
uiloader.cpp
24
uiloader.cpp
@ -53,7 +53,6 @@ UiLoader::UiLoader( QObject *parent )
|
|||||||
<< "Label"
|
<< "Label"
|
||||||
<< "PushButton"
|
<< "PushButton"
|
||||||
<< "RadioButton"
|
<< "RadioButton"
|
||||||
<< "Rectangle"
|
|
||||||
<< "Meter";
|
<< "Meter";
|
||||||
|
|
||||||
d->layouts
|
d->layouts
|
||||||
@ -74,30 +73,27 @@ QStringList UiLoader::availableWidgets() const
|
|||||||
|
|
||||||
Widget *UiLoader::createWidget( const QString &className, Widget *parent )
|
Widget *UiLoader::createWidget( const QString &className, Widget *parent )
|
||||||
{
|
{
|
||||||
if ( className == QString("CheckBox") ) {
|
if (className == QString("CheckBox")) {
|
||||||
return new CheckBox( parent );
|
return new CheckBox( parent );
|
||||||
}
|
}
|
||||||
else if ( className == QString("Flash") ) {
|
else if (className == QString("Flash")) {
|
||||||
return new Flash( parent );
|
return new Flash( parent );
|
||||||
}
|
}
|
||||||
else if ( className == QString("Icon") ) {
|
else if (className == QString("Icon")) {
|
||||||
return new Icon( parent );
|
return new Icon( parent );
|
||||||
}
|
}
|
||||||
else if ( className == QString("Label") ) {
|
else if (className == QString("Label")) {
|
||||||
return new Label( parent ); // Constructor here requires a Widget
|
return new Label( parent ); // Constructor here requires a Widget
|
||||||
}
|
}
|
||||||
else if ( className == QString("PushButton") ) {
|
else if (className == QString("PushButton")) {
|
||||||
return new PushButton( parent ); // Constructor here requires a Widget
|
return new PushButton( parent ); // Constructor here requires a Widget
|
||||||
}
|
}
|
||||||
else if ( className == QString("RadioButton") ) {
|
else if (className == QString("RadioButton")) {
|
||||||
return new RadioButton( parent );
|
return new RadioButton( parent );
|
||||||
}
|
}
|
||||||
else if ( className == QString("Meter") ) {
|
else if (className == QString("Meter")) {
|
||||||
return new Meter( parent );
|
return new Meter( parent );
|
||||||
}
|
}
|
||||||
//else if ( className == QString("Rectangle") ) {
|
|
||||||
// return new Rectangle( parent ); // Constructor here requires a Widget
|
|
||||||
//}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -109,13 +105,13 @@ QStringList UiLoader::availableLayouts() const
|
|||||||
|
|
||||||
Layout *UiLoader::createLayout( const QString &className, LayoutItem *parent )
|
Layout *UiLoader::createLayout( const QString &className, LayoutItem *parent )
|
||||||
{
|
{
|
||||||
if ( className == QString("HBoxLayout") ) {
|
if (className == QString("HBoxLayout")) {
|
||||||
return new HBoxLayout( parent );
|
return new HBoxLayout( parent );
|
||||||
}
|
}
|
||||||
else if ( className == QString("VBoxLayout") ) {
|
else if (className == QString("VBoxLayout")) {
|
||||||
return new VBoxLayout( parent );
|
return new VBoxLayout( parent );
|
||||||
}
|
}
|
||||||
else if ( className == QString("FlowLayout") ) {
|
else if (className == QString("FlowLayout")) {
|
||||||
return new FlowLayout( parent );
|
return new FlowLayout( parent );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -43,14 +43,14 @@ class PLASMA_EXPORT UiLoader : public QObject
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
UiLoader( QObject *parent = 0 );
|
UiLoader(QObject *parent = 0);
|
||||||
virtual ~UiLoader();
|
virtual ~UiLoader();
|
||||||
|
|
||||||
QStringList availableWidgets() const;
|
QStringList availableWidgets() const;
|
||||||
Widget *createWidget( const QString &className, Widget *parent=0 );
|
Widget *createWidget(const QString &className, Widget *parent = 0);
|
||||||
|
|
||||||
QStringList availableLayouts() const;
|
QStringList availableLayouts() const;
|
||||||
Layout *createLayout( const QString &className, LayoutItem *parent );
|
Layout *createLayout(const QString &className, LayoutItem *parent);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
class Private;
|
class Private;
|
||||||
|
Loading…
Reference in New Issue
Block a user