Move symbols of libplasmaweatherprivate into Plasma namespace

parent 6b74af8a
...@@ -120,9 +120,9 @@ void LocationListModel::searchLocations(const QString &searchString, const QStri ...@@ -120,9 +120,9 @@ void LocationListModel::searchLocations(const QString &searchString, const QStri
//qDebug() << "ion: " << pluginInfo[0] << pluginInfo[1]; //qDebug() << "ion: " << pluginInfo[0] << pluginInfo[1];
//d->ions.insert(pluginInfo[1], pluginInfo[0]); //d->ions.insert(pluginInfo[1], pluginInfo[0]);
WeatherValidator *validator = new WeatherValidator(this); auto* validator = new Plasma::WeatherValidator(this);
connect(validator, &WeatherValidator::error, this, &LocationListModel::validatorError); connect(validator, &Plasma::WeatherValidator::error, this, &LocationListModel::validatorError);
connect(validator, &WeatherValidator::finished, this, &LocationListModel::addSources); connect(validator, &Plasma::WeatherValidator::finished, this, &LocationListModel::addSources);
validator->setDataEngine(dataengine); validator->setDataEngine(dataengine);
validator->setIon(ionId); validator->setIon(ionId);
...@@ -130,7 +130,7 @@ void LocationListModel::searchLocations(const QString &searchString, const QStri ...@@ -130,7 +130,7 @@ void LocationListModel::searchLocations(const QString &searchString, const QStri
} }
} }
for (WeatherValidator* validator : qAsConst(m_validators)) { for (auto* validator : qAsConst(m_validators)) {
validator->validate(m_searchString, true); validator->validate(m_searchString, true);
} }
} }
......
...@@ -24,8 +24,9 @@ ...@@ -24,8 +24,9 @@
#include <QVector> #include <QVector>
#include <QMap> #include <QMap>
namespace Plasma {
class WeatherValidator; class WeatherValidator;
}
class LocationItem class LocationItem
{ {
...@@ -81,7 +82,7 @@ private: ...@@ -81,7 +82,7 @@ private:
bool m_validatingInput; bool m_validatingInput;
QString m_searchString; QString m_searchString;
int m_checkedInCount; int m_checkedInCount;
QVector<WeatherValidator*> m_validators; QVector<Plasma::WeatherValidator*> m_validators;
}; };
#endif // LOCATIONLISTMODEL_H #endif // LOCATIONLISTMODEL_H
...@@ -75,7 +75,7 @@ QString existingWeatherIconName(const QString &iconName) ...@@ -75,7 +75,7 @@ QString existingWeatherIconName(const QString &iconName)
WeatherApplet::WeatherApplet(QObject *parent, const QVariantList &args) WeatherApplet::WeatherApplet(QObject *parent, const QVariantList &args)
: WeatherPopupApplet(parent, args) : Plasma::WeatherPopupApplet(parent, args)
{ {
} }
...@@ -83,7 +83,7 @@ void WeatherApplet::init() ...@@ -83,7 +83,7 @@ void WeatherApplet::init()
{ {
resetPanelModel(); resetPanelModel();
WeatherPopupApplet::init(); Plasma::WeatherPopupApplet::init();
} }
WeatherApplet::~WeatherApplet() WeatherApplet::~WeatherApplet()
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <plasmaweather/weatherpopupapplet.h> #include <plasmaweather/weatherpopupapplet.h>
class WeatherApplet : public WeatherPopupApplet class WeatherApplet : public Plasma::WeatherPopupApplet
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QVariantMap panelModel READ panelModel NOTIFY modelUpdated) Q_PROPERTY(QVariantMap panelModel READ panelModel NOTIFY modelUpdated)
......
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
#include "weathervalidator.h" #include "weathervalidator.h"
namespace Plasma {
class WeatherLocationPrivate class WeatherLocationPrivate
{ {
public: public:
...@@ -90,3 +92,5 @@ void WeatherLocation::dataUpdated(const QString &source, const Plasma::DataEngin ...@@ -90,3 +92,5 @@ void WeatherLocation::dataUpdated(const QString &source, const Plasma::DataEngin
emit finished(QString()); emit finished(QString());
} }
}
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
#include <Plasma/DataEngine> #include <Plasma/DataEngine>
namespace Plasma {
/** /**
* @class WeatherLocation * @class WeatherLocation
* *
...@@ -60,4 +62,6 @@ private: ...@@ -60,4 +62,6 @@ private:
const QScopedPointer<class WeatherLocationPrivate> d; const QScopedPointer<class WeatherLocationPrivate> d;
}; };
}
#endif #endif
...@@ -53,6 +53,8 @@ inline QString weather() { return QStringLiteral("weather"); } ...@@ -53,6 +53,8 @@ inline QString weather() { return QStringLiteral("weather"); }
} }
} }
namespace Plasma {
class WeatherPopupAppletPrivate class WeatherPopupAppletPrivate
{ {
public: public:
...@@ -442,3 +444,5 @@ QString WeatherPopupApplet::conditionIcon() ...@@ -442,3 +444,5 @@ QString WeatherPopupApplet::conditionIcon()
} }
return d->conditionIcon; return d->conditionIcon;
} }
}
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include "plasmaweather_export.h" #include "plasmaweather_export.h"
namespace Plasma {
/** /**
* @class WeatherPopupApplet <plasmaweather/weatherpopupapplet.h> * @class WeatherPopupApplet <plasmaweather/weatherpopupapplet.h>
...@@ -115,4 +116,6 @@ class PLASMAWEATHER_EXPORT WeatherPopupApplet : public Plasma::Applet, public Pl ...@@ -115,4 +116,6 @@ class PLASMAWEATHER_EXPORT WeatherPopupApplet : public Plasma::Applet, public Pl
friend class WeatherPopupAppletPrivate; friend class WeatherPopupAppletPrivate;
}; };
}
#endif #endif
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
#include <KLocalizedString> #include <KLocalizedString>
#include <KMessageBox> #include <KMessageBox>
namespace Plasma {
class WeatherValidatorPrivate class WeatherValidatorPrivate
{ {
public: public:
...@@ -136,3 +138,4 @@ void WeatherValidator::dataUpdated(const QString &source, const Plasma::DataEngi ...@@ -136,3 +138,4 @@ void WeatherValidator::dataUpdated(const QString &source, const Plasma::DataEngi
emit finished(locations); emit finished(locations);
} }
}
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
#include "plasmaweather_export.h" #include "plasmaweather_export.h"
namespace Plasma {
/** /**
* @class WeatherValidator <plasmaweather/weathervalidator.h> * @class WeatherValidator <plasmaweather/weathervalidator.h>
* *
...@@ -90,4 +92,6 @@ private: ...@@ -90,4 +92,6 @@ private:
const QScopedPointer<class WeatherValidatorPrivate> d; const QScopedPointer<class WeatherValidatorPrivate> d;
}; };
}
#endif #endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment