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

Replace QRegExp with QRegularExpression

Browse Source
This commit is contained in:
Jonas Kvinge
2020-07-18 04:05:07 +02:00
parent cf5259e218
commit e5b3df41e9
25 changed files with 102 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/device/giolister.cpp
View File

@@ -32,6 +32,7 @@
#include <QVariant>
#include <QString>
#include <QStringList>
#include <QRegularExpression>
#include <QRegExp>
#include <QUrl>
#include <QUrlQuery>
@@ -218,11 +219,11 @@ QList<QUrl> GioLister::MakeDeviceUrls(const QString &id) {
for (QString uri : uris) {
// gphoto2 gives invalid hostnames with []:, characters in
uri.replace(QRegExp("//\\[usb:(\\d+),(\\d+)\\]"), "//usb-\\1-\\2");
uri.replace(QRegularExpression("//\\[usb:(\\d+),(\\d+)\\]"), "//usb-\\1-\\2");
QUrl url;
if (uri.contains(QRegExp("..+:.*"))) {
if (uri.contains(QRegularExpression("..+:.*"))) {
url = QUrl::fromEncoded(uri.toUtf8());
}
else {