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

Revert "Pass fully-qualified arguments and return values to moc"

Browse Source 
This could break old-style connects. Let's keep it as it was until KF6
as discussed in the channel. Thanks frinring for pointing it out.

This reverts commit f631aec33f.
This commit is contained in:
Aleix Pol 2019-05-30 16:02:06 +02:00
parent 0b18d4f0b3
commit 09fa87a7b7
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 * @param source the datacontainer the update was requested for. Useful
* for classes that update the data for several containers. * for classes that update the data for several containers.
**/ **/
void updateRequested(Plasma::DataContainer *source); void updateRequested(DataContainer *source);
protected: protected:
/** /**

4
src/plasma/dataengine.h
View File

@ -93,7 +93,7 @@ public:
* is parented to the DataEngine, but should be deleted by the * is parented to the DataEngine, but should be deleted by the
* caller when finished with it * caller when finished with it
*/ */
Q_INVOKABLE virtual Plasma::Service *serviceForSource(const QString &source); Q_INVOKABLE virtual Service *serviceForSource(const QString &source);
/** /**
* @return description of the plugin that implements this DataEngine * @return description of the plugin that implements this DataEngine
@ -177,7 +177,7 @@ public:
* @param source the name of the source. * @param source the name of the source.
* @return pointer to a DataContainer, or zero on failure * @return pointer to a DataContainer, or zero on failure
**/ **/
Q_INVOKABLE Plasma::DataContainer *containerForSource(const QString &source); Q_INVOKABLE DataContainer *containerForSource(const QString &source);
/** /**
* @return The model associated to a source if any. The ownership of the model stays with the DataContainer. * @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 * @return a started ServiceJob; the consumer may connect to relevant
* signals before returning to the event loop * signals before returning to the event loop
*/ */
Q_INVOKABLE Plasma::ServiceJob *startOperationCall(const QVariantMap &description, QObject *parent = nullptr); Q_INVOKABLE ServiceJob *startOperationCall(const QVariantMap &description, QObject *parent = nullptr);
/** /**
* Query to find if an operation is enabled or not. * Query to find if an operation is enabled or not.