diff --git a/dataengines/systemmonitor/systemmonitor.h b/dataengines/systemmonitor/systemmonitor.h --- a/dataengines/systemmonitor/systemmonitor.h +++ b/dataengines/systemmonitor/systemmonitor.h @@ -24,6 +24,7 @@ #include #include +#include class QTimer; @@ -52,7 +53,7 @@ void updateMonitorsList(); private: - QStringList m_sensors; + QVector m_sensors; QTimer* m_timer; int m_waitingFor; }; diff --git a/dataengines/systemmonitor/systemmonitor.cpp b/dataengines/systemmonitor/systemmonitor.cpp --- a/dataengines/systemmonitor/systemmonitor.cpp +++ b/dataengines/systemmonitor/systemmonitor.cpp @@ -50,7 +50,7 @@ QStringList SystemMonitorEngine::sources() const { - return m_sensors; + return m_sensors.toList(); } bool SystemMonitorEngine::sourceRequestEvent(const QString &name) @@ -118,10 +118,10 @@ return; } - const QString sensorName = newSensorInfo[0]; - const QString min = newSensorInfo[1]; - const QString max = newSensorInfo[2]; - const QString unit = newSensorInfo[3]; + const QString& sensorName = newSensorInfo[0]; + const QString& min = newSensorInfo[1]; + const QString& max = newSensorInfo[2]; + const QString& unit = newSensorInfo[3]; if (it != sources.constEnd()) { it.value()->setData(QStringLiteral("name"), sensorName); @@ -139,14 +139,15 @@ int count = 0; foreach (const QByteArray &sens, answer) { - const QStringList newSensorInfo = QString::fromUtf8(sens).split('\t'); + const QString sensStr{QString::fromUtf8(sens)}; + const QVector newSensorInfo = sensStr.splitRef('\t'); if (newSensorInfo.count() < 2) { continue; } if(newSensorInfo.at(1) == QLatin1String("logfile")) continue; // logfile data type not currently supported - const QString newSensor = newSensorInfo[0]; + const QString newSensor = newSensorInfo[0].toString(); sensors.insert(newSensor); m_sensors.append(newSensor); { @@ -160,7 +161,7 @@ } DataEngine::Data d; d.insert(QStringLiteral("value"), QVariant()); - d.insert(QStringLiteral("type"), newSensorInfo[1]); + d.insert(QStringLiteral("type"), newSensorInfo[1].toString()); setData(newSensor, d); KSGRD::SensorMgr->sendRequest( QStringLiteral("localhost"), QStringLiteral("%1?").arg(newSensor), (KSGRD::SensorClient*)this, -(count + 2)); ++count;