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

Pass fully-qualified arguments and return values to moc

Browse Source 
Summary: Otherwise it thinks it's different types.

Test Plan: tests pass, plasmashell works

Reviewers: #plasma, #frameworks, davidedmundson

Reviewed By: #plasma, davidedmundson

Subscribers: kde-frameworks-devel

Tags: #frameworks

Differential Revision: https://phabricator.kde.org/D21480
This commit is contained in:
Aleix Pol 2019-05-30 15:37:50 +02:00
parent fb8f02de76
commit f631aec33f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plasma/datacontainer.h
View File

@ -244,7 +244,7 @@ Q_SIGNALS:
* @param source the datacontainer the update was requested for. Useful
* for classes that update the data for several containers.
**/
void updateRequested(DataContainer *source);
void updateRequested(Plasma::DataContainer *source);
protected:
/**

4
src/plasma/dataengine.h
View File

@ -93,7 +93,7 @@ public:
* is parented to the DataEngine, but should be deleted by the
* caller when finished with it
*/
Q_INVOKABLE virtual Service *serviceForSource(const QString &source);
Q_INVOKABLE virtual Plasma::Service *serviceForSource(const QString &source);
/**
* @return description of the plugin that implements this DataEngine
@ -177,7 +177,7 @@ public:
* @param source the name of the source.
* @return pointer to a DataContainer, or zero on failure
**/
Q_INVOKABLE DataContainer *containerForSource(const QString &source);
Q_INVOKABLE Plasma::DataContainer *containerForSource(const QString &source);
/**
* @return The model associated to a source if any. The ownership of the model stays with the DataContainer.

2
src/plasma/service.h
View File

@ -135,7 +135,7 @@ public:
* @return a started ServiceJob; the consumer may connect to relevant
* signals before returning to the event loop
*/
Q_INVOKABLE ServiceJob *startOperationCall(const QVariantMap &description, QObject *parent = nullptr);
Q_INVOKABLE Plasma::ServiceJob *startOperationCall(const QVariantMap &description, QObject *parent = nullptr);
/**
* Query to find if an operation is enabled or not.