summaryrefslogtreecommitdiffstats
path: root/src/library
diff options
context:
space:
mode:
authorUwe Klotz <uklotz@mixxx.org>2019-12-21 18:07:52 +0100
committerUwe Klotz <uklotz@mixxx.org>2019-12-21 18:11:54 +0100
commit23881fccb1518d96b53a58a9f3464e4a7a06aff8 (patch)
tree5854c79a32deb90fdfa5f1a6abeec39a712eaaa5 /src/library
parente46136e2f890a0064e5f22d82954ed402cdcfadd (diff)
Revert replacement of + with % for string concatenation
Diffstat (limited to 'src/library')
-rw-r--r--src/library/browse/browsefeature.cpp6
-rw-r--r--src/library/crate/cratestorage.cpp2
-rw-r--r--src/library/rekordbox/rekordboxfeature.cpp8
3 files changed, 8 insertions, 8 deletions
diff --git a/src/library/browse/browsefeature.cpp b/src/library/browse/browsefeature.cpp
index 9e0e4c0648..1cb3d05441 100644
--- a/src/library/browse/browsefeature.cpp
+++ b/src/library/browse/browsefeature.cpp
@@ -347,7 +347,7 @@ QList<TreeItem*> getRemovableDevices(LibraryFeature* pFeature) {
QDir::AllDirs | QDir::NoDotAndDotDot);
// Add folders under /run/media/$USER to devices.
- QDir run_media_user_dir(QStringLiteral("/run/media/") % QString::fromLocal8Bit(qgetenv("USER")));
+ QDir run_media_user_dir(QStringLiteral("/run/media/") + QString::fromLocal8Bit(qgetenv("USER")));
devices += run_media_user_dir.entryInfoList(
QDir::AllDirs | QDir::NoDotAndDotDot);
@@ -356,7 +356,7 @@ QList<TreeItem*> getRemovableDevices(LibraryFeature* pFeature) {
TreeItem* folder = new TreeItem(
pFeature,
device.fileName(),
- QVariant(device.filePath() % QStringLiteral("/")));
+ QVariant(device.filePath() + QStringLiteral("/")));
ret << folder;
}
@@ -425,7 +425,7 @@ void BrowseFeature::onLazyChildExpandation(const QModelIndex& index) {
TreeItem* folder = new TreeItem(
this,
one.fileName(),
- QVariant(one.absoluteFilePath() % QStringLiteral("/")));
+ QVariant(one.absoluteFilePath() + QStringLiteral("/")));
folders << folder;
}
}
diff --git a/src/library/crate/cratestorage.cpp b/src/library/crate/cratestorage.cpp
index 20640bf636..3cb1648953 100644
--- a/src/library/crate/cratestorage.cpp
+++ b/src/library/crate/cratestorage.cpp
@@ -538,7 +538,7 @@ CrateTrackSelectResult CrateStorage::selectTracksSortedByCrateNameLike(const QSt
CRATETABLE_ID,
CRATETRACKSTABLE_CRATEID,
CRATETABLE_NAME));
- query.bindValue(":crateNameLike", QVariant(kSqlLikeMatchAll % crateNameLike % kSqlLikeMatchAll));
+ query.bindValue(":crateNameLike", QVariant(kSqlLikeMatchAll + crateNameLike + kSqlLikeMatchAll));
if (query.execPrepared()) {
return CrateTrackSelectResult(std::move(query));
diff --git a/src/library/rekordbox/rekordboxfeature.cpp b/src/library/rekordbox/rekordboxfeature.cpp
index d139316a46..1b92645415 100644
--- a/src/library/rekordbox/rekordboxfeature.cpp
+++ b/src/library/rekordbox/rekordboxfeature.cpp
@@ -112,17 +112,17 @@ QList<TreeItem*> findRekordboxDevices(RekordboxFeature* rekordboxFeature) {
QDir::AllDirs | QDir::NoDotAndDotDot);
// Add folders under /media/$USER to devices.
- QDir mediaUserDir(QStringLiteral("/media/") % QString::fromLocal8Bit(qgetenv("USER")));
+ QDir mediaUserDir(QStringLiteral("/media/") + QString::fromLocal8Bit(qgetenv("USER")));
devices += mediaUserDir.entryInfoList(
QDir::AllDirs | QDir::NoDotAndDotDot);
// Add folders under /run/media/$USER to devices.
- QDir runMediaUserDir(QStringLiteral("/run/media/") % QString::fromLocal8Bit(qgetenv("USER")));
+ QDir runMediaUserDir(QStringLiteral("/run/media/") + QString::fromLocal8Bit(qgetenv("USER")));
devices += runMediaUserDir.entryInfoList(
QDir::AllDirs | QDir::NoDotAndDotDot);
foreach (QFileInfo device, devices) {
- QFileInfo rbDBFileInfo(device.filePath() % QStringLiteral("/") % kPdbPath);
+ QFileInfo rbDBFileInfo(device.filePath() + QStringLiteral("/") + kPdbPath);
if (rbDBFileInfo.exists() && rbDBFileInfo.isFile()) {
TreeItem* foundDevice = new TreeItem(rekordboxFeature);
@@ -141,7 +141,7 @@ QList<TreeItem*> findRekordboxDevices(RekordboxFeature* rekordboxFeature) {
QFileInfoList devices = QDir(QStringLiteral("/Volumes")).entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot);
foreach (QFileInfo device, devices) {
- QFileInfo rbDBFileInfo(device.filePath() % QStringLiteral("/") % kPdbPath);
+ QFileInfo rbDBFileInfo(device.filePath() + QStringLiteral("/") + kPdbPath);
if (rbDBFileInfo.exists() && rbDBFileInfo.isFile()) {
TreeItem* foundDevice = new TreeItem(rekordboxFeature);