diff --git a/applet.cpp b/applet.cpp index e4bbef8d4..6c652c897 100644 --- a/applet.cpp +++ b/applet.cpp @@ -1036,7 +1036,7 @@ QStringList Applet::knownCategories(const QString &parentApp, bool visibleOnly) QStringList categories; foreach (const KService::Ptr applet, offers) { QString appletCategory = applet->property("X-KDE-PluginInfo-Category").toString(); - if (visibleOnly && applet->property("NoDisplay").toBool()) { + if (visibleOnly && applet->noDisplay()) { // we don't want to show the hidden category continue; } diff --git a/dataengine.cpp b/dataengine.cpp index 0232736ff..b68c44eaf 100644 --- a/dataengine.cpp +++ b/dataengine.cpp @@ -427,7 +427,7 @@ bool DataEngine::isValid() const bool DataEngine::isEmpty() const { - return d->sources.count() < 1; + return d->sources.isEmpty(); } void DataEngine::setValid(bool valid) diff --git a/widgets/layoutanimator.cpp b/widgets/layoutanimator.cpp index b47f77295..ef0a60eef 100644 --- a/widgets/layoutanimator.cpp +++ b/widgets/layoutanimator.cpp @@ -119,14 +119,15 @@ void LayoutAnimator::setAutoDeleteOnRemoval(bool autoDelete) SLOT(itemAutoDeleter(LayoutItem*,State,State)) ); } } + bool LayoutAnimator::autoDeleteOnRemoval() const { return d->autoDeleteOnRemoval; } + void LayoutAnimator::itemAutoDeleter(LayoutItem *item , State oldState , State newState) { if ( oldState == RemovedState && newState == DeadState ) { - if ( item->graphicsItem() ) { item->graphicsItem()->scene()->removeItem( item->graphicsItem() ); @@ -137,6 +138,7 @@ void LayoutAnimator::itemAutoDeleter(LayoutItem *item , State oldState , State n delete item; } } + void LayoutAnimator::setEffect( State action , int effect ) { d->effects[action] = effect;