summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@pelagicore.com>2016-05-20 10:05:31 +0200
committerDominik Holland <dominik.holland@pelagicore.com>2016-05-24 08:52:16 +0000
commitad68065dd5740f5f69466d7f7e50355b150124c3 (patch)
tree813dbd193ad832e5bd471833069f4e7efa795952 /examples
parente3d7e2a476f4624a0cacb57b49fe03afb3c8ffec (diff)
downloadqtivi-ad68065dd5740f5f69466d7f7e50355b150124c3.tar.gz
Renamed the classes and imports to match the Qt conventions
QML: import QtIVICore 1.0 -> import QtIvi 1.0 import QtIVIVehicleFunctions 1.0 -> import QtIvi.VehicleFunctions 1.0 On C++ side: Includes: - #include <QtIviCore/QIviAbstractFeature> - #include <QtIviVehicleFunctions/QIviClimateControl> The renaming of the files will be done in separate commit to make the diffs easier to read Task-number: QTAUTO-40 Task-number: QTAUTO-41 Change-Id: I2efdaf1f4a15e09481532df1333fa9883e82d1fb Reviewed-by: Johan Thelin <johan.thelin@pelagicore.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/geniviextras/qdlt/loggingcategories.cpp2
-rw-r--r--examples/geniviextras/qdlt/loggingcategories.h2
-rw-r--r--examples/geniviextras/qdlt/main.cpp2
-rw-r--r--examples/vehiclefunctions/climate_qml/main.cpp2
-rw-r--r--examples/vehiclefunctions/climate_qml/main.qml4
-rw-r--r--examples/vehiclefunctions/climate_widget/main.cpp2
-rw-r--r--examples/vehiclefunctions/climate_widget/mainwindow.cpp64
-rw-r--r--examples/vehiclefunctions/climate_widget/mainwindow.h18
-rw-r--r--examples/vehiclefunctions/window_qml/WindowItem.qml4
-rw-r--r--examples/vehiclefunctions/window_qml/main.cpp2
-rw-r--r--examples/vehiclefunctions/window_qml/main.qml4
11 files changed, 53 insertions, 53 deletions
diff --git a/examples/geniviextras/qdlt/loggingcategories.cpp b/examples/geniviextras/qdlt/loggingcategories.cpp
index a6fa65d..6a2c0cb 100644
--- a/examples/geniviextras/qdlt/loggingcategories.cpp
+++ b/examples/geniviextras/qdlt/loggingcategories.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2016 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD-QTAS$
** Commercial License Usage
diff --git a/examples/geniviextras/qdlt/loggingcategories.h b/examples/geniviextras/qdlt/loggingcategories.h
index c0c17ed..32ba95f 100644
--- a/examples/geniviextras/qdlt/loggingcategories.h
+++ b/examples/geniviextras/qdlt/loggingcategories.h
@@ -3,7 +3,7 @@
** Copyright (C) 2016 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD-QTAS$
** Commercial License Usage
diff --git a/examples/geniviextras/qdlt/main.cpp b/examples/geniviextras/qdlt/main.cpp
index 55d30b1..2003a6c 100644
--- a/examples/geniviextras/qdlt/main.cpp
+++ b/examples/geniviextras/qdlt/main.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2016 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD-QTAS$
** Commercial License Usage
diff --git a/examples/vehiclefunctions/climate_qml/main.cpp b/examples/vehiclefunctions/climate_qml/main.cpp
index 422d692..1b4c909 100644
--- a/examples/vehiclefunctions/climate_qml/main.cpp
+++ b/examples/vehiclefunctions/climate_qml/main.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2016 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD-QTAS$
** Commercial License Usage
diff --git a/examples/vehiclefunctions/climate_qml/main.qml b/examples/vehiclefunctions/climate_qml/main.qml
index 68c11ae..c4bb1d0 100644
--- a/examples/vehiclefunctions/climate_qml/main.qml
+++ b/examples/vehiclefunctions/climate_qml/main.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2016 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD-QTAS$
** Commercial License Usage
@@ -56,7 +56,7 @@ import QtQuick.Window 2.2
import QtQuick.Layouts 1.1
import QtQuick.Dialogs 1.2
-import QtIVIVehicleFunctions 1.0
+import QtIvi.VehicleFunctions 1.0
ApplicationWindow {
title: "Climate Control"
diff --git a/examples/vehiclefunctions/climate_widget/main.cpp b/examples/vehiclefunctions/climate_widget/main.cpp
index 97dd735..19ce2b6 100644
--- a/examples/vehiclefunctions/climate_widget/main.cpp
+++ b/examples/vehiclefunctions/climate_widget/main.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2016 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD-QTAS$
** Commercial License Usage
diff --git a/examples/vehiclefunctions/climate_widget/mainwindow.cpp b/examples/vehiclefunctions/climate_widget/mainwindow.cpp
index 343a83e..3e9dba6 100644
--- a/examples/vehiclefunctions/climate_widget/mainwindow.cpp
+++ b/examples/vehiclefunctions/climate_widget/mainwindow.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2016 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD-QTAS$
** Commercial License Usage
@@ -71,7 +71,7 @@ MainWindow::MainWindow(QWidget *parent) :
m_buttonGroup->addButton(ui->cb_floor);
//![1]
- m_climateControl = new QtIVIClimateControl(QString(), this);
+ m_climateControl = new QIviClimateControl(QString(), this);
m_climateControl->startAutoDiscovery();
if (!m_climateControl->isValid())
@@ -85,27 +85,27 @@ MainWindow::MainWindow(QWidget *parent) :
connect(m_buttonGroup, static_cast<void (QButtonGroup::*)(QAbstractButton *, bool)>(&QButtonGroup::buttonToggled),
this, &MainWindow::onFlowDirectionButtonToggled);
- connect(m_climateControl, &QtIVIClimateControl::airflowDirectionsChanged,
+ connect(m_climateControl, &QIviClimateControl::airflowDirectionsChanged,
this, &MainWindow::setupFlowDirectionRadioButtons);
- connect(m_climateControl, &QtIVIClimateControl::airflowDirectionsAttributeChanged,
+ connect(m_climateControl, &QIviClimateControl::airflowDirectionsAttributeChanged,
this, &MainWindow::setupFlowDirectionAttribute);
//Air Condition
ui->cb_airCondition->setChecked(m_climateControl->isAirConditioningEnabled());
ui->cb_airCondition->setEnabled(m_climateControl->airConditioningAttribute().isAvailable());
- connect(m_climateControl, &QtIVIClimateControl::airConditioningEnabledChanged,
+ connect(m_climateControl, &QIviClimateControl::airConditioningEnabledChanged,
ui->cb_airCondition, &QCheckBox::setChecked);
- connect(m_climateControl, &QtIVIClimateControl::airConditioningAttributeChanged,
+ connect(m_climateControl, &QIviClimateControl::airConditioningAttributeChanged,
this, &MainWindow::onAirConditioningAttributeChanged);
connect(ui->cb_airCondition, &QCheckBox::clicked,
- m_climateControl, &QtIVIClimateControl::setAirConditioningEnabled);
+ m_climateControl, &QIviClimateControl::setAirConditioningEnabled);
//Air Recirculation
- ui->cb_airRecirculation->setChecked(m_climateControl->recirculationMode() == QtIVIClimateControl::RecirculationOn);
+ ui->cb_airRecirculation->setChecked(m_climateControl->recirculationMode() == QIviClimateControl::RecirculationOn);
ui->cb_airRecirculation->setEnabled(m_climateControl->recirculationModeAttribute().isAvailable());
- connect(m_climateControl, &QtIVIClimateControl::recirculationModeChanged,
+ connect(m_climateControl, &QIviClimateControl::recirculationModeChanged,
this, &MainWindow::onAirRecirculationModeChanged);
- connect(m_climateControl, &QtIVIClimateControl::recirculationModeAttributeChanged,
+ connect(m_climateControl, &QIviClimateControl::recirculationModeAttributeChanged,
this, &MainWindow::onAirRecirculationAttributeChanged);
connect(ui->cb_airRecirculation, &QCheckBox::clicked,
this, &MainWindow::setAirRecirculationEnabled);
@@ -113,12 +113,12 @@ MainWindow::MainWindow(QWidget *parent) :
//Heater
ui->cb_heater->setChecked(m_climateControl->isHeaterEnabled());
ui->cb_heater->setEnabled(m_climateControl->heaterAttribute().isAvailable());
- connect(m_climateControl, &QtIVIClimateControl::heaterEnabledChanged,
+ connect(m_climateControl, &QIviClimateControl::heaterEnabledChanged,
ui->cb_heater, &QCheckBox::setChecked);
- connect(m_climateControl, &QtIVIClimateControl::heaterAttributeChanged,
+ connect(m_climateControl, &QIviClimateControl::heaterAttributeChanged,
this, &MainWindow::onHeaterAttributeChanged);
connect(ui->cb_heater, &QCheckBox::clicked,
- m_climateControl, &QtIVIClimateControl::setHeaterEnabled);
+ m_climateControl, &QIviClimateControl::setHeaterEnabled);
}
//![2]
@@ -130,44 +130,44 @@ MainWindow::~MainWindow()
void MainWindow::setAirRecirculationEnabled(bool enabled)
{
if (enabled)
- m_climateControl->setRecirculationMode(QtIVIClimateControl::RecirculationOn);
+ m_climateControl->setRecirculationMode(QIviClimateControl::RecirculationOn);
else
- m_climateControl->setRecirculationMode(QtIVIClimateControl::RecirculationOff);
+ m_climateControl->setRecirculationMode(QIviClimateControl::RecirculationOff);
}
-void MainWindow::onAirRecirculationModeChanged(QtIVIClimateControl::RecirculationMode mode)
+void MainWindow::onAirRecirculationModeChanged(QIviClimateControl::RecirculationMode mode)
{
- ui->cb_airRecirculation->setChecked(mode == QtIVIClimateControl::RecirculationOn);
+ ui->cb_airRecirculation->setChecked(mode == QIviClimateControl::RecirculationOn);
}
-void MainWindow::onAirRecirculationAttributeChanged(const QtIVIPropertyAttribute<QtIVIClimateControl::RecirculationMode> & attribute)
+void MainWindow::onAirRecirculationAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::RecirculationMode> & attribute)
{
ui->cb_airRecirculation->setEnabled(attribute.isAvailable());
}
-void MainWindow::onHeaterAttributeChanged(const QtIVIPropertyAttribute<bool> & attribute)
+void MainWindow::onHeaterAttributeChanged(const QIviPropertyAttribute<bool> & attribute)
{
ui->cb_heater->setEnabled(attribute.isAvailable());
}
-void MainWindow::onAirConditioningAttributeChanged(const QtIVIPropertyAttribute<bool> & attribute)
+void MainWindow::onAirConditioningAttributeChanged(const QIviPropertyAttribute<bool> & attribute)
{
ui->cb_airCondition->setEnabled(attribute.isAvailable());
}
//![3]
-void MainWindow::setupFlowDirectionRadioButtons(QtIVIClimateControl::AirflowDirections direction)
+void MainWindow::setupFlowDirectionRadioButtons(QIviClimateControl::AirflowDirections direction)
{
- ui->cb_windshield->setChecked(direction.testFlag(QtIVIClimateControl::Windshield));
- ui->cb_dashboard->setChecked(direction.testFlag(QtIVIClimateControl::Dashboard));
- ui->cb_floor->setChecked(direction.testFlag(QtIVIClimateControl::Floor));
+ ui->cb_windshield->setChecked(direction.testFlag(QIviClimateControl::Windshield));
+ ui->cb_dashboard->setChecked(direction.testFlag(QIviClimateControl::Dashboard));
+ ui->cb_floor->setChecked(direction.testFlag(QIviClimateControl::Floor));
}
-void MainWindow::setupFlowDirectionAttribute(const QtIVIPropertyAttribute<QtIVIClimateControl::AirflowDirections> & attribute)
+void MainWindow::setupFlowDirectionAttribute(const QIviPropertyAttribute<QIviClimateControl::AirflowDirections> & attribute)
{
- ui->cb_windshield->setEnabled(attribute.availableValues().contains(QtIVIClimateControl::Windshield));
- ui->cb_dashboard->setEnabled(attribute.availableValues().contains(QtIVIClimateControl::Dashboard));
- ui->cb_floor->setEnabled(attribute.availableValues().contains(QtIVIClimateControl::Floor));
+ ui->cb_windshield->setEnabled(attribute.availableValues().contains(QIviClimateControl::Windshield));
+ ui->cb_dashboard->setEnabled(attribute.availableValues().contains(QIviClimateControl::Dashboard));
+ ui->cb_floor->setEnabled(attribute.availableValues().contains(QIviClimateControl::Floor));
}
void MainWindow::onFlowDirectionButtonToggled(QAbstractButton *button, bool checked)
@@ -175,14 +175,14 @@ void MainWindow::onFlowDirectionButtonToggled(QAbstractButton *button, bool chec
Q_UNUSED(button)
Q_UNUSED(checked)
- QtIVIClimateControl::AirflowDirections direction;
+ QIviClimateControl::AirflowDirections direction;
if (ui->cb_windshield->isChecked())
- direction |= QtIVIClimateControl::Windshield;
+ direction |= QIviClimateControl::Windshield;
if (ui->cb_dashboard->isChecked())
- direction |= QtIVIClimateControl::Dashboard;
+ direction |= QIviClimateControl::Dashboard;
if (ui->cb_floor->isChecked())
- direction |= QtIVIClimateControl::Floor;
+ direction |= QIviClimateControl::Floor;
m_climateControl->setAirflowDirections(direction);
}
diff --git a/examples/vehiclefunctions/climate_widget/mainwindow.h b/examples/vehiclefunctions/climate_widget/mainwindow.h
index 81564bd..ec80863 100644
--- a/examples/vehiclefunctions/climate_widget/mainwindow.h
+++ b/examples/vehiclefunctions/climate_widget/mainwindow.h
@@ -3,7 +3,7 @@
** Copyright (C) 2016 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD-QTAS$
** Commercial License Usage
@@ -54,7 +54,7 @@
#define MAINWINDOW_H
#include <QMainWindow>
-#include <QtIVIVehicleFunctions/QtIVIClimateControl>
+#include <QtIviVehicleFunctions/QIviClimateControl>
QT_BEGIN_NAMESPACE
namespace Ui {
@@ -75,18 +75,18 @@ public:
private slots:
void setAirRecirculationEnabled(bool enabled);
- void onAirRecirculationModeChanged(QtIVIClimateControl::RecirculationMode mode);
- void onAirRecirculationAttributeChanged(const QtIVIPropertyAttribute<QtIVIClimateControl::RecirculationMode> &attribute);
- void onHeaterAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute);
- void onAirConditioningAttributeChanged(const QtIVIPropertyAttribute<bool> &attribute);
- void setupFlowDirectionRadioButtons(QtIVIClimateControl::AirflowDirections direction);
- void setupFlowDirectionAttribute(const QtIVIPropertyAttribute<QtIVIClimateControl::AirflowDirections> &attribute);
+ void onAirRecirculationModeChanged(QIviClimateControl::RecirculationMode mode);
+ void onAirRecirculationAttributeChanged(const QIviPropertyAttribute<QIviClimateControl::RecirculationMode> &attribute);
+ void onHeaterAttributeChanged(const QIviPropertyAttribute<bool> &attribute);
+ void onAirConditioningAttributeChanged(const QIviPropertyAttribute<bool> &attribute);
+ void setupFlowDirectionRadioButtons(QIviClimateControl::AirflowDirections direction);
+ void setupFlowDirectionAttribute(const QIviPropertyAttribute<QIviClimateControl::AirflowDirections> &attribute);
void onFlowDirectionButtonToggled(QAbstractButton * button, bool checked);
private:
Ui::MainWindow *ui;
QButtonGroup *m_buttonGroup;
- QtIVIClimateControl* m_climateControl;
+ QIviClimateControl* m_climateControl;
};
#endif // MAINWINDOW_H
diff --git a/examples/vehiclefunctions/window_qml/WindowItem.qml b/examples/vehiclefunctions/window_qml/WindowItem.qml
index b289ac5..ca4a8d4 100644
--- a/examples/vehiclefunctions/window_qml/WindowItem.qml
+++ b/examples/vehiclefunctions/window_qml/WindowItem.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2016 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD-QTAS$
** Commercial License Usage
@@ -56,7 +56,7 @@ import QtQuick.Window 2.2
import QtQuick.Layouts 1.1
import QtQuick.Dialogs 1.2
-import QtIVIVehicleFunctions 1.0
+import QtIvi.VehicleFunctions 1.0
GroupBox {
property WindowControl zone
diff --git a/examples/vehiclefunctions/window_qml/main.cpp b/examples/vehiclefunctions/window_qml/main.cpp
index 422d692..1b4c909 100644
--- a/examples/vehiclefunctions/window_qml/main.cpp
+++ b/examples/vehiclefunctions/window_qml/main.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2016 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD-QTAS$
** Commercial License Usage
diff --git a/examples/vehiclefunctions/window_qml/main.qml b/examples/vehiclefunctions/window_qml/main.qml
index 5831d70..6d99f23 100644
--- a/examples/vehiclefunctions/window_qml/main.qml
+++ b/examples/vehiclefunctions/window_qml/main.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2016 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the QtIVI module of the Qt Toolkit.
+** This file is part of the QtIvi module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD-QTAS$
** Commercial License Usage
@@ -56,7 +56,7 @@ import QtQuick.Window 2.2
import QtQuick.Layouts 1.1
import QtQuick.Dialogs 1.2
-import QtIVIVehicleFunctions 1.0
+import QtIvi.VehicleFunctions 1.0
ApplicationWindow {
title: "Window Control"