diff options
author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-01-05 12:12:52 +0100 |
---|---|---|
committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-01-05 12:13:16 +0100 |
commit | a3cf9d99b303baaca0d1b0fbaa1b1923c06d18cc (patch) | |
tree | f6343d37558880cd0e93ae9229a5cdf0ac16dc56 /src/bluetooth/bluez | |
parent | 2c1d2691e853812a06d435ffcf61e17f82edb224 (diff) | |
parent | aea5e3971986b4beba395985108fcad2c0c98c37 (diff) |
Merge remote-tracking branch 'gerrit/5.6' into dev
Change-Id: I97b51eb3fe2040711c00da67bbb1954fc2e65c1f
Diffstat (limited to 'src/bluetooth/bluez')
-rw-r--r-- | src/bluetooth/bluez/bluez5_helper.cpp | 22 | ||||
-rw-r--r-- | src/bluetooth/bluez/bluez5_helper_p.h | 2 |
2 files changed, 24 insertions, 0 deletions
diff --git a/src/bluetooth/bluez/bluez5_helper.cpp b/src/bluetooth/bluez/bluez5_helper.cpp index 384b9979..14e064e1 100644 --- a/src/bluetooth/bluez/bluez5_helper.cpp +++ b/src/bluetooth/bluez/bluez5_helper.cpp @@ -339,4 +339,26 @@ QString findAdapterForAddress(const QBluetoothAddress &wantedAddress, bool *ok = return QString(); // nothing matching found } +/* + Removes every character that cannot be used in QDbusObjectPath + + See QDbusUtil::isValidObjectPath(QString) for more details. + */ +QString sanitizeNameForDBus(const QString &text) +{ + QString appName = text; + for (int i = 0; i < appName.length(); i++) { + ushort us = appName[i].unicode(); + bool valid = (us >= 'a' && us <= 'z') + || (us >= 'A' && us <= 'Z') + || (us >= '0' && us <= '9') + || (us == '_'); + + if (!valid) + appName[i] = QLatin1Char('_'); + } + + return appName; +} + QT_END_NAMESPACE diff --git a/src/bluetooth/bluez/bluez5_helper_p.h b/src/bluetooth/bluez/bluez5_helper_p.h index a3f164b0..019fe635 100644 --- a/src/bluetooth/bluez/bluez5_helper_p.h +++ b/src/bluetooth/bluez/bluez5_helper_p.h @@ -59,6 +59,8 @@ QT_BEGIN_NAMESPACE bool isBluez5(); +QString sanitizeNameForDBus(const QString& text); + QString findAdapterForAddress(const QBluetoothAddress &wantedAddress, bool *ok); class QtBluezDiscoveryManagerPrivate; |