|
 |
25e0e3 |
From 338bad3d36260be9250277bfdfcb133ab19b376d Mon Sep 17 00:00:00 2001
|
|
|
25e0e3 |
From: David Rosca <nowrep@gmail.com>
|
|
|
25e0e3 |
Date: Sat, 27 Dec 2014 13:16:35 +0100
|
|
|
25e0e3 |
Subject: [PATCH] Adapter: Add back alias() and setAlias() for binary
|
|
|
25e0e3 |
compatibility
|
|
|
25e0e3 |
|
|
|
25e0e3 |
Fixes binary compatibility break from ec29ea82fd8e06ddebffd9c1dbdb53ec6872c3f2
|
|
|
25e0e3 |
---
|
|
|
25e0e3 |
bluedevil/bluedeviladapter.cpp | 10 ++++++++++
|
|
|
25e0e3 |
bluedevil/bluedeviladapter.h | 13 ++++++++++++-
|
|
|
25e0e3 |
2 files changed, 22 insertions(+), 1 deletion(-)
|
|
|
25e0e3 |
|
|
|
25e0e3 |
diff --git a/bluedevil/bluedeviladapter.cpp b/bluedevil/bluedeviladapter.cpp
|
|
|
25e0e3 |
index e8d0abf..960b1d7 100644
|
|
|
25e0e3 |
--- a/bluedevil/bluedeviladapter.cpp
|
|
|
25e0e3 |
+++ b/bluedevil/bluedeviladapter.cpp
|
|
|
25e0e3 |
@@ -144,6 +144,11 @@ QString Adapter::name() const
|
|
|
25e0e3 |
return d->m_bluezAdapterInterface->alias();
|
|
|
25e0e3 |
}
|
|
|
25e0e3 |
|
|
|
25e0e3 |
+QString Adapter::alias() const
|
|
|
25e0e3 |
+{
|
|
|
25e0e3 |
+ return name();
|
|
|
25e0e3 |
+}
|
|
|
25e0e3 |
+
|
|
|
25e0e3 |
QString Adapter::systemName() const
|
|
|
25e0e3 |
{
|
|
|
25e0e3 |
return d->m_bluezAdapterInterface->name();
|
|
|
25e0e3 |
@@ -219,6 +224,11 @@ void Adapter::setName(const QString& name)
|
|
|
25e0e3 |
d->m_bluezAdapterInterface->setAlias(name);
|
|
|
25e0e3 |
}
|
|
|
25e0e3 |
|
|
|
25e0e3 |
+void Adapter::setAlias(const QString &alias)
|
|
|
25e0e3 |
+{
|
|
|
25e0e3 |
+ setName(alias);
|
|
|
25e0e3 |
+}
|
|
|
25e0e3 |
+
|
|
|
25e0e3 |
void Adapter::setPowered(bool powered)
|
|
|
25e0e3 |
{
|
|
|
25e0e3 |
d->m_bluezAdapterInterface->setPowered(powered);
|
|
|
25e0e3 |
diff --git a/bluedevil/bluedeviladapter.h b/bluedevil/bluedeviladapter.h
|
|
|
25e0e3 |
index 11cd211..b89ed50 100644
|
|
|
25e0e3 |
--- a/bluedevil/bluedeviladapter.h
|
|
|
25e0e3 |
+++ b/bluedevil/bluedeviladapter.h
|
|
|
25e0e3 |
@@ -50,6 +50,7 @@ class BLUEDEVIL_EXPORT Adapter
|
|
|
25e0e3 |
|
|
|
25e0e3 |
Q_PROPERTY(QString address READ address)
|
|
|
25e0e3 |
Q_PROPERTY(QString name READ name WRITE setName)
|
|
|
25e0e3 |
+ Q_PROPERTY(QString alias READ alias WRITE setAlias)
|
|
|
25e0e3 |
Q_PROPERTY(QString systemName READ systemName)
|
|
|
25e0e3 |
Q_PROPERTY(quint32 adapterClass READ adapterClass)
|
|
|
25e0e3 |
Q_PROPERTY(bool powered READ isPowered WRITE setPowered)
|
|
|
25e0e3 |
@@ -85,6 +86,11 @@ public:
|
|
|
25e0e3 |
QString name() const;
|
|
|
25e0e3 |
|
|
|
25e0e3 |
/**
|
|
|
25e0e3 |
+ * Only for binary compatibility. Same as name().
|
|
|
25e0e3 |
+ */
|
|
|
25e0e3 |
+ QString alias() const;
|
|
|
25e0e3 |
+
|
|
|
25e0e3 |
+ /**
|
|
|
25e0e3 |
* @return The system name (hostname) of the adapter.
|
|
|
25e0e3 |
*/
|
|
|
25e0e3 |
QString systemName() const;
|
|
|
25e0e3 |
@@ -152,11 +158,16 @@ public:
|
|
|
25e0e3 |
|
|
|
25e0e3 |
public Q_SLOTS:
|
|
|
25e0e3 |
/**
|
|
|
25e0e3 |
- * Set the name (alias) of the adapter
|
|
|
25e0e3 |
+ * Set the name (alias) of the adapter
|
|
|
25e0e3 |
*/
|
|
|
25e0e3 |
void setName(const QString &name);
|
|
|
25e0e3 |
|
|
|
25e0e3 |
/**
|
|
|
25e0e3 |
+ * Only for binary compatibility. Same as setAlias().
|
|
|
25e0e3 |
+ */
|
|
|
25e0e3 |
+ void setAlias(const QString &alias);
|
|
|
25e0e3 |
+
|
|
|
25e0e3 |
+ /**
|
|
|
25e0e3 |
* Sets whether this adapter is consuming energy or not.
|
|
|
25e0e3 |
*/
|
|
|
25e0e3 |
void setPowered(bool powered);
|
|
|
25e0e3 |
--
|
|
|
25e0e3 |
2.1.0
|
|
|
25e0e3 |
|