diff options
35 files changed, 147 insertions, 153 deletions
diff --git a/examples/vehiclefunctions/climate_widget/mainwindow.cpp b/examples/vehiclefunctions/climate_widget/mainwindow.cpp index 3e9dba6..fb0ab80 100644 --- a/examples/vehiclefunctions/climate_widget/mainwindow.cpp +++ b/examples/vehiclefunctions/climate_widget/mainwindow.cpp @@ -140,12 +140,12 @@ void MainWindow::onAirRecirculationModeChanged(QIviClimateControl::Recirculation ui->cb_airRecirculation->setChecked(mode == QIviClimateControl::RecirculationOn); } -void MainWindow::onAirRecirculationAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::RecirculationMode> & attribute) +void MainWindow::onAirRecirculationAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::RecirculationMode> &attribute) { ui->cb_airRecirculation->setEnabled(attribute.isAvailable()); } -void MainWindow::onHeaterAttributeChanged(const QIviPropertyAttribute<bool> & attribute) +void MainWindow::onHeaterAttributeChanged(const QIviPropertyAttribute<bool> &attribute) { ui->cb_heater->setEnabled(attribute.isAvailable()); } @@ -163,7 +163,7 @@ void MainWindow::setupFlowDirectionRadioButtons(QIviClimateControl::AirflowDirec ui->cb_floor->setChecked(direction.testFlag(QIviClimateControl::Floor)); } -void MainWindow::setupFlowDirectionAttribute(const QIviPropertyAttribute<QIviClimateControl::AirflowDirections> & attribute) +void MainWindow::setupFlowDirectionAttribute(const QIviPropertyAttribute<QIviClimateControl::AirflowDirections> &attribute) { ui->cb_windshield->setEnabled(attribute.availableValues().contains(QIviClimateControl::Windshield)); ui->cb_dashboard->setEnabled(attribute.availableValues().contains(QIviClimateControl::Dashboard)); diff --git a/examples/vehiclefunctions/climate_widget/mainwindow.h b/examples/vehiclefunctions/climate_widget/mainwindow.h index ec80863..be378c3 100644 --- a/examples/vehiclefunctions/climate_widget/mainwindow.h +++ b/examples/vehiclefunctions/climate_widget/mainwindow.h @@ -81,12 +81,12 @@ private slots: void onAirConditioningAttributeChanged(const QIviPropertyAttribute<bool> &attribute); void setupFlowDirectionRadioButtons(QIviClimateControl::AirflowDirections direction); void setupFlowDirectionAttribute(const QIviPropertyAttribute<QIviClimateControl::AirflowDirections> &attribute); - void onFlowDirectionButtonToggled(QAbstractButton * button, bool checked); + void onFlowDirectionButtonToggled(QAbstractButton *button, bool checked); private: Ui::MainWindow *ui; QButtonGroup *m_buttonGroup; - QIviClimateControl* m_climateControl; + QIviClimateControl *m_climateControl; }; #endif // MAINWINDOW_H diff --git a/src/geniviextras/qdltregistration.cpp b/src/geniviextras/qdltregistration.cpp index 9644ff5..498bc67 100644 --- a/src/geniviextras/qdltregistration.cpp +++ b/src/geniviextras/qdltregistration.cpp @@ -68,7 +68,7 @@ QDltRegistrationPrivate::QDltRegistrationPrivate(QDltRegistration *parent) { } -void QDltRegistrationPrivate::registerCategory(const QLoggingCategory* category, DltContext *dltContext, const char *dltCtxName, const char *dltCtxDescription) +void QDltRegistrationPrivate::registerCategory(const QLoggingCategory *category, DltContext *dltContext, const char *dltCtxName, const char *dltCtxDescription) { DLT_REGISTER_CONTEXT(*dltContext, dltCtxName, dltCtxDescription); m_categoryName2DltContext.insert(QString::fromLatin1(category->categoryName()), dltContext); @@ -100,8 +100,7 @@ void QDltRegistrationPrivate::dltLogLevelChanged(char context_id[], uint8_t log_ Q_UNUSED(trace_status) const QString contextName = QString::fromLatin1(context_id); - if (m_ctxName2Category.contains(contextName)) - { + if (m_ctxName2Category.contains(contextName)) { QList<QtMsgType> msgTypes; //Enable all QtLoggingCategories with a lower severity than the DLT level @@ -138,8 +137,7 @@ void QDltRegistrationPrivate::dltLogLevelChanged(char context_id[], uint8_t log_ if (!msgTypes.contains(type)) enabled = !enabled; QLoggingCategory* category = m_ctxName2Category.value(contextName); - if (category->isEnabled(type) != enabled) - { + if (category->isEnabled(type) != enabled) { category->setEnabled(type, enabled); q->logLevelChanged(category); } @@ -164,7 +162,7 @@ void QDltRegistration::registerApplication(const char *dltAppID, const char *dlt DLT_REGISTER_APP(dltAppID, dltAppDescription); } -void QDltRegistration::registerCategory(const QLoggingCategory* category, const char *dltCtxName, const char *dltCtxDescription) +void QDltRegistration::registerCategory(const QLoggingCategory *category, const char *dltCtxName, const char *dltCtxDescription) { Q_D(QDltRegistration); //TODO memory leak @@ -184,13 +182,11 @@ void QDltRegistration::unregisterApplication() DLT_UNREGISTER_APP(); } -void QDltRegistration::messageHandler(QtMsgType msgTypes, const QMessageLogContext & msgCtx, const QString & msg) +void QDltRegistration::messageHandler(QtMsgType msgTypes, const QMessageLogContext &msgCtx, const QString &msg) { - DltContext* dltCtx = globalDltRegistration()->d_ptr->context(msgCtx.category); + DltContext *dltCtx = globalDltRegistration()->d_ptr->context(msgCtx.category); if (!dltCtx) - { return; - } DltLogLevelType logLevel = DLT_LOG_INFO; diff --git a/src/geniviextras/qdltregistration.h b/src/geniviextras/qdltregistration.h index 239826c..3db88fd 100644 --- a/src/geniviextras/qdltregistration.h +++ b/src/geniviextras/qdltregistration.h @@ -63,8 +63,8 @@ public: void registerApplication(const char *dltAppID, const char *dltAppDescription); void unregisterApplication(); - void registerCategory(const QLoggingCategory *category, const char* dltCtxName, const char* dltCtxDescription); - void setDefaultContext(const char* categoryName); + void registerCategory(const QLoggingCategory *category, const char *dltCtxName, const char *dltCtxDescription); + void setDefaultContext(const char *categoryName); static void messageHandler(QtMsgType msgTypes, const QMessageLogContext &msgCtx, const QString &msg); @@ -72,13 +72,13 @@ Q_SIGNALS: void logLevelChanged(const QLoggingCategory *category); private: - QDltRegistrationPrivate* const d_ptr; + QDltRegistrationPrivate * const d_ptr; Q_DECLARE_PRIVATE(QDltRegistration) friend void qtGeniviLogLevelChangedHandler(char context_id[], uint8_t log_level, uint8_t trace_status); }; -Q_GENIVIEXTRAS_EXPORT extern QDltRegistration* globalDltRegistration(); +Q_GENIVIEXTRAS_EXPORT extern QDltRegistration *globalDltRegistration(); QT_END_NAMESPACE diff --git a/src/geniviextras/qdltregistration_p.h b/src/geniviextras/qdltregistration_p.h index 495b741..1e8f714 100644 --- a/src/geniviextras/qdltregistration_p.h +++ b/src/geniviextras/qdltregistration_p.h @@ -64,19 +64,19 @@ class QDltRegistration; class QDltRegistrationPrivate { public: - QDltRegistrationPrivate(QDltRegistration* parent); + QDltRegistrationPrivate(QDltRegistration *parent); - void registerCategory(const QLoggingCategory* category, DltContext *dltContext, const char *dltCtxName, const char *dltCtxDescription); - void setDefaultContext(DltContext* dltContext); + void registerCategory(const QLoggingCategory *category, DltContext *dltContext, const char *dltCtxName, const char *dltCtxDescription); + void setDefaultContext(DltContext *dltContext); - DltContext* context(const char* categoryName); + DltContext *context(const char *categoryName); void dltLogLevelChanged(char context_id[], uint8_t log_level, uint8_t trace_status); private: - QDltRegistration* const q_ptr; + QDltRegistration *const q_ptr; Q_DECLARE_PUBLIC(QDltRegistration) QString m_dltAppID; - DltContext* m_defaultContext; + DltContext *m_defaultContext; QHash<QString, DltContext*> m_categoryName2DltContext; QHash<QString, QLoggingCategory*> m_ctxName2Category; }; 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; }; diff --git a/src/ivimedia/qiviplayqueue_p.h b/src/ivimedia/qiviplayqueue_p.h index 0857cd4..dcac1a1 100644 --- a/src/ivimedia/qiviplayqueue_p.h +++ b/src/ivimedia/qiviplayqueue_p.h @@ -77,7 +77,7 @@ public: void clearToDefaults(); const QIviPlayableItem *itemAt(int i) const; - QIviMediaPlayerBackendInterface* playerBackend() const; + QIviMediaPlayerBackendInterface *playerBackend() const; QIviPlayQueue * const q_ptr; Q_DECLARE_PUBLIC(QIviPlayQueue) diff --git a/src/ivivehiclefunctions/qiviclimatecontrol.cpp b/src/ivivehiclefunctions/qiviclimatecontrol.cpp index f1fe633..05e94d1 100644 --- a/src/ivivehiclefunctions/qiviclimatecontrol.cpp +++ b/src/ivivehiclefunctions/qiviclimatecontrol.cpp @@ -642,7 +642,7 @@ QIviClimateControlBackendInterface *QIviClimateControlPrivate::climateControlBac The \a parent argument is passed on to the \l QIviAbstractZonedFeature base class. */ -QIviClimateControl::QIviClimateControl(const QString &zone, QObject* parent) +QIviClimateControl::QIviClimateControl(const QString &zone, QObject *parent) : QIviAbstractZonedFeature(*new QIviClimateControlPrivate(QIviStringClimateControlInterfaceName, zone, this), parent) { Q_D(QIviClimateControl); @@ -664,7 +664,7 @@ void QIviClimateControl::connectToServiceObject(QIviServiceObject *serviceObject Q_D(QIviClimateControl); QIviAbstractZonedFeature::connectToServiceObject(serviceObject); - QIviClimateControlBackendInterface* backend = d->climateControlBackend(); + QIviClimateControlBackendInterface *backend = d->climateControlBackend(); if (!backend) return; @@ -1469,7 +1469,7 @@ QIviProperty *QIviClimateControl::automaticClimateFanIntensityLevelProperty() co void QIviClimateControl::setAirConditioningEnabled(bool enabled) { Q_D(QIviClimateControl); - if (QIviClimateControlBackendInterface* backend = d->climateControlBackend()) + if (QIviClimateControlBackendInterface *backend = d->climateControlBackend()) backend->setAirConditioningEnabled(enabled, zone()); } @@ -1481,7 +1481,7 @@ void QIviClimateControl::setAirConditioningEnabled(bool enabled) void QIviClimateControl::setAirflowDirections(QIviClimateControl::AirflowDirections direction) { Q_D(QIviClimateControl); - if (QIviClimateControlBackendInterface* backend = d->climateControlBackend()) + if (QIviClimateControlBackendInterface *backend = d->climateControlBackend()) backend->setAirflowDirections(direction, zone()); } @@ -1493,7 +1493,7 @@ void QIviClimateControl::setAirflowDirections(QIviClimateControl::AirflowDirecti void QIviClimateControl::setHeaterEnabled(bool enabled) { Q_D(QIviClimateControl); - if (QIviClimateControlBackendInterface* backend = d->climateControlBackend()) + if (QIviClimateControlBackendInterface *backend = d->climateControlBackend()) backend->setHeaterEnabled(enabled, zone()); } @@ -1505,7 +1505,7 @@ void QIviClimateControl::setHeaterEnabled(bool enabled) void QIviClimateControl::setSteeringWheelHeater(int value) { Q_D(QIviClimateControl); - if (QIviClimateControlBackendInterface* backend = d->climateControlBackend()) + if (QIviClimateControlBackendInterface *backend = d->climateControlBackend()) backend->setSteeringWheelHeater(value, zone()); } @@ -1517,7 +1517,7 @@ void QIviClimateControl::setSteeringWheelHeater(int value) void QIviClimateControl::setFanSpeedLevel(int value) { Q_D(QIviClimateControl); - if (QIviClimateControlBackendInterface* backend = d->climateControlBackend()) + if (QIviClimateControlBackendInterface *backend = d->climateControlBackend()) backend->setFanSpeedLevel(value, zone()); } @@ -1529,7 +1529,7 @@ void QIviClimateControl::setFanSpeedLevel(int value) void QIviClimateControl::setTargetTemperature(int temperature) { Q_D(QIviClimateControl); - if (QIviClimateControlBackendInterface* backend = d->climateControlBackend()) + if (QIviClimateControlBackendInterface *backend = d->climateControlBackend()) backend->setTargetTemperature(temperature, zone()); } @@ -1541,7 +1541,7 @@ void QIviClimateControl::setTargetTemperature(int temperature) void QIviClimateControl::setSeatCooler(int value) { Q_D(QIviClimateControl); - if (QIviClimateControlBackendInterface* backend = d->climateControlBackend()) + if (QIviClimateControlBackendInterface *backend = d->climateControlBackend()) backend->setSeatCooler(value, zone()); } @@ -1553,7 +1553,7 @@ void QIviClimateControl::setSeatCooler(int value) void QIviClimateControl::setSeatHeater(int value) { Q_D(QIviClimateControl); - if (QIviClimateControlBackendInterface* backend = d->climateControlBackend()) + if (QIviClimateControlBackendInterface *backend = d->climateControlBackend()) backend->setSeatHeater(value, zone()); } @@ -1565,7 +1565,7 @@ void QIviClimateControl::setSeatHeater(int value) void QIviClimateControl::setZoneSynchronizationEnabled(bool enabled) { Q_D(QIviClimateControl); - if (QIviClimateControlBackendInterface* backend = d->climateControlBackend()) + if (QIviClimateControlBackendInterface *backend = d->climateControlBackend()) backend->setZoneSynchronizationEnabled(enabled, zone()); } @@ -1577,7 +1577,7 @@ void QIviClimateControl::setZoneSynchronizationEnabled(bool enabled) void QIviClimateControl::setDefrostEnabled(bool enabled) { Q_D(QIviClimateControl); - if (QIviClimateControlBackendInterface* backend = d->climateControlBackend()) + if (QIviClimateControlBackendInterface *backend = d->climateControlBackend()) backend->setDefrostEnabled(enabled, zone()); } @@ -1589,7 +1589,7 @@ void QIviClimateControl::setDefrostEnabled(bool enabled) void QIviClimateControl::setRecirculationMode(QIviClimateControl::RecirculationMode recirculationMode) { Q_D(QIviClimateControl); - if (QIviClimateControlBackendInterface* backend = d->climateControlBackend()) + if (QIviClimateControlBackendInterface *backend = d->climateControlBackend()) backend->setRecirculationMode(recirculationMode, zone()); } @@ -1601,7 +1601,7 @@ void QIviClimateControl::setRecirculationMode(QIviClimateControl::RecirculationM void QIviClimateControl::setRecirculationSensitivityLevel(int value) { Q_D(QIviClimateControl); - if (QIviClimateControlBackendInterface* backend = d->climateControlBackend()) + if (QIviClimateControlBackendInterface *backend = d->climateControlBackend()) backend->setRecirculationSensitivityLevel(value, zone()); } @@ -1613,7 +1613,7 @@ void QIviClimateControl::setRecirculationSensitivityLevel(int value) void QIviClimateControl::setClimateMode(QIviClimateControl::ClimateMode climateMode) { Q_D(QIviClimateControl); - if (QIviClimateControlBackendInterface* backend = d->climateControlBackend()) + if (QIviClimateControlBackendInterface *backend = d->climateControlBackend()) backend->setClimateMode(climateMode, zone()); } @@ -1625,7 +1625,7 @@ void QIviClimateControl::setClimateMode(QIviClimateControl::ClimateMode climateM void QIviClimateControl::setAutomaticClimateFanIntensityLevel(int value) { Q_D(QIviClimateControl); - if (QIviClimateControlBackendInterface* backend = d->climateControlBackend()) + if (QIviClimateControlBackendInterface *backend = d->climateControlBackend()) backend->setAutomaticClimateFanIntensityLevel(value, zone()); } diff --git a/src/ivivehiclefunctions/qiviclimatecontrol.h b/src/ivivehiclefunctions/qiviclimatecontrol.h index 8010fd3..1aedb10 100644 --- a/src/ivivehiclefunctions/qiviclimatecontrol.h +++ b/src/ivivehiclefunctions/qiviclimatecontrol.h @@ -56,22 +56,22 @@ static const QLatin1String QIviStringClimateControlInterfaceName("com.qt-project class Q_QTIVIVEHICLEFUNCTIONS_EXPORT QIviClimateControl : public QIviAbstractZonedFeature { Q_OBJECT - Q_PROPERTY(QIviProperty* airConditioning READ airConditioningProperty CONSTANT) - Q_PROPERTY(QIviProperty* airflowDirections READ airflowDirectionsProperty CONSTANT) - Q_PROPERTY(QIviProperty* heater READ heaterProperty CONSTANT) - Q_PROPERTY(QIviProperty* fanSpeedLevel READ fanSpeedLevelProperty CONSTANT) - Q_PROPERTY(QIviProperty* steeringWheelHeater READ steeringWheelHeaterProperty CONSTANT) - Q_PROPERTY(QIviProperty* targetTemperature READ targetTemperatureProperty CONSTANT) - Q_PROPERTY(QIviProperty* seatCooler READ seatCoolerProperty CONSTANT) - Q_PROPERTY(QIviProperty* seatHeater READ seatHeaterProperty CONSTANT) - Q_PROPERTY(QIviProperty* outsideTemperature READ outsideTemperatureProperty CONSTANT) - Q_PROPERTY(QIviProperty* zoneSynchronization READ zoneSynchronizationProperty CONSTANT) - Q_PROPERTY(QIviProperty* defrost READ defrostProperty CONSTANT) - Q_PROPERTY(QIviProperty* recirculationMode READ recirculationModeProperty CONSTANT) - Q_PROPERTY(QIviProperty* recirculation READ recirculationProperty CONSTANT) - Q_PROPERTY(QIviProperty* recirculationSensitivityLevel READ recirculationSensitivityLevelProperty CONSTANT) - Q_PROPERTY(QIviProperty* climateMode READ climateModeProperty CONSTANT) - Q_PROPERTY(QIviProperty* automaticClimateFanIntensityLevel READ automaticClimateFanIntensityLevelProperty CONSTANT) + Q_PROPERTY(QIviProperty *airConditioning READ airConditioningProperty CONSTANT) + Q_PROPERTY(QIviProperty *airflowDirections READ airflowDirectionsProperty CONSTANT) + Q_PROPERTY(QIviProperty *heater READ heaterProperty CONSTANT) + Q_PROPERTY(QIviProperty *fanSpeedLevel READ fanSpeedLevelProperty CONSTANT) + Q_PROPERTY(QIviProperty *steeringWheelHeater READ steeringWheelHeaterProperty CONSTANT) + Q_PROPERTY(QIviProperty *targetTemperature READ targetTemperatureProperty CONSTANT) + Q_PROPERTY(QIviProperty *seatCooler READ seatCoolerProperty CONSTANT) + Q_PROPERTY(QIviProperty *seatHeater READ seatHeaterProperty CONSTANT) + Q_PROPERTY(QIviProperty *outsideTemperature READ outsideTemperatureProperty CONSTANT) + Q_PROPERTY(QIviProperty *zoneSynchronization READ zoneSynchronizationProperty CONSTANT) + Q_PROPERTY(QIviProperty *defrost READ defrostProperty CONSTANT) + Q_PROPERTY(QIviProperty *recirculationMode READ recirculationModeProperty CONSTANT) + Q_PROPERTY(QIviProperty *recirculation READ recirculationProperty CONSTANT) + Q_PROPERTY(QIviProperty *recirculationSensitivityLevel READ recirculationSensitivityLevelProperty CONSTANT) + Q_PROPERTY(QIviProperty *climateMode READ climateModeProperty CONSTANT) + Q_PROPERTY(QIviProperty *automaticClimateFanIntensityLevel READ automaticClimateFanIntensityLevelProperty CONSTANT) public: enum AirflowDirection { @@ -96,57 +96,57 @@ public: }; Q_ENUM(ClimateMode) - QIviClimateControl(const QString &zone=QString(), QObject* parent=Q_NULLPTR); + QIviClimateControl(const QString &zone = QString(), QObject *parent = Q_NULLPTR); ~QIviClimateControl(); bool isAirConditioningEnabled() const; QIviPropertyAttribute<bool> airConditioningAttribute() const; - QIviProperty* airConditioningProperty() const; + QIviProperty *airConditioningProperty() const; QIviClimateControl::AirflowDirections airflowDirections() const; QIviPropertyAttribute<QIviClimateControl::AirflowDirections> airflowDirectionsAttribute() const; - QIviProperty* airflowDirectionsProperty() const; + QIviProperty *airflowDirectionsProperty() const; bool isHeaterEnabled() const; QIviPropertyAttribute<bool> heaterAttribute() const; - QIviProperty* heaterProperty() const; + QIviProperty *heaterProperty() const; int steeringWheelHeater() const; QIviPropertyAttribute<int> steeringWheelHeaterAttribute() const; - QIviProperty* steeringWheelHeaterProperty() const; + QIviProperty *steeringWheelHeaterProperty() const; int fanSpeedLevel() const; QIviPropertyAttribute<int> fanSpeedLevelAttribute() const; - QIviProperty* fanSpeedLevelProperty() const; + QIviProperty *fanSpeedLevelProperty() const; int targetTemperature() const; QIviPropertyAttribute<int> targetTemperatureAttribute() const; - QIviProperty* targetTemperatureProperty() const; + QIviProperty *targetTemperatureProperty() const; int seatCooler() const; QIviPropertyAttribute<int> seatCoolerAttribute() const; - QIviProperty* seatCoolerProperty() const; + QIviProperty *seatCoolerProperty() const; int seatHeater() const; QIviPropertyAttribute<int> seatHeaterAttribute() const; - QIviProperty* seatHeaterProperty() const; + QIviProperty *seatHeaterProperty() const; int outsideTemperature() const; QIviPropertyAttribute<int> outsideTemperatureAttribute() const; - QIviProperty* outsideTemperatureProperty() const; + QIviProperty *outsideTemperatureProperty() const; bool isZoneSynchronizationEnabled() const; QIviPropertyAttribute<bool> zoneSynchronizationAttribute() const; - QIviProperty* zoneSynchronizationProperty() const; + QIviProperty *zoneSynchronizationProperty() const; bool isDefrostEnabled() const; QIviPropertyAttribute<bool> defrostAttribute() const; - QIviProperty* defrostProperty() const; + QIviProperty *defrostProperty() const; QIviClimateControl::RecirculationMode recirculationMode() const; QIviPropertyAttribute<QIviClimateControl::RecirculationMode> recirculationModeAttribute() const; - QIviProperty* recirculationModeProperty() const; + QIviProperty *recirculationModeProperty() const; bool isRecirculationEnabled() const; QIviPropertyAttribute<bool> recirculationAttribute() const; - QIviProperty* recirculationProperty() const; + QIviProperty *recirculationProperty() const; int recirculationSensitivityLevel() const; QIviPropertyAttribute<int> recirculationSensitivityLevelAttribute() const; - QIviProperty* recirculationSensitivityLevelProperty() const; + QIviProperty *recirculationSensitivityLevelProperty() const; QIviClimateControl::ClimateMode climateMode() const; QIviPropertyAttribute<QIviClimateControl::ClimateMode> climateModeAttribute() const; - QIviProperty* climateModeProperty() const; + QIviProperty *climateModeProperty() const; int automaticClimateFanIntensityLevel() const; QIviPropertyAttribute<int> automaticClimateFanIntensityLevelAttribute() const; - QIviProperty* automaticClimateFanIntensityLevelProperty() const; + QIviProperty *automaticClimateFanIntensityLevelProperty() const; public Q_SLOTS: void setAirConditioningEnabled(bool enabled); @@ -200,7 +200,7 @@ Q_SIGNALS: protected: QIviClimateControl(QIviClimateControlPrivate &dd, QObject *parent = Q_NULLPTR); - virtual QIviAbstractZonedFeature* createZoneFeature(const QString &zone) Q_DECL_OVERRIDE; + virtual QIviAbstractZonedFeature *createZoneFeature(const QString &zone) Q_DECL_OVERRIDE; virtual void connectToServiceObject(QIviServiceObject *serviceObject) Q_DECL_OVERRIDE; virtual void disconnectFromServiceObject(QIviServiceObject *serviceObject) Q_DECL_OVERRIDE; diff --git a/src/ivivehiclefunctions/qiviclimatecontrol_p.h b/src/ivivehiclefunctions/qiviclimatecontrol_p.h index b8a3f46..2730a70 100644 --- a/src/ivivehiclefunctions/qiviclimatecontrol_p.h +++ b/src/ivivehiclefunctions/qiviclimatecontrol_p.h @@ -101,7 +101,7 @@ public: void onAutomaticClimateFanIntensityLevelChanged(int automaticClimateFanIntensityLevel, const QString &zone); void onAutomaticClimateFanIntensityLevelAttributeChanged(const QIviPropertyAttribute<int> &attribute, const QString &zone); - QIviClimateControlBackendInterface* climateControlBackend(); + QIviClimateControlBackendInterface *climateControlBackend(); QIviClimateControl::AirflowDirections m_airflowDirections; QIviPropertyAttribute<QIviClimateControl::AirflowDirections> m_airflowDirectionsAttribute; diff --git a/src/ivivehiclefunctions/qiviwindowcontrol.cpp b/src/ivivehiclefunctions/qiviwindowcontrol.cpp index 68f3955..85fb1f8 100644 --- a/src/ivivehiclefunctions/qiviwindowcontrol.cpp +++ b/src/ivivehiclefunctions/qiviwindowcontrol.cpp @@ -316,7 +316,7 @@ void QIviWindowControl::connectToServiceObject(QIviServiceObject *serviceObject) Q_D(QIviWindowControl); QIviAbstractZonedFeature::connectToServiceObject(serviceObject); - QIviWindowControlBackendInterface* backend = d->windowControlBackend(); + QIviWindowControlBackendInterface *backend = d->windowControlBackend(); if (!backend) return; @@ -623,7 +623,7 @@ QIviProperty *QIviWindowControl::stateProperty() const void QIviWindowControl::setHeaterMode(QIviWindowControl::HeaterMode value) { Q_D(QIviWindowControl); - if (QIviWindowControlBackendInterface* backend = d->windowControlBackend()) + if (QIviWindowControlBackendInterface *backend = d->windowControlBackend()) backend->setHeaterMode(value, zone()); } @@ -635,7 +635,7 @@ void QIviWindowControl::setHeaterMode(QIviWindowControl::HeaterMode value) void QIviWindowControl::setBlindMode(QIviWindowControl::BlindMode value) { Q_D(QIviWindowControl); - if (QIviWindowControlBackendInterface* backend = d->windowControlBackend()) + if (QIviWindowControlBackendInterface *backend = d->windowControlBackend()) backend->setBlindMode(value, zone()); } @@ -655,7 +655,7 @@ void QIviWindowControl::setBlindMode(QIviWindowControl::BlindMode value) void QIviWindowControl::open() { Q_D(QIviWindowControl); - if (QIviWindowControlBackendInterface* backend = d->windowControlBackend()) + if (QIviWindowControlBackendInterface *backend = d->windowControlBackend()) backend->open(zone()); } @@ -675,7 +675,7 @@ void QIviWindowControl::open() void QIviWindowControl::close() { Q_D(QIviWindowControl); - if (QIviWindowControlBackendInterface* backend = d->windowControlBackend()) + if (QIviWindowControlBackendInterface *backend = d->windowControlBackend()) backend->close(zone()); } diff --git a/src/ivivehiclefunctions/qiviwindowcontrol.h b/src/ivivehiclefunctions/qiviwindowcontrol.h index 9844b62..d99f14b 100644 --- a/src/ivivehiclefunctions/qiviwindowcontrol.h +++ b/src/ivivehiclefunctions/qiviwindowcontrol.h @@ -86,7 +86,7 @@ public: }; Q_ENUM(State) - QIviWindowControl(const QString &zone=QString(), QObject *parent = Q_NULLPTR); + QIviWindowControl(const QString &zone = QString(), QObject *parent = Q_NULLPTR); ~QIviWindowControl(); QIviWindowControl::HeaterMode heaterMode() const; diff --git a/src/plugins/ivimedia/media_simulator/mediadiscoverybackend.h b/src/plugins/ivimedia/media_simulator/mediadiscoverybackend.h index 4864993..692a900 100644 --- a/src/plugins/ivimedia/media_simulator/mediadiscoverybackend.h +++ b/src/plugins/ivimedia/media_simulator/mediadiscoverybackend.h @@ -59,8 +59,8 @@ private slots: void onDirectoryChanged(const QString &path); signals: - void mediaDirectoryAdded(const QString& path); - void mediaDirectoryRemoved(const QString& path); + void mediaDirectoryAdded(const QString &path); + void mediaDirectoryRemoved(const QString &path); private: QString m_deviceFolder; diff --git a/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/climatecontrolbackend.h b/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/climatecontrolbackend.h index 7895f66..88062d2 100644 --- a/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/climatecontrolbackend.h +++ b/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/climatecontrolbackend.h @@ -48,7 +48,7 @@ class ClimateControlBackend : public QIviClimateControlBackendInterface { public: - ClimateControlBackend(QObject* parent = 0); + ClimateControlBackend(QObject *parent = 0); ~ClimateControlBackend(); public: diff --git a/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/vehicleplugin.h b/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/vehicleplugin.h index e69dbac..da3bbb3 100644 --- a/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/vehicleplugin.h +++ b/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/vehicleplugin.h @@ -57,11 +57,11 @@ public: VehiclePlugin(QObject *parent = 0); QStringList interfaces() const; - QObject* interfaceInstance(const QString& interface) const; + QObject *interfaceInstance(const QString& interface) const; private: - ClimateControlBackend* m_climate; - WindowControlBackend* m_window; + ClimateControlBackend *m_climate; + WindowControlBackend *m_window; }; #endif // VEHICLEPLUGIN_H diff --git a/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/windowcontrolbackend.h b/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/windowcontrolbackend.h index 37360b8..b0470c9 100644 --- a/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/windowcontrolbackend.h +++ b/src/plugins/ivivehiclefunctions/vehiclefunction_simulator/windowcontrolbackend.h @@ -52,7 +52,7 @@ class WindowTimer : public QObject Q_OBJECT public: - WindowTimer(const QString &zone, bool isBlind, WindowControlBackend* backend); + WindowTimer(const QString &zone, bool isBlind, WindowControlBackend *backend); void setOpeningTime(int intervalInSeconds); void open(); @@ -68,13 +68,13 @@ private: int m_interval; QString m_zone; bool m_blind; - WindowControlBackend* m_backend; + WindowControlBackend *m_backend; }; class WindowControlBackend : public QIviWindowControlBackendInterface { public: - WindowControlBackend(QObject* parent = 0); + WindowControlBackend(QObject *parent = 0); ~WindowControlBackend(); QStringList availableZones() const; diff --git a/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp b/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp index 1a176d8..9fdb27a 100644 --- a/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp +++ b/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp @@ -319,7 +319,7 @@ public: private: QStringList m_interfaces; - TestBackend* m_backend; + TestBackend *m_backend; }; class tst_QIviSearchAndBrowseModel : public QObject @@ -587,7 +587,7 @@ void tst_QIviSearchAndBrowseModel::testNavigation() manager->registerService(service, service->interfaces()); service->testBackend()->initializeNavigationData(); - QIviSearchAndBrowseModel* model = new QIviSearchAndBrowseModel(); + QIviSearchAndBrowseModel *model = new QIviSearchAndBrowseModel(); model->setServiceObject(service); QVERIFY(model->availableContentTypes().contains("levelOne")); diff --git a/tests/auto/core/queryparser/tst_queryparser.cpp b/tests/auto/core/queryparser/tst_queryparser.cpp index 0093d57..1e7ce24 100644 --- a/tests/auto/core/queryparser/tst_queryparser.cpp +++ b/tests/auto/core/queryparser/tst_queryparser.cpp @@ -143,7 +143,7 @@ void TestQueryParser::validQueries() QIviQueryParser parser; parser.setQuery(query); - QIviAbstractQueryTerm* term = parser.parse(); + QIviAbstractQueryTerm *term = parser.parse(); QVERIFY2(term, qPrintable(parser.lastError())); // if () @@ -207,7 +207,7 @@ void TestQueryParser::identifierList() QSet<QString> set; set.insert(identifier); parser.setAllowedIdentifiers(set); - QIviAbstractQueryTerm* term = parser.parse(); + QIviAbstractQueryTerm *term = parser.parse(); QVERIFY2(term, qPrintable(parser.lastError())); delete term; } diff --git a/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp b/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp index ee51fc7..1d866f1 100644 --- a/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp +++ b/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp @@ -48,7 +48,7 @@ public: return m_serviceObjects.keys(); } - QObject* interfaceInstance(const QString &interface) const { + QObject *interfaceInstance(const QString &interface) const { return m_serviceObjects.value(interface); } @@ -168,12 +168,12 @@ void ServiceManagerTest::testFindServiceObjects() type = QIviServiceManager::SimulationBackend; bool regResult = manager->registerService(backend, QStringList() << "TestInterface", type); QCOMPARE(regResult, true); - QObject* testObject = new QObject(); + QObject *testObject = new QObject(); backend->addServiceObject("TestInterface", testObject); QList<QIviServiceObject*> list = manager->findServiceByInterface("TestInterface", searchFlags); QVERIFY(!list.isEmpty()); - QIviServiceObject* serviceObject = list.at(0); + QIviServiceObject *serviceObject = list.at(0); QVERIFY(serviceObject->interfaces().contains("TestInterface")); QCOMPARE(serviceObject->interfaceInstance("TestInterface"), testObject); } diff --git a/tests/auto/dlt/tst_dlt.cpp b/tests/auto/dlt/tst_dlt.cpp index b7e5fe5..af3d1af 100644 --- a/tests/auto/dlt/tst_dlt.cpp +++ b/tests/auto/dlt/tst_dlt.cpp @@ -50,7 +50,7 @@ class QDltParser { public: - QDltParser(QFile* file) + QDltParser(QFile *file) : dltFile(new DltFile()) { QVERIFY(dlt_file_init(dltFile, false) >= 0); @@ -63,14 +63,14 @@ public: QVERIFY(dlt_file_free(dltFile, false) >= 0); } - QString idToString(char* id) + QString idToString(char *id) { QByteArray appData(DLT_ID_SIZE, '\0'); dlt_print_id(appData.data(),id); return QString(appData); } - QString readPayload(DltMessage* msg) + QString readPayload(DltMessage *msg) { QByteArray payload(msg->datasize, '\0'); dlt_message_payload(msg,payload.data(),msg->datasize,DLT_OUTPUT_ASCII,false); @@ -95,7 +95,7 @@ public: } private: - DltFile* dltFile; + DltFile *dltFile; }; @@ -120,7 +120,7 @@ private Q_SLOTS: private: QTemporaryFile m_tempFile; - QDltParser* m_dltParser; + QDltParser *m_dltParser; }; void QDltTest::initTestCase() @@ -134,7 +134,7 @@ void QDltTest::initTestCase() void QDltTest::testLogging() { - QDltRegistration* registration = globalDltRegistration(); + QDltRegistration *registration = globalDltRegistration(); registration->registerApplication("APP1", "Description for APP"); registration->registerCategory(&TEST1(), "TES1", "Test Category One"); diff --git a/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp b/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp index 9973e6c..a69ea83 100644 --- a/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp +++ b/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp @@ -517,7 +517,7 @@ public: QString name() const { return m_name; } QStringList interfaces() const { return m_interfaces; } - QObject* interfaceInstance(const QString& interface) const + QObject *interfaceInstance(const QString& interface) const { if (interface == QIviStringClimateControlInterfaceName) return testBackend(); @@ -533,7 +533,7 @@ public: private: QString m_name; QStringList m_interfaces; - ClimateControlTestBackend* m_backend; + ClimateControlTestBackend *m_backend; }; class ClimateControlInvalidServiceObject : public QIviServiceObject { @@ -547,12 +547,12 @@ public: QString name() const { return m_name; } QStringList interfaces() const { return m_interfaces; } - QObject* interfaceInstance(const QString& ) const { return m_dummyBackend; } + QObject *interfaceInstance(const QString& ) const { return m_dummyBackend; } private: QString m_name; QStringList m_interfaces; - QObject* m_dummyBackend; + QObject *m_dummyBackend; }; class ClimateControlTest : public QObject @@ -695,7 +695,7 @@ void ClimateControlTest::testIntProperties() QStringList zones = cc.availableZones(); zones.removeAll("Dummy"); foreach (QString z, zones) { - QIviClimateControl* climateZone = qobject_cast<QIviClimateControl*>(cc.zoneAt(z)); + QIviClimateControl *climateZone = qobject_cast<QIviClimateControl*>(cc.zoneAt(z)); testIVIProperty<QIviClimateControl, ClimateControlTestBackend, int>(testData, climateZone, service->testBackend(), z); } } else { @@ -743,7 +743,7 @@ void ClimateControlTest::testBoolProperties() QStringList zones = cc.availableZones(); zones.removeAll("Dummy"); foreach (QString z, zones) { - QIviClimateControl* climateZone = qobject_cast<QIviClimateControl*>(cc.zoneAt(z)); + QIviClimateControl *climateZone = qobject_cast<QIviClimateControl*>(cc.zoneAt(z)); testIVIProperty<QIviClimateControl, ClimateControlTestBackend, bool>(testData, climateZone, service->testBackend(), z); } } else { diff --git a/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp b/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp index 93db29e..db84ee3 100644 --- a/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp +++ b/tests/auto/vehiclefunctions/windowcontroltest/tst_windowcontroltest.cpp @@ -238,7 +238,7 @@ public: QString name() const { return m_name; } QStringList interfaces() const { return m_interfaces; } - QObject* interfaceInstance(const QString& interface) const + QObject *interfaceInstance(const QString& interface) const { if (interface == QIviStringWindowControlInterfaceName) return testBackend(); @@ -254,7 +254,7 @@ public: private: QString m_name; QStringList m_interfaces; - WindowControlTestBackend* m_backend; + WindowControlTestBackend *m_backend; }; class WindowControlInvalidServiceObject : public QIviServiceObject { @@ -268,12 +268,12 @@ public: QString name() const { return m_name; } QStringList interfaces() const { return m_interfaces; } - QObject* interfaceInstance(const QString& ) const { return m_dummyBackend; } + QObject *interfaceInstance(const QString& ) const { return m_dummyBackend; } private: QString m_name; QStringList m_interfaces; - QObject* m_dummyBackend; + QObject *m_dummyBackend; }; class WindowControlTest : public QObject @@ -357,7 +357,7 @@ void WindowControlTest::testClearServiceObject() QIviWindowControl wc; wc.startAutoDiscovery(); QVERIFY(wc.availableZones().contains("FrontLeft")); - QIviWindowControl* zone = qobject_cast<QIviWindowControl*>(wc.zoneAt("FrontLeft")); + QIviWindowControl *zone = qobject_cast<QIviWindowControl*>(wc.zoneAt("FrontLeft")); QVERIFY(zone); QCOMPARE(zone->heaterMode(), QIviWindowControl::HeaterOn); wc.setServiceObject(0); @@ -380,7 +380,7 @@ void WindowControlTest::testHeaterMode() QStringList zones = wc.availableZones(); zones.removeAll("Dummy"); foreach (QString z, zones) { - QIviWindowControl* window = qobject_cast<QIviWindowControl*>(wc.zoneAt(z)); + QIviWindowControl *window = qobject_cast<QIviWindowControl*>(wc.zoneAt(z)); testIVIProperty<QIviWindowControl, WindowControlTestBackend, QIviWindowControl::HeaterMode>(testData, window, service->testBackend(), z); } } @@ -398,7 +398,7 @@ void WindowControlTest::testHeaterEnabled() QStringList zones = wc.availableZones(); zones.removeAll("Dummy"); foreach (QString z, zones) { - QIviWindowControl* window = qobject_cast<QIviWindowControl*>(wc.zoneAt(z)); + QIviWindowControl *window = qobject_cast<QIviWindowControl*>(wc.zoneAt(z)); testIVIProperty<QIviWindowControl, WindowControlTestBackend, bool>(testData, window, service->testBackend(), z); } } @@ -419,7 +419,7 @@ void WindowControlTest::testBlindMode() QStringList zones = wc.availableZones(); zones.removeAll("Dummy"); foreach (QString z, zones) { - QIviWindowControl* window = qobject_cast<QIviWindowControl*>(wc.zoneAt(z)); + QIviWindowControl *window = qobject_cast<QIviWindowControl*>(wc.zoneAt(z)); testIVIProperty<QIviWindowControl, WindowControlTestBackend, QIviWindowControl::BlindMode>(testData, window, service->testBackend(), z); } } @@ -451,7 +451,7 @@ void WindowControlTest::testStates() QStringList zones = wc.availableZones(); zones.removeAll("Dummy"); foreach (QString z, zones) { - QIviWindowControl* window = qobject_cast<QIviWindowControl*>(wc.zoneAt(z)); + QIviWindowControl *window = qobject_cast<QIviWindowControl*>(wc.zoneAt(z)); testIVIProperty<QIviWindowControl, WindowControlTestBackend, QIviWindowControl::State>(testData, window, service->testBackend(), z); } } |