Merge 'eel' into 'master'

Replace content from 'master' by content from 'eel' as it's the new
version based on 4a on which new development will be done.

Change-Id: I2966af7dcee59701ff3a344487c008d7e65e68ed
Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>

1 files changed, 0 insertions, 208 deletions

diff --git a/app/pacontrolmodel.cpp b/app/pacontrolmodel.cpp
deleted file mode 100644
index 9489052..0000000
--- a/app/pacontrolmodel.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright (C) 2016,2017 Konsulko Group
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "pacontrolmodel.h"
-
-PaControl::PaControl(const quint32 &cindex, const QString &name, const QString &desc, const quint32 &type, const quint32 &channel, const QString &cdesc, const quint32 &volume)
-	: m_cindex(cindex), m_name(name), m_desc(desc), m_type(type), m_channel(channel), m_cdesc(cdesc), m_volume(volume)
-{
-}
-
-quint32 PaControl::cindex() const
-{
-	return m_cindex;
-}
-
-QString PaControl::name() const
-{
-	QStringList list = m_name.split(".");
-
-	return list.at(1);
-}
-
-QString PaControl::desc() const
-{
-	return m_desc;
-}
-
-quint32 PaControl::type() const
-{
-	return m_type;
-}
-
-quint32 PaControl::channel() const
-{
-	return m_channel;
-}
-
-QString PaControl::cdesc() const
-{
-	return m_cdesc;
-}
-
-
-quint32 PaControl::volume() const
-{
-	return m_volume;
-}
-
-// FIXME: Not all of these should be editable roles
-void PaControl::setCIndex(const QVariant &cindex)
-{
-	m_cindex = cindex.toUInt();
-}
-
-void PaControl::setName(const QVariant &name)
-{
-	m_name = name.toString();
-}
-
-void PaControl::setDesc(const QVariant &desc)
-{
-	m_desc = desc.toString();
-}
-
-void PaControl::setType(const QVariant &type)
-{
-	m_type = type.toUInt();
-}
-
-void PaControl::setChannel(const QVariant &channel)
-{
-	m_channel = channel.toUInt();
-}
-
-void PaControl::setCDesc(const QVariant &cdesc)
-{
-	m_cdesc = cdesc.toString();
-}
-
-void PaControl::setVolume(PaControlModel *pacm, const QVariant &volume)
-{
-	if (volume != m_volume) {
-		m_volume = volume.toUInt();
-		if (pacm)
-			emit pacm->volumeChanged(type(), cindex(), channel(), m_volume);
-	}
-}
-
-PaControlModel::PaControlModel(QObject *parent)
-	: QAbstractListModel(parent)
-{
-}
-
-void PaControlModel::addControl(const PaControl &control)
-{
-	beginInsertRows(QModelIndex(), rowCount(), rowCount());
-	m_controls << control;
-	endInsertRows();
-}
-
-void PaControlModel::addOneControl(int cindex, QString name, QString desc, int type, int channel, const char *cdesc, int volume)
-{
-	addControl(PaControl(cindex, name, desc, type, channel, cdesc, volume));
-}
-
-void PaControlModel::changeExternalVolume(uint32_t type, uint32_t cindex, uint32_t channel, uint32_t volume)
-{
-	QList<PaControl>::iterator i;
-	int row;
-
-	for (i = m_controls.begin(), row = 0; i < m_controls.end(); ++i, ++row) {
-		if ((i->type() == type) &&
-		    (i->cindex() == cindex) &&
-		    (i->channel() == channel)) {
-			break;
-		}
-	}
-
-	i->setVolume(NULL, QVariant(volume));
-	QModelIndex qmindex = index(row);
-	QVector<int> roles;
-	roles.push_back(VolumeRole);
-	emit dataChanged(qmindex, qmindex, roles);
-}
-
-int PaControlModel::rowCount(const QModelIndex & parent) const {
-	Q_UNUSED(parent);
-	return m_controls.count();
-}
-
-bool PaControlModel::setData(const QModelIndex &index, const QVariant &value, int role) {
-	if (index.row() < 0 || index.row() >= m_controls.count())
-		return false;
-	PaControl &control = m_controls[index.row()];
-	if (role == CIndexRole)
-		control.setCIndex(value);
-	else if (role == NameRole)
-		control.setName(value);
-	else if (role == DescRole)
-		control.setDesc(value);
-	else if (role == TypeRole)
-		control.setType(value);
-	else if (role == ChannelRole)
-		control.setChannel(value);
-	else if (role == CDescRole)
-		control.setCDesc(value);
-	else if (role == VolumeRole)
-		control.setVolume(this, value);
-	QVector<int> roles;
-	roles.push_back(role);
-	emit dataChanged(index, index, roles);
-	return true;
-}
-
-QVariant PaControlModel::data(const QModelIndex & index, int role) const {
-	if (index.row() < 0 || index.row() >= m_controls.count())
-		return QVariant();
-
-	const PaControl &control = m_controls[index.row()];
-	if (role == CIndexRole)
-		return control.cindex();
-	else if (role == NameRole)
-		return control.name();
-	else if (role == DescRole)
-		return control.desc();
-	else if (role == TypeRole)
-		return control.type();
-	else if (role == ChannelRole)
-		return control.channel();
-	else if (role == CDescRole)
-		return control.cdesc();
-	else if (role == VolumeRole)
-		return control.volume();
-	return QVariant();
-}
-
-Qt::ItemFlags PaControlModel::flags(const QModelIndex &index) const
-{
-	if (!index.isValid())
-		return Qt::ItemIsEnabled;
-
-	return QAbstractListModel::flags(index) | Qt::ItemIsEditable;
-}
-
-QHash<int, QByteArray> PaControlModel::roleNames() const {
-	QHash<int, QByteArray> roles;
-	roles[CIndexRole] = "cindex";
-	roles[NameRole] = "name";
-	roles[DescRole] = "desc";
-	roles[TypeRole] = "type";
-	roles[ChannelRole] = "channel";
-	roles[CDescRole] = "cdesc";
-	roles[VolumeRole] = "volume";
-	return roles;
-}