Move symbols of libplasmaweatherprivate into Plasma namespace

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