diff --git a/dataengines/weather/weatherengine.h b/dataengines/weather/weatherengine.h index 9cf45c355..f6d6c1569 100644 --- a/dataengines/weather/weatherengine.h +++ b/dataengines/weather/weatherengine.h @@ -65,31 +65,29 @@ public: */ WeatherEngine(QObject *parent, const QVariantList &args); - // Destructor ~WeatherEngine() override; +protected: // Plasma::DataEngine API /** - * Load a plugin - * @arg pluginName Name of the plugin - * @return IonInterface returns an instance of the loaded plugin + * We use it to communicate to the Ion plugins to set the data sources. + * @param source The datasource name. */ - DataEngine* loadIon(const QString& pluginName); + bool sourceRequestEvent(const QString &source) override; -protected: /** - * Reimplemented from Plasma::DataEngine. We use it to communicate to the Ion plugins to set the data sources. - * @param source The datasource name. + * @param source The datasource to update. */ - bool sourceRequestEvent(const QString &source) override; + bool updateSourceEvent(const QString& source) override; -protected Q_SLOTS: +protected Q_SLOTS: // expected DataEngine class method /** - * Reimplemented from Plasma::DataEngine. + * Slot method with this signature expected in a DataEngine class. * @param source The datasource to be updated. * @param data The new data updated. */ void dataUpdated(const QString& source, Plasma::DataEngine::Data data); +private Q_SLOTS: void forceUpdate(IonInterface *ion, const QString &source); /** @@ -102,11 +100,6 @@ protected Q_SLOTS: * @arg source datasource name. */ void removeIonSource(const QString& source); - /** - * Reimplemented from Plasma::DataEngine. - * @param source The datasource to update. - */ - bool updateSourceEvent(const QString& source) override; /** * Whenever networking changes, take action @@ -120,6 +113,13 @@ protected Q_SLOTS: void updateIonList(const QStringList &changedResources = QStringList()); private: + /** + * Load a plugin + * @arg pluginName Name of the plugin + * @return IonInterface returns an instance of the loaded plugin + */ + DataEngine* loadIon(const QString& pluginName); + /** * Get instance of a loaded ion. * @returns a IonInterface instance of a loaded plugin. @@ -132,6 +132,7 @@ private: */ QString ionNameForSource(const QString& source) const; +private: QStringList m_ions; bool m_networkAvailable; QTimer m_reconnectTimer;