dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace use of QRegExp

Browse Source
This commit is contained in:
Jonas Kvinge
2020-07-20 00:57:42 +02:00
parent eb270df835
commit 0b7b7656b2
15 changed files with 105 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/device/cddalister.cpp
View File

@@ -27,7 +27,7 @@
#include <QString>
#include <QStringBuilder>
#include <QStringList>
#include <QRegExp>
#include <QRegularExpression>
#include <QUrl>
// This must come after Qt includes
@@ -123,7 +123,7 @@ bool CddaLister::Init() {
}
#ifdef Q_OS_MACOS
// Every track is detected as a separate device on Darwin. The raw disk looks like /dev/rdisk1
if (!device.contains(QRegExp("^/dev/rdisk[0-9]$"))) {
if (!device.contains(QRegularExpression("^/dev/rdisk[0-9]$"))) {
continue;
}
#endif

11
src/device/giolister.cpp
View File

@@ -33,7 +33,7 @@
#include <QString>
#include <QStringList>
#include <QRegularExpression>
#include <QRegExp>
#include <QRegularExpressionMatch>
#include <QUrl>
#include <QUrlQuery>
@@ -237,11 +237,12 @@ QList<QUrl> GioLister::MakeDeviceUrls(const QString &id) {
url.setScheme("ipod");
}
QRegExp device_re("usb/(\\d+)/(\\d+)");
if (device_re.indexIn(unix_device) >= 0) {
QRegularExpression device_re("usb/(\\d+)/(\\d+)");
QRegularExpressionMatch re_match = device_re.match(unix_device);
if (re_match.hasMatch()) {
QUrlQuery url_query(url);
url_query.addQueryItem("busnum", device_re.cap(1));
url_query.addQueryItem("devnum", device_re.cap(2));
url_query.addQueryItem("busnum", re_match.captured(1));
url_query.addQueryItem("devnum", re_match.captured(2));
url.setQuery(url_query);
}

12
src/device/mtpconnection.cpp
View File

@@ -27,9 +27,10 @@
#include <QList>
#include <QByteArray>
#include <QString>
#include <QRegExp>
#include <QUrl>
#include <QUrlQuery>
#include <QRegularExpression>
#include <QRegularExpressionMatch>
#include <QtDebug>
#include "core/logging.h"
@@ -39,16 +40,17 @@ MtpConnection::MtpConnection(const QUrl &url) : device_(nullptr) {
QString hostname = url.host();
// Parse the URL
QRegExp host_re("^usb-(\\d+)-(\\d+)$");
QRegularExpression host_re("^usb-(\\d+)-(\\d+)$");
unsigned int bus_location = 0;
unsigned int device_num = 0;
QUrlQuery url_query(url);
if (host_re.indexIn(hostname) >= 0) {
bus_location = host_re.cap(1).toUInt();
device_num = host_re.cap(2).toUInt();
QRegularExpressionMatch re_match = host_re.match(hostname);
if (re_match.hasMatch()) {
bus_location = re_match.captured(1).toUInt();
device_num = re_match.captured(2).toUInt();
}
else if (url_query.hasQueryItem("busnum")) {
bus_location = url_query.queryItemValue("busnum").toUInt();