summaryrefslogtreecommitdiff
path: root/src/ivicore
diff options
context:
space:
mode:
Diffstat (limited to 'src/ivicore')
-rw-r--r--src/ivicore/qiviabstractfeature.cpp6
-rw-r--r--src/ivicore/qiviabstractfeature.h2
-rw-r--r--src/ivicore/qiviabstractfeature_p.h2
-rw-r--r--src/ivicore/qiviabstractzonedfeature.cpp10
-rw-r--r--src/ivicore/qiviproperty.cpp4
-rw-r--r--src/ivicore/qivipropertytester_p.h2
-rw-r--r--src/ivicore/qiviproxyserviceobject_p.h6
-rw-r--r--src/ivicore/qiviqmlconversion_helper.h8
-rw-r--r--src/ivicore/qivisearchandbrowsemodel.cpp4
-rw-r--r--src/ivicore/qivisearchandbrowsemodel_p.h2
-rw-r--r--src/ivicore/qiviserviceinterface.h2
-rw-r--r--src/ivicore/qiviservicemanager.cpp2
-rw-r--r--src/ivicore/queryparser/qiviqueryterm.h12
-rw-r--r--src/ivicore/queryparser/qiviqueryterm_p.h2
14 files changed, 31 insertions, 33 deletions
diff --git a/src/ivicore/qiviabstractfeature.cpp b/src/ivicore/qiviabstractfeature.cpp
index 9763fa8..2ce8cc7 100644
--- a/src/ivicore/qiviabstractfeature.cpp
+++ b/src/ivicore/qiviabstractfeature.cpp
@@ -535,7 +535,7 @@ QIviAbstractFeature::DiscoveryResult QIviAbstractFeature::startAutoDiscovery()
return NoResult;
}
- QIviServiceManager* serviceManager = QIviServiceManager::instance();
+ QIviServiceManager *serviceManager = QIviServiceManager::instance();
QList<QIviServiceObject*> serviceObjects;
DiscoveryResult result = NoResult;
if (d->m_discoveryMode == AutoDiscovery || d->m_discoveryMode == LoadOnlyProductionBackends) {
@@ -545,7 +545,7 @@ QIviAbstractFeature::DiscoveryResult QIviAbstractFeature::startAutoDiscovery()
//Check whether we can use the found production backends
bool serviceObjectSet = false;
- foreach (QIviServiceObject* object, serviceObjects) {
+ foreach (QIviServiceObject *object, serviceObjects) {
qCDebug(qLcIviServiceManagement) << "Trying to use" << object << "Supported Interfaces:" << object->interfaces();
if (setServiceObject(object)) {
serviceObjectSet = true;
@@ -565,7 +565,7 @@ QIviAbstractFeature::DiscoveryResult QIviAbstractFeature::startAutoDiscovery()
if (Q_UNLIKELY(serviceObjects.isEmpty()))
qWarning() << "There is no simulation backend implementing" << d->m_interface << ".";
- foreach (QIviServiceObject* object, serviceObjects) {
+ foreach (QIviServiceObject *object, serviceObjects) {
qCDebug(qLcIviServiceManagement) << "Trying to use" << object << "Supported Interfaces:" << object->interfaces();
if (setServiceObject(object)) {
serviceObjectSet = true;
diff --git a/src/ivicore/qiviabstractfeature.h b/src/ivicore/qiviabstractfeature.h
index 37c4664..57aea2b 100644
--- a/src/ivicore/qiviabstractfeature.h
+++ b/src/ivicore/qiviabstractfeature.h
@@ -59,7 +59,7 @@ class Q_QTIVICORE_EXPORT QIviAbstractFeature : public QObject, public QQmlParser
Q_PROPERTY(DiscoveryMode discoveryMode READ discoveryMode WRITE setDiscoveryMode NOTIFY discoveryModeChanged)
Q_PROPERTY(DiscoveryResult discoveryResult READ discoveryResult NOTIFY discoveryResultChanged)
- Q_PROPERTY(QIviServiceObject* serviceObject READ serviceObject WRITE setServiceObject NOTIFY serviceObjectChanged)
+ Q_PROPERTY(QIviServiceObject *serviceObject READ serviceObject WRITE setServiceObject NOTIFY serviceObjectChanged)
Q_PROPERTY(bool isValid READ isValid NOTIFY isValidChanged)
Q_PROPERTY(QString error READ errorMessage NOTIFY errorChanged)
diff --git a/src/ivicore/qiviabstractfeature_p.h b/src/ivicore/qiviabstractfeature_p.h
index af865b7..154de2b 100644
--- a/src/ivicore/qiviabstractfeature_p.h
+++ b/src/ivicore/qiviabstractfeature_p.h
@@ -70,7 +70,7 @@ public:
Q_DECLARE_PUBLIC(QIviAbstractFeature)
QString m_interface;
- QIviServiceObject* m_serviceObject;
+ QIviServiceObject *m_serviceObject;
QIviAbstractFeature::DiscoveryMode m_discoveryMode;
QIviAbstractFeature::DiscoveryResult m_discoveryResult;
QString m_errorMessage;
diff --git a/src/ivicore/qiviabstractzonedfeature.cpp b/src/ivicore/qiviabstractzonedfeature.cpp
index 1c1b5a8..58d3442 100644
--- a/src/ivicore/qiviabstractzonedfeature.cpp
+++ b/src/ivicore/qiviabstractzonedfeature.cpp
@@ -97,7 +97,7 @@ QIviAbstractZonedFeature::~QIviAbstractZonedFeature()
*/
bool QIviAbstractZonedFeature::acceptServiceObject(QIviServiceObject *serviceObject)
{
- if (QIviAbstractZonedFeature* parentFeature = qobject_cast<QIviAbstractZonedFeature*>(parent()))
+ if (QIviAbstractZonedFeature *parentFeature = qobject_cast<QIviAbstractZonedFeature*>(parent()))
return parentFeature->acceptServiceObject(serviceObject);
else if (serviceObject)
return serviceObject->interfaces().contains(interfaceName());
@@ -145,9 +145,9 @@ QIviZonedFeatureInterface *QIviAbstractZonedFeature::backend(const QString &inte
if (iface.isEmpty())
iface = interfaceName();
- if (QIviAbstractZonedFeature* parentFeature = qobject_cast<QIviAbstractZonedFeature*>(parent())) {
+ if (QIviAbstractZonedFeature *parentFeature = qobject_cast<QIviAbstractZonedFeature*>(parent())) {
return parentFeature->backend();
- } else if (QIviServiceObject* so = serviceObject()) {
+ } else if (QIviServiceObject *so = serviceObject()) {
return qobject_cast<QIviZonedFeatureInterface*>(so->interfaceInstance(iface));
}
return 0;
@@ -198,7 +198,7 @@ QIviZonedFeatureInterface *QIviAbstractZonedFeature::backend(const QString &inte
It's recommended to initialize the zone in the feature constructor:
\code
- QIviClimateControl* climateControl = new QIviClimateControl("FrontLeft", this);
+ QIviClimateControl *climateControl = new QIviClimateControl("FrontLeft", this);
climateControl->startAutoDiscovery();
QString zone = climateControl->zone();
\endcode
@@ -225,7 +225,7 @@ void QIviAbstractZonedFeature::initializeZones()
Q_D(QIviAbstractZonedFeature);
foreach (const QString &zone, backend()->availableZones()) {
- QIviAbstractZonedFeature* f = zoneAt(zone);
+ QIviAbstractZonedFeature *f = zoneAt(zone);
if (!f) {
if (this->zone() == zone)
f = this;
diff --git a/src/ivicore/qiviproperty.cpp b/src/ivicore/qiviproperty.cpp
index a8da811..cdd278c 100644
--- a/src/ivicore/qiviproperty.cpp
+++ b/src/ivicore/qiviproperty.cpp
@@ -57,7 +57,7 @@ QIviPropertyPrivate::QIviPropertyPrivate(int userType, QtPrivate::QSlotObjectBas
void QIviPropertyPrivate::throwError(QObject *object, const QString &error)
{
- QJSEngine* jsEngine = qjsEngine(object);
+ QJSEngine *jsEngine = qjsEngine(object);
if (jsEngine) {
QV4::ExecutionEngine *v4 = QV8Engine::getV4(jsEngine);
v4->throwError(error);
@@ -140,7 +140,7 @@ void QIviProperty::setValue(const QVariant &value)
QMetaType metaType(d->m_type);
bool isEnumOrFlag = false;
- const QMetaObject* mo = metaType.metaObject();
+ const QMetaObject *mo = metaType.metaObject();
QString enumName = QString::fromLocal8Bit(QMetaType::typeName(d->m_type)).split(QStringLiteral("::")).last();
if (mo) {
QMetaEnum mEnum = mo->enumerator(mo->indexOfEnumerator(enumName.toLocal8Bit().constData()));
diff --git a/src/ivicore/qivipropertytester_p.h b/src/ivicore/qivipropertytester_p.h
index 4b21a75..117d7e8 100644
--- a/src/ivicore/qivipropertytester_p.h
+++ b/src/ivicore/qivipropertytester_p.h
@@ -99,7 +99,7 @@ template <typename Feature, typename Backend, typename T> struct QIviPropertyTes
};
template <typename Feature, typename Backend, typename T>
-void testIVIProperty(const QIviPropertyTestData<Feature, Backend, T> &testData, Feature* feature, Backend* backend, const QString &zone = QString())
+void testIVIProperty(const QIviPropertyTestData<Feature, Backend, T> &testData, Feature *feature, Backend *backend, const QString &zone = QString())
{
int valueIndex = 0;
(backend->*testData.backend_setter)(testData.valueList.at(valueIndex), zone);
diff --git a/src/ivicore/qiviproxyserviceobject_p.h b/src/ivicore/qiviproxyserviceobject_p.h
index 8de9e5c..acf99a1 100644
--- a/src/ivicore/qiviproxyserviceobject_p.h
+++ b/src/ivicore/qiviproxyserviceobject_p.h
@@ -60,15 +60,15 @@ QT_BEGIN_NAMESPACE
class QIviProxyServiceObject : public QIviServiceObject
{
public:
- QIviProxyServiceObject(QIviServiceInterface* interface);
+ QIviProxyServiceObject(QIviServiceInterface *interface);
virtual ~QIviProxyServiceObject();
virtual QStringList interfaces() const;
- virtual QObject* interfaceInstance(const QString& interface) const;
+ virtual QObject *interfaceInstance(const QString &interface) const;
private:
- QIviServiceInterface* m_interface;
+ QIviServiceInterface *m_interface;
};
QT_END_NAMESPACE
diff --git a/src/ivicore/qiviqmlconversion_helper.h b/src/ivicore/qiviqmlconversion_helper.h
index 796d6b5..a899c6c 100644
--- a/src/ivicore/qiviqmlconversion_helper.h
+++ b/src/ivicore/qiviqmlconversion_helper.h
@@ -54,13 +54,12 @@ template <typename T> QVariant qtivi_convertValue(const T &val)
QVariant var;
int userType = qMetaTypeId<T>();
QMetaType metaType(userType);
- const QMetaObject* mo = metaType.metaObject();
+ const QMetaObject *mo = metaType.metaObject();
QString enumName = QString::fromLocal8Bit(QMetaType::typeName(userType)).split(QStringLiteral("::")).last();
if (mo) {
QMetaEnum mEnum = mo->enumerator(mo->indexOfEnumerator(enumName.toLocal8Bit().constData()));
- if (mEnum.isValid()) {
+ if (mEnum.isValid())
var = QVariant::fromValue<T>(val).toInt();
- }
}
if (!var.isValid())
@@ -72,10 +71,9 @@ template <typename T> QVariant qtivi_convertValue(const T &val)
template <typename T> QVariantList qtivi_convertAvailableValues(const QVector<T> &aValues)
{
QVariantList list;
- Q_FOREACH (const T &val, aValues) {
+ Q_FOREACH (const T &val, aValues)
//As QML doesn't support Enums in Lists we need to convert it to int
list.append(qtivi_convertValue<T>(val));
- }
return list;
}
diff --git a/src/ivicore/qivisearchandbrowsemodel.cpp b/src/ivicore/qivisearchandbrowsemodel.cpp
index f20ecb5..ea5dd50 100644
--- a/src/ivicore/qivisearchandbrowsemodel.cpp
+++ b/src/ivicore/qivisearchandbrowsemodel.cpp
@@ -300,7 +300,7 @@ const QIviSearchAndBrowseModelItem *QIviSearchAndBrowseModelPrivate::itemAt(int
QIviSearchAndBrowseModelInterface *QIviSearchAndBrowseModelPrivate::searchBackend() const
{
Q_Q(const QIviSearchAndBrowseModel);
- QIviServiceObject* so = q->serviceObject();
+ QIviServiceObject *so = q->serviceObject();
if (so)
return qobject_cast<QIviSearchAndBrowseModelInterface*>(so->interfaceInstance(QIviStringSearchAndBrowseModelInterfaceName));
@@ -1164,7 +1164,7 @@ void QIviSearchAndBrowseModel::connectToServiceObject(QIviServiceObject *service
Q_D(QIviSearchAndBrowseModel);
- QIviSearchAndBrowseModelInterface* backend = d->searchBackend();
+ QIviSearchAndBrowseModelInterface *backend = d->searchBackend();
if (!backend)
return;
diff --git a/src/ivicore/qivisearchandbrowsemodel_p.h b/src/ivicore/qivisearchandbrowsemodel_p.h
index 5f41906..870ca03 100644
--- a/src/ivicore/qivisearchandbrowsemodel_p.h
+++ b/src/ivicore/qivisearchandbrowsemodel_p.h
@@ -84,7 +84,7 @@ public:
void setCanGoBack(bool canGoBack);
const QIviSearchAndBrowseModelItem *itemAt(int i) const;
- QIviSearchAndBrowseModelInterface* searchBackend() const;
+ QIviSearchAndBrowseModelInterface *searchBackend() const;
void updateContentType(const QString &contentType);
QIviSearchAndBrowseModel * const q_ptr;
diff --git a/src/ivicore/qiviserviceinterface.h b/src/ivicore/qiviserviceinterface.h
index 436b9ae..1d8b0fd 100644
--- a/src/ivicore/qiviserviceinterface.h
+++ b/src/ivicore/qiviserviceinterface.h
@@ -52,7 +52,7 @@ public:
virtual ~QIviServiceInterface() {}
virtual QStringList interfaces() const = 0;
- virtual QObject* interfaceInstance(const QString& interface) const = 0;
+ virtual QObject *interfaceInstance(const QString &interface) const = 0;
};
Q_DECLARE_INTERFACE(QIviServiceInterface, "com.pelagicore.QIviServiceInterface")
diff --git a/src/ivicore/qiviservicemanager.cpp b/src/ivicore/qiviservicemanager.cpp
index 8c83591..18fe2eb 100644
--- a/src/ivicore/qiviservicemanager.cpp
+++ b/src/ivicore/qiviservicemanager.cpp
@@ -297,7 +297,7 @@ QIviServiceManager::QIviServiceManager()
*/
QIviServiceManager *QIviServiceManager::instance()
{
- static QIviServiceManager* instance = new QIviServiceManager();
+ static QIviServiceManager *instance = new QIviServiceManager();
return instance;
}
diff --git a/src/ivicore/queryparser/qiviqueryterm.h b/src/ivicore/queryparser/qiviqueryterm.h
index bd18612..4a9eff4 100644
--- a/src/ivicore/queryparser/qiviqueryterm.h
+++ b/src/ivicore/queryparser/qiviqueryterm.h
@@ -77,8 +77,8 @@ public:
QIviConjunctionTerm();
virtual ~QIviConjunctionTerm();
- QIviAbstractQueryTerm::Type type() const;
- QString toString() const;
+ QIviAbstractQueryTerm::Type type() const Q_DECL_OVERRIDE;
+ QString toString() const Q_DECL_OVERRIDE;
Conjunction conjunction() const;
QList<QIviAbstractQueryTerm*> terms() const;
@@ -97,8 +97,8 @@ public:
explicit QIviScopeTerm();
virtual ~QIviScopeTerm();
- QIviAbstractQueryTerm::Type type() const;
- QString toString() const;
+ QIviAbstractQueryTerm::Type type() const Q_DECL_OVERRIDE;
+ QString toString() const Q_DECL_OVERRIDE;
bool isNegated() const;
QIviAbstractQueryTerm* term() const;
@@ -126,8 +126,8 @@ public:
explicit QIviFilterTerm();
virtual ~QIviFilterTerm();
- QIviAbstractQueryTerm::Type type() const;
- QString toString() const;
+ QIviAbstractQueryTerm::Type type() const Q_DECL_OVERRIDE;
+ QString toString() const Q_DECL_OVERRIDE;
Operator operatorType() const;
QVariant value() const;
QString propertyName() const;
diff --git a/src/ivicore/queryparser/qiviqueryterm_p.h b/src/ivicore/queryparser/qiviqueryterm_p.h
index 93671c2..4260408 100644
--- a/src/ivicore/queryparser/qiviqueryterm_p.h
+++ b/src/ivicore/queryparser/qiviqueryterm_p.h
@@ -71,7 +71,7 @@ class Q_QTIVICORE_EXPORT QIviScopeTermPrivate
public:
QIviScopeTermPrivate();
- QIviAbstractQueryTerm* m_term;
+ QIviAbstractQueryTerm *m_term;
bool m_negated;
};
View Lorry Controller Status