summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/controllers/controllerinputmappingtablemodel.cpp2
-rw-r--r--src/controllers/controlleroutputmappingtablemodel.cpp2
-rw-r--r--src/library/browse/browsefeature.cpp6
-rw-r--r--src/library/crate/cratestorage.cpp2
-rw-r--r--src/library/rekordbox/rekordboxfeature.cpp8
-rw-r--r--src/recording/recordingmanager.cpp10
-rw-r--r--src/soundio/soundmanagerutil.cpp4
-rw-r--r--src/test/trackdao_test.cpp6
8 files changed, 20 insertions, 20 deletions
diff --git a/src/controllers/controllerinputmappingtablemodel.cpp b/src/controllers/controllerinputmappingtablemodel.cpp
index cf2bbf6bca..2f47169807 100644
--- a/src/controllers/controllerinputmappingtablemodel.cpp
+++ b/src/controllers/controllerinputmappingtablemodel.cpp
@@ -200,7 +200,7 @@ QVariant ControllerInputMappingTableModel::data(const QModelIndex& index,
case MIDI_COLUMN_ACTION:
if (role == Qt::UserRole) {
// TODO(rryan): somehow get the delegate display text?
- return QVariant(mapping.control.group % QStringLiteral(",") % mapping.control.item);
+ return QVariant(mapping.control.group + QStringLiteral(",") + mapping.control.item);
}
return qVariantFromValue(mapping.control);
case MIDI_COLUMN_COMMENT:
diff --git a/src/controllers/controlleroutputmappingtablemodel.cpp b/src/controllers/controlleroutputmappingtablemodel.cpp
index 1c11e9c927..824d7bca77 100644
--- a/src/controllers/controlleroutputmappingtablemodel.cpp
+++ b/src/controllers/controlleroutputmappingtablemodel.cpp
@@ -170,7 +170,7 @@ QVariant ControllerOutputMappingTableModel::data(const QModelIndex& index,
case MIDI_COLUMN_ACTION:
if (role == Qt::UserRole) {
// TODO(rryan): somehow get the delegate display text?
- return QVariant(mapping.controlKey.group % QStringLiteral(",") % mapping.controlKey.item);
+ return QVariant(mapping.controlKey.group + QStringLiteral(",") + mapping.controlKey.item);
}
return qVariantFromValue(mapping.controlKey);
case MIDI_COLUMN_COMMENT:
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);
diff --git a/src/recording/recordingmanager.cpp b/src/recording/recordingmanager.cpp
index b58729f2c2..1a59177fa1 100644
--- a/src/recording/recordingmanager.cpp
+++ b/src/recording/recordingmanager.cpp
@@ -131,9 +131,9 @@ void RecordingManager::startRecording() {
m_recording_base_file = getRecordingDir();
m_recording_base_file.append("/").append(date_time_str);
// Appending file extension to get the filelocation.
- m_recordingLocation = m_recording_base_file % QStringLiteral(".") % encodingType.toLower();
+ m_recordingLocation = m_recording_base_file + QStringLiteral(".") + encodingType.toLower();
m_pConfig->set(ConfigKey(RECORDING_PREF_KEY, "Path"), m_recordingLocation);
- m_pConfig->set(ConfigKey(RECORDING_PREF_KEY, "CuePath"), ConfigValue(m_recording_base_file % QStringLiteral(".cue")));
+ m_pConfig->set(ConfigKey(RECORDING_PREF_KEY, "CuePath"), ConfigValue(m_recording_base_file + QStringLiteral(".cue")));
m_recReady->set(RECORD_READY);
}
@@ -148,11 +148,11 @@ void RecordingManager::splitContinueRecording()
QString encodingType = m_pConfig->getValueString(ConfigKey(RECORDING_PREF_KEY, "Encoding"));
- QString new_base_filename = m_recording_base_file % QStringLiteral("part") % QString::number(m_iNumberSplits);
- m_recordingLocation = new_base_filename % QStringLiteral(".") % encodingType.toLower();
+ QString new_base_filename = m_recording_base_file + QStringLiteral("part") + QString::number(m_iNumberSplits);
+ m_recordingLocation = new_base_filename + QStringLiteral(".") + encodingType.toLower();
m_pConfig->set(ConfigKey(RECORDING_PREF_KEY, "Path"), m_recordingLocation);
- m_pConfig->set(ConfigKey(RECORDING_PREF_KEY, "CuePath"), ConfigValue(new_base_filename % QStringLiteral(".cue")));
+ m_pConfig->set(ConfigKey(RECORDING_PREF_KEY, "CuePath"), ConfigValue(new_base_filename + QStringLiteral(".cue")));
m_recordingFile = QFileInfo(m_recordingLocation).fileName();
m_recReady->set(RECORD_SPLIT_CONTINUE);
diff --git a/src/soundio/soundmanagerutil.cpp b/src/soundio/soundmanagerutil.cpp
index c3926af123..91041ad1b2 100644
--- a/src/soundio/soundmanagerutil.cpp
+++ b/src/soundio/soundmanagerutil.cpp
@@ -464,9 +464,9 @@ void AudioInput::setType(AudioPathType type) {
QString SoundDeviceId::debugName() const {
if (alsaHwDevice.isEmpty()) {
- return name % QStringLiteral(", ") % QString::number(portAudioIndex);
+ return name + QStringLiteral(", ") + QString::number(portAudioIndex);
} else {
- return name % QStringLiteral(", ") % alsaHwDevice % QStringLiteral(", ") % QString::number(portAudioIndex);
+ return name + QStringLiteral(", ") + alsaHwDevice + QStringLiteral(", ") + QString::number(portAudioIndex);
}
}
diff --git a/src/test/trackdao_test.cpp b/src/test/trackdao_test.cpp
index dfe4ea6848..deacd8e3d8 100644
--- a/src/test/trackdao_test.cpp
+++ b/src/test/trackdao_test.cpp
@@ -14,9 +14,9 @@ TEST_F(TrackDAOTest, detectMovedTracks) {
QString filename = QStringLiteral("file.mp3");
- TrackFile oldFile(QDir(QDir::tempPath() % QStringLiteral("/old/dir1")), filename);
- TrackFile newFile(QDir(QDir::tempPath() % QStringLiteral("/new/dir1")), filename);
- TrackFile otherFile(QDir(QDir::tempPath() % QStringLiteral("/new")), filename);
+ TrackFile oldFile(QDir(QDir::tempPath() + QStringLiteral("/old/dir1")), filename);
+ TrackFile newFile(QDir(QDir::tempPath() + QStringLiteral("/new/dir1")), filename);
+ TrackFile otherFile(QDir(QDir::tempPath() + QStringLiteral("/new")), filename);
TrackPointer pOldTrack = Track::newTemporary(oldFile);
TrackPointer pNewTrack = Track::newTemporary(newFile);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-27 09:55:14 +0000