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

Merge remote-tracking branch 'origin/master' into libplasma2

Browse Source 
Conflicts:
	plasma/service.cpp
This commit is contained in:
Aaron Seigo 2011-06-03 13:15:36 +02:00
commit fa61d11d3c
5 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
private/dataenginebindings_p.h
View File

@ -30,8 +30,6 @@
using namespace Plasma;
Q_DECLARE_METATYPE(Service*)
Q_DECLARE_METATYPE(ServiceJob*)
Q_DECLARE_METATYPE(DataEngine::Dict)
Q_DECLARE_METATYPE(DataEngine::Data)

16
service.cpp
View File

@ -251,6 +251,10 @@ ServiceJob *Service::startOperationCall(const KConfigGroup &description, QObject
void Service::associateWidget(QWidget *widget, const QString &operation)
{
if (!widget) {
return;
}
disassociateWidget(widget);
d->associatedWidgets.insert(widget, operation);
connect(widget, SIGNAL(destroyed(QObject*)), this, SLOT(associatedWidgetDestroyed(QObject*)));
@ -260,6 +264,10 @@ void Service::associateWidget(QWidget *widget, const QString &operation)
void Service::disassociateWidget(QWidget *widget)
{
if (!widget) {
return;
}
disconnect(widget, SIGNAL(destroyed(QObject*)),
this, SLOT(associatedWidgetDestroyed(QObject*)));
d->associatedWidgets.remove(widget);
@ -267,6 +275,10 @@ void Service::disassociateWidget(QWidget *widget)
void Service::associateWidget(QGraphicsWidget *widget, const QString &operation)
{
if (!widget) {
return;
}
disassociateWidget(widget);
d->associatedGraphicsWidgets.insert(widget, operation);
connect(widget, SIGNAL(destroyed(QObject*)),
@ -277,6 +289,10 @@ void Service::associateWidget(QGraphicsWidget *widget, const QString &operation)
void Service::disassociateWidget(QGraphicsWidget *widget)
{
if (!widget) {
return;
}
disconnect(widget, SIGNAL(destroyed(QObject*)),
this, SLOT(associatedGraphicsWidgetDestroyed(QObject*)));
d->associatedGraphicsWidgets.remove(widget);

2
service.h
View File

@ -317,6 +317,8 @@ private:
} // namespace Plasma
Q_DECLARE_METATYPE(Plasma::Service *)
/**
* Register a service when it is contained in a loadable module
*/

2
servicejob.h
View File

@ -133,5 +133,7 @@ private:
} // namespace Plasma
Q_DECLARE_METATYPE(Plasma::ServiceJob *)
#endif // multiple inclusion guard

2
widgets/slider.h
View File

@ -41,7 +41,7 @@ class PLASMA_EXPORT Slider : public QGraphicsProxyWidget
Q_OBJECT
Q_PROPERTY(QGraphicsWidget *parentWidget READ parentWidget)
Q_PROPERTY(int maximum READ maximum WRITE setMinimum)
Q_PROPERTY(int maximum READ maximum WRITE setMaximum)
Q_PROPERTY(int minimum READ minimum WRITE setMinimum)
Q_PROPERTY(int value READ value WRITE setValue NOTIFY valueChanged)
Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)