Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Port to Qt 6
Signed-off-by: Lorn Potter <lorn.potter@gmail.com>
  • Loading branch information
lpotter committed Apr 1, 2021
1 parent 08ce125 commit 2847352
Show file tree
Hide file tree
Showing 28 changed files with 46 additions and 46 deletions.
2 changes: 1 addition & 1 deletion adaptors/iioadaptor/iioadaptor.cpp
Expand Up @@ -54,7 +54,7 @@
#define REV_GRAVITY 0.101936799

// Proximity sensor
#define PROXIMITY_DEFAULT_THRESHOLD 250
#define PROXIMITY_DEFAULT_THRESHOLD "250"
#define PROXIMITY_NEAR_VALUE 0
#define PROXIMITY_FAR_VALUE 100

Expand Down
2 changes: 1 addition & 1 deletion chains/accelerometerchain/accelerometerchainplugin.cpp
Expand Up @@ -37,5 +37,5 @@ void AccelerometerChainPlugin::Register(class Loader&)
}

QStringList AccelerometerChainPlugin::Dependencies() {
return QString("coordinatealignfilter:accelerometeradaptor").split(":", QString::SkipEmptyParts);
return QString("coordinatealignfilter:accelerometeradaptor").split(":", Qt::SkipEmptyParts);
}
4 changes: 2 additions & 2 deletions chains/compasschain/compasschainplugin.cpp
Expand Up @@ -38,8 +38,8 @@ void CompassChainPlugin::Register(class Loader&)
QStringList CompassChainPlugin::Dependencies() {
QByteArray orientationConfiguration = SensorFrameworkConfig::configuration()->value("plugins/orientationadaptor").toByteArray();
if (orientationConfiguration.isEmpty()) {
return QString("accelerometerchain:magcalibrationchain:declinationfilter:downsamplefilter:avgaccfilter").split(":", QString::SkipEmptyParts);
return QString("accelerometerchain:magcalibrationchain:declinationfilter:downsamplefilter:avgaccfilter").split(":", Qt::SkipEmptyParts);
} else {
return QString("accelerometerchain:magcalibrationchain:declinationfilter:downsamplefilter:avgaccfilter:orientationadaptor").split(":", QString::SkipEmptyParts);
return QString("accelerometerchain:magcalibrationchain:declinationfilter:downsamplefilter:avgaccfilter:orientationadaptor").split(":", Qt::SkipEmptyParts);
}
}
2 changes: 1 addition & 1 deletion chains/magcalibrationchain/magcalibrationchainplugin.cpp
Expand Up @@ -32,5 +32,5 @@ void MagCalibrationChainPlugin::Register(class Loader&)
}

QStringList MagCalibrationChainPlugin::Dependencies() {
return QString("magcoordinatealignfilter:magnetometeradaptor").split(":", QString::SkipEmptyParts);
return QString("magcoordinatealignfilter:magnetometeradaptor").split(":", Qt::SkipEmptyParts);
}
2 changes: 1 addition & 1 deletion chains/orientationchain/orientationchainplugin.cpp
Expand Up @@ -37,5 +37,5 @@ void OrientationChainPlugin::Register(class Loader&)
}

QStringList OrientationChainPlugin::Dependencies() {
return QString("orientationinterpreter:accelerometerchain").split(":", QString::SkipEmptyParts);
return QString("orientationinterpreter:accelerometerchain").split(":", Qt::SkipEmptyParts);
}
6 changes: 3 additions & 3 deletions core/nodebase.cpp
Expand Up @@ -231,10 +231,10 @@ bool NodeBase::hasLocalRange() const
DataRangeList NodeBase::parseDataRangeList(const QString& input, int defaultResolution) const
{
DataRangeList list;
foreach(const QString& fragment, input.split(",", QString::SkipEmptyParts))
foreach(const QString& fragment, input.split(QLatin1Char(','), Qt::SkipEmptyParts))
{
QStringList pair(fragment.split("=>"));
QStringList pair2(fragment.split(":"));
QStringList pair(fragment.split(QLatin1String("=>")));
QStringList pair2(fragment.split(QLatin1Char(':')));
DataRange range;
range.resolution = defaultResolution;
if(pair.size() == 1)
Expand Down
2 changes: 1 addition & 1 deletion examples/chainplugin/samplechainplugin.cpp
Expand Up @@ -41,5 +41,5 @@ void SampleChainPlugin::Register(class Loader&)
//
// Here we have one adaptor and one filter that we need.
QStringList SampleChainPlugin::Dependencies() {
return QString("sampleadaptor:samplefilter").split(":", QString::SkipEmptyParts);
return QString("sampleadaptor:samplefilter").split(":", Qt::SkipEmptyParts);
}
2 changes: 1 addition & 1 deletion examples/sensorplugin/sampleplugin.cpp
Expand Up @@ -40,5 +40,5 @@ void SamplePlugin::Register(class Loader&)
// dependency here. We can rely on it to provide further dependencies to
// any plugins it may need.
QStringList SamplePlugin::Dependencies() {
return QString("samplechain").split(":", QString::SkipEmptyParts);
return QString("samplechain").split(":", Qt::SkipEmptyParts);
}
20 changes: 10 additions & 10 deletions qt-api/abstractsensor_i.cpp
Expand Up @@ -134,7 +134,7 @@ QDBusReply<void> AbstractSensorChannelInterface::start(int sessionId)
connect(pimpl_->socketReader_.socket(), SIGNAL(readyRead()), this, SLOT(dataReceived()));

QList<QVariant> argumentList;
argumentList << qVariantFromValue(sessionId);
argumentList << QVariant::fromValue(sessionId);

QDBusPendingReply <void> returnValue = pimpl_->asyncCallWithArgumentList(QLatin1String("start"), argumentList);
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(returnValue, this);
Expand Down Expand Up @@ -172,7 +172,7 @@ QDBusReply<void> AbstractSensorChannelInterface::stop(int sessionId)
disconnect(pimpl_->socketReader_.socket(), SIGNAL(readyRead()), this, SLOT(dataReceived()));

QList<QVariant> argumentList;
argumentList << qVariantFromValue(sessionId);
argumentList << QVariant::fromValue(sessionId);

QDBusPendingReply <void> returnValue = pimpl_->asyncCallWithArgumentList(QLatin1String("stop"), argumentList);
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(returnValue, this);
Expand All @@ -197,7 +197,7 @@ QDBusReply<void> AbstractSensorChannelInterface::setInterval(int sessionId, int
clearError();

QList<QVariant> argumentList;
argumentList << qVariantFromValue(sessionId) << qVariantFromValue(value);
argumentList << QVariant::fromValue(sessionId) << QVariant::fromValue(value);
QDBusPendingReply <void> returnValue = pimpl_->asyncCallWithArgumentList(QLatin1String("setInterval"), argumentList);
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(returnValue, this);
connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
Expand All @@ -221,7 +221,7 @@ QDBusReply<void> AbstractSensorChannelInterface::setBufferInterval(int sessionId
clearError();

QList<QVariant> argumentList;
argumentList << qVariantFromValue(sessionId) << qVariantFromValue(value);
argumentList << QVariant::fromValue(sessionId) << QVariant::fromValue(value);
QDBusPendingReply <void> returnValue = pimpl_->asyncCallWithArgumentList(QLatin1String("setBufferInterval"), argumentList);
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(returnValue, this);
connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
Expand All @@ -246,7 +246,7 @@ QDBusReply<void> AbstractSensorChannelInterface::setBufferSize(int sessionId, un
clearError();

QList<QVariant> argumentList;
argumentList << qVariantFromValue(sessionId) << qVariantFromValue(value);
argumentList << QVariant::fromValue(sessionId) << QVariant::fromValue(value);

QDBusPendingReply <void> returnValue = pimpl_->asyncCallWithArgumentList(QLatin1String("setBufferSize"), argumentList);
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(returnValue, this);
Expand All @@ -271,7 +271,7 @@ QDBusReply<bool> AbstractSensorChannelInterface::setStandbyOverride(int sessionI
clearError();

QList<QVariant> argumentList;
argumentList << qVariantFromValue(sessionId) << qVariantFromValue(value);
argumentList << QVariant::fromValue(sessionId) << QVariant::fromValue(value);
QDBusPendingReply <void> returnValue = pimpl_->asyncCallWithArgumentList(QLatin1String("setStandbyOverride"), argumentList);
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(returnValue, this);
connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
Expand Down Expand Up @@ -303,13 +303,13 @@ DataRange AbstractSensorChannelInterface::getCurrentDataRange()
void AbstractSensorChannelInterface::requestDataRange(DataRange range)
{
clearError();
call(QDBus::NoBlock, QLatin1String("requestDataRange"), qVariantFromValue(pimpl_->sessionId_), qVariantFromValue(range));
call(QDBus::NoBlock, QLatin1String("requestDataRange"), QVariant::fromValue(pimpl_->sessionId_), QVariant::fromValue(range));
}

void AbstractSensorChannelInterface::removeDataRangeRequest()
{
clearError();
call(QDBus::NoBlock, QLatin1String("removeDataRangeRequest"), qVariantFromValue(pimpl_->sessionId_));
call(QDBus::NoBlock, QLatin1String("removeDataRangeRequest"), QVariant::fromValue(pimpl_->sessionId_));
}

DataRangeList AbstractSensorChannelInterface::getAvailableIntervals()
Expand Down Expand Up @@ -446,7 +446,7 @@ bool AbstractSensorChannelInterface::setDataRangeIndex(int dataRangeIndex)
{
clearError();
QList<QVariant> argumentList;
argumentList << qVariantFromValue(pimpl_->sessionId_) << qVariantFromValue(dataRangeIndex);
argumentList << QVariant::fromValue(pimpl_->sessionId_) << QVariant::fromValue(dataRangeIndex);

QDBusPendingReply <bool> returnValue = pimpl_->asyncCallWithArgumentList(QLatin1String("setDataRangeIndex"), argumentList);
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(returnValue, this);
Expand Down Expand Up @@ -511,7 +511,7 @@ QDBusReply<void> AbstractSensorChannelInterface::setDownsampling(int sessionId,
clearError();

QList<QVariant> argumentList;
argumentList << qVariantFromValue(sessionId) << qVariantFromValue(value);
argumentList << QVariant::fromValue(sessionId) << QVariant::fromValue(value);
QDBusPendingReply <void> returnValue = pimpl_->asyncCallWithArgumentList(QLatin1String("setDownsampling"), argumentList);
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(returnValue, this);
connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
Expand Down
2 changes: 1 addition & 1 deletion qt-api/abstractsensor_i.h
Expand Up @@ -506,7 +506,7 @@ T AbstractSensorChannelInterface::getAccessor(const char* name)
template<typename T>
void AbstractSensorChannelInterface::setAccessor(const char* name, const T& value)
{
QDBusReply<void> reply(call(QDBus::NoBlock, QLatin1String(name), qVariantFromValue(value)));
QDBusReply<void> reply(call(QDBus::NoBlock, QLatin1String(name), QVariant::fromValue(value)));
if(!reply.isValid())
{
qDebug() << "Failed to set '" << name << " = " << value << "' to sensord: " << reply.error().message();
Expand Down
10 changes: 5 additions & 5 deletions qt-api/sensormanager_i.cpp
Expand Up @@ -71,7 +71,7 @@ int LocalSensorManagerInterface::errorCodeInt()
QDBusReply<bool> LocalSensorManagerInterface::loadPlugin(const QString& name)
{
QList<QVariant> argumentList;
argumentList << qVariantFromValue(name);
argumentList << QVariant::fromValue(name);
QDBusPendingReply <bool> reply = asyncCallWithArgumentList(QLatin1String("loadPlugin"), argumentList);
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this);
connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
Expand All @@ -96,8 +96,8 @@ QDBusReply<int> LocalSensorManagerInterface::requestSensor(const QString& id)
{
qint64 pid = QCoreApplication::applicationPid();
QList<QVariant> argumentList;
argumentList << qVariantFromValue(id);
argumentList << qVariantFromValue(pid);
argumentList << QVariant::fromValue(id);
argumentList << QVariant::fromValue(pid);
QDBusPendingReply <int> reply = asyncCallWithArgumentList(QLatin1String("requestSensor"), argumentList);
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this);
connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
Expand All @@ -121,8 +121,8 @@ QDBusReply<bool> LocalSensorManagerInterface::releaseSensor(const QString& id, i
{
qint64 pid = QCoreApplication::applicationPid();
QList<QVariant> argumentList;
argumentList << qVariantFromValue(id) << qVariantFromValue(sessionId);
argumentList << qVariantFromValue(pid);
argumentList << QVariant::fromValue(id) << QVariant::fromValue(sessionId);
argumentList << QVariant::fromValue(pid);
QDBusPendingReply <bool> reply = asyncCallWithArgumentList(QLatin1String("releaseSensor"), argumentList);
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this);
connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
Expand Down
2 changes: 1 addition & 1 deletion sensors/accelerometersensor/accelerometerplugin.cpp
Expand Up @@ -37,5 +37,5 @@ void AccelerometerPlugin::Register(class Loader&)
}

QStringList AccelerometerPlugin::Dependencies() {
return QString("accelerometerchain").split(":", QString::SkipEmptyParts);
return QString("accelerometerchain").split(":", Qt::SkipEmptyParts);
}
2 changes: 1 addition & 1 deletion sensors/alssensor/alsplugin.cpp
Expand Up @@ -43,5 +43,5 @@ void ALSPlugin::Init(class Loader& l)
}

QStringList ALSPlugin::Dependencies() {
return QString("alsadaptor").split(":", QString::SkipEmptyParts);
return QString("alsadaptor").split(":", Qt::SkipEmptyParts);
}
2 changes: 1 addition & 1 deletion sensors/compasssensor/compassplugin.cpp
Expand Up @@ -37,5 +37,5 @@ void CompassPlugin::Register(class Loader&)
}

QStringList CompassPlugin::Dependencies() {
return QString("compasschain").split(":", QString::SkipEmptyParts);
return QString("compasschain").split(":", Qt::SkipEmptyParts);
}
2 changes: 1 addition & 1 deletion sensors/contextplugin/contextplugin.cpp
Expand Up @@ -43,7 +43,7 @@ void ContextPlugin::Init(class Loader&)
}

QStringList ContextPlugin::Dependencies() {
return QString("accelerometeradaptor:orientationchain").split(":", QString::SkipEmptyParts);
return QString("accelerometeradaptor:orientationchain").split(":", Qt::SkipEmptyParts);
}

int ContextPlugin::getSessionId()
Expand Down
2 changes: 1 addition & 1 deletion sensors/gyroscopesensor/gyroscopeplugin.cpp
Expand Up @@ -37,5 +37,5 @@ void GyroscopePlugin::Register(class Loader&)
}

QStringList GyroscopePlugin::Dependencies() {
return QString("gyroscopeadaptor").split(":", QString::SkipEmptyParts);
return QString("gyroscopeadaptor").split(":", Qt::SkipEmptyParts);
}
2 changes: 1 addition & 1 deletion sensors/humiditysensor/humidityplugin.cpp
Expand Up @@ -42,5 +42,5 @@ void HumidityPlugin::Init(class Loader& l)
}

QStringList HumidityPlugin::Dependencies() {
return QString("humidityadaptor").split(":", QString::SkipEmptyParts);
return QString("humidityadaptor").split(":", Qt::SkipEmptyParts);
}
2 changes: 1 addition & 1 deletion sensors/lidsensor/lidplugin.cpp
Expand Up @@ -42,5 +42,5 @@ void LidPlugin::Init(class Loader& l)
}

QStringList LidPlugin::Dependencies() {
return QString("lidsensoradaptor").split(":", QString::SkipEmptyParts);
return QString("lidsensoradaptor").split(":", Qt::SkipEmptyParts);
}
2 changes: 1 addition & 1 deletion sensors/magnetometersensor/magnetometerplugin.cpp
Expand Up @@ -37,5 +37,5 @@ void MagnetometerPlugin::Register(class Loader&)
}

QStringList MagnetometerPlugin::Dependencies() {
return QString("magcalibrationchain").split(":", QString::SkipEmptyParts);
return QString("magcalibrationchain").split(":", Qt::SkipEmptyParts);
}
2 changes: 1 addition & 1 deletion sensors/orientationsensor/orientationplugin.cpp
Expand Up @@ -37,5 +37,5 @@ void OrientationPlugin::Register(class Loader&)
}

QStringList OrientationPlugin::Dependencies() {
return QString("orientationchain").split(":", QString::SkipEmptyParts);
return QString("orientationchain").split(":", Qt::SkipEmptyParts);
}
2 changes: 1 addition & 1 deletion sensors/pressuresensor/pressureplugin.cpp
Expand Up @@ -42,5 +42,5 @@ void PressurePlugin::Init(class Loader& l)
}

QStringList PressurePlugin::Dependencies() {
return QString("pressureadaptor").split(":", QString::SkipEmptyParts);
return QString("pressureadaptor").split(":", Qt::SkipEmptyParts);
}
2 changes: 1 addition & 1 deletion sensors/proximitysensor/proximityplugin.cpp
Expand Up @@ -36,5 +36,5 @@ void ProximityPlugin::Register(class Loader&)
}

QStringList ProximityPlugin::Dependencies() {
return QString("proximityadaptor").split(":", QString::SkipEmptyParts);
return QString("proximityadaptor").split(":", Qt::SkipEmptyParts);
}
2 changes: 1 addition & 1 deletion sensors/rotationsensor/rotationplugin.cpp
Expand Up @@ -36,5 +36,5 @@ void RotationPlugin::Register(class Loader&)
}

QStringList RotationPlugin::Dependencies() {
return QString("accelerometerchain:rotationfilter:compasschain").split(":", QString::SkipEmptyParts);
return QString("accelerometerchain:rotationfilter:compasschain").split(":", Qt::SkipEmptyParts);
}
2 changes: 1 addition & 1 deletion sensors/stepcountersensor/stepcounterplugin.cpp
Expand Up @@ -45,5 +45,5 @@ void StepCounterPlugin::Init(class Loader& l)
}

QStringList StepCounterPlugin::Dependencies() {
return QString("stepcounteradaptor").split(":", QString::SkipEmptyParts);
return QString("stepcounteradaptor").split(":", Qt::SkipEmptyParts);
}
2 changes: 1 addition & 1 deletion sensors/tapsensor/tapplugin.cpp
Expand Up @@ -37,5 +37,5 @@ void TapPlugin::Register(class Loader&)
}

QStringList TapPlugin::Dependencies() {
return QString("tapadaptor").split(":", QString::SkipEmptyParts);
return QString("tapadaptor").split(":", Qt::SkipEmptyParts);
}
2 changes: 1 addition & 1 deletion sensors/temperaturesensor/temperatureplugin.cpp
Expand Up @@ -42,5 +42,5 @@ void TemperaturePlugin::Init(class Loader& l)
}

QStringList TemperaturePlugin::Dependencies() {
return QString("temperatureadaptor").split(":", QString::SkipEmptyParts);
return QString("temperatureadaptor").split(":", Qt::SkipEmptyParts);
}
6 changes: 3 additions & 3 deletions tests/benchmark/benchmarktest/signaldump.h
Expand Up @@ -74,13 +74,13 @@ class SignalDump : public QObject
while (!line.isEmpty()) {
if (*(line.constData()) == 'P' || *(line.constData()) == 'S') {
if (strncmp(line.constData(), "Private_Clean", 13) == 0) {
clean += atoi(QString(line).split(' ', QString::SkipEmptyParts).at(1).toLocal8Bit().constData());
clean += atoi(QString(line).split(' ', Qt::SkipEmptyParts).at(1).toLocal8Bit().constData());
}
else if (strncmp(line.constData(), "Private_Dirty", 13) == 0) {
dirty += atoi(QString(line).split(' ', QString::SkipEmptyParts).at(1).toLocal8Bit().constData());
dirty += atoi(QString(line).split(' ', Qt::SkipEmptyParts).at(1).toLocal8Bit().constData());
}
else if (strncmp(line.constData(), "Swap", 4) == 0) {
dirty += atoi(QString(line).split(' ', QString::SkipEmptyParts).at(1).toLocal8Bit().constData());
dirty += atoi(QString(line).split(' ', Qt::SkipEmptyParts).at(1).toLocal8Bit().constData());
}
}
line.clear();
Expand Down
2 changes: 1 addition & 1 deletion tests/testutils/datafaker/main.cpp
Expand Up @@ -74,7 +74,7 @@ int main(int argc, char** argv)
break;
}
QString line(buffer);
QStringList numberList = line.split(" ", QString::SkipEmptyParts);
QStringList numberList = line.split(" ", Qt::SkipEmptyParts);
if (numberList.length() % 3 != 0) {
qDebug() << "Too many / too few numbers on line, skipping:" << line;
}
Expand Down

0 comments on commit 2847352

Please sign in to comment.