Add missing braces around single-line statements

22 files changed, 163 insertions, 82 deletions

diff --git a/src/library/baseplaylistfeature.cpp b/src/library/baseplaylistfeature.cpp
index c6be511351..317a8bacbc 100644
--- a/src/library/baseplaylistfeature.cpp
+++ b/src/library/baseplaylistfeature.cpp
@@ -295,8 +295,9 @@ void BasePlaylistFeature::slotCreatePlaylist() {
                 tr("New Playlist"),
                 &ok)
                        .trimmed();
-        if (!ok)
+        if (!ok) {
             return;
+        }
 
         int existingId = m_playlistDao.getPlaylistIdFromName(name);
 
@@ -350,8 +351,9 @@ void BasePlaylistFeature::slotDeletePlaylist() {
 void BasePlaylistFeature::slotImportPlaylist() {
     //qDebug() << "slotImportPlaylist() row:" << m_lastRightClickedIndex.data();
     QString playlist_file = getPlaylistFile();
-    if (playlist_file.isEmpty())
+    if (playlist_file.isEmpty()) {
         return;
+    }
 
     // Update the import/export playlist directory
     QFileInfo fileName(playlist_file);
diff --git a/src/library/basetrackcache.cpp b/src/library/basetrackcache.cpp
index e9cb79293d..91aef93448 100644
--- a/src/library/basetrackcache.cpp
+++ b/src/library/basetrackcache.cpp
@@ -695,12 +695,13 @@ int BaseTrackCache::compareColumnValues(int sortColumn,
         // Sort as floats.
         double delta = val1.toDouble() - val2.toDouble();
 
-        if (fabs(delta) < .00001)
+        if (fabs(delta) < .00001) {
             result = 0;
-        else if (delta > 0.0)
+        } else if (delta > 0.0) {
             result = 1;
-        else
+        } else {
             result = -1;
+        }
     } else if (sortColumn == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_KEY)) {
         KeyUtils::KeyNotation keyNotation = m_columnCache.keyNotation();
 
diff --git a/src/library/browse/foldertreemodel.cpp b/src/library/browse/foldertreemodel.cpp
index b8081529dc..a763136b48 100644
--- a/src/library/browse/foldertreemodel.cpp
+++ b/src/library/browse/foldertreemodel.cpp
@@ -39,11 +39,13 @@ bool FolderTreeModel::hasChildren(const QModelIndex& parent) const {
      * However, for, buid-in items such as 'Quick Links' there exist
      * child items at init time
      */
-    if(item->getData().toString() == QUICK_LINK_NODE)
+    if (item->getData().toString() == QUICK_LINK_NODE) {
         return true;
+    }
     //Can only happen on Windows
-    if(item->getData().toString() == DEVICE_NODE)
+    if (item->getData().toString() == DEVICE_NODE) {
         return true;
+    }
 
     // In all other cases the getData() points to a folder
     QString folder = item->getData().toString();
diff --git a/src/library/columncache.cpp b/src/library/columncache.cpp
index a8461ac430..501c886d30 100644
--- a/src/library/columncache.cpp
+++ b/src/library/columncache.cpp
@@ -106,7 +106,9 @@ void ColumnCache::setColumns(const QStringList& columns) {
 }
 
 void ColumnCache::slotSetKeySortOrder(double notationValue) {
-    if (m_columnIndexByEnum[COLUMN_LIBRARYTABLE_KEY] < 0) return;
+    if (m_columnIndexByEnum[COLUMN_LIBRARYTABLE_KEY] < 0) {
+        return;
+    }
 
     // A custom COLLATE function was tested, but using CASE ... WHEN was found to be faster
     // see GitHub PR#649
diff --git a/src/library/crate/cratefeature.cpp b/src/library/crate/cratefeature.cpp
index 66724c2447..d977f95f17 100644
--- a/src/library/crate/cratefeature.cpp
+++ b/src/library/crate/cratefeature.cpp
@@ -564,7 +564,9 @@ void CrateFeature::slotImportPlaylist() {
     //qDebug() << "slotImportPlaylist() row:" ; //<< m_lastRightClickedIndex.data();
 
     QString playlist_file = getPlaylistFile();
-    if (playlist_file.isEmpty()) return;
+    if (playlist_file.isEmpty()) {
+        return;
+    }
 
     // Update the import/export crate directory
     QFileInfo fileName(playlist_file);
diff --git a/src/library/dao/autodjcratesdao.cpp b/src/library/dao/autodjcratesdao.cpp
index 149e7a1e89..02bacbca90 100644
--- a/src/library/dao/autodjcratesdao.cpp
+++ b/src/library/dao/autodjcratesdao.cpp
@@ -199,8 +199,9 @@ void AutoDJCratesDAO::createAndConnectAutoDjCratesDatabase() {
                  PLAYLISTTABLE_HIDDEN, // %2
                  QString::number(PlaylistDAO::PLHT_SET_LOG))); // %3
     if (oQuery.exec()) {
-        while (oQuery.next())
+        while (oQuery.next()) {
             m_lstSetLogPlaylistIds.append(oQuery.value(0).toInt());
+        }
     } else {
         LOG_FAILED_QUERY(oQuery);
         return;
diff --git a/src/library/dao/playlistdao.cpp b/src/library/dao/playlistdao.cpp
index 8a0248717f..69f572a2e8 100644
--- a/src/library/dao/playlistdao.cpp
+++ b/src/library/dao/playlistdao.cpp
@@ -519,8 +519,9 @@ void PlaylistDAO::removeTracksFromPlaylistInner(int playlistId, int position) {
 
 
 bool PlaylistDAO::insertTrackIntoPlaylist(TrackId trackId, const int playlistId, int position) {
-    if (playlistId < 0 || !trackId.isValid() || position < 0)
+    if (playlistId < 0 || !trackId.isValid() || position < 0) {
         return false;
+    }
 
     ScopedTransaction transaction(m_database);
 
@@ -852,8 +853,9 @@ void PlaylistDAO::searchForDuplicateTrack(const int fromPosition,
                 pos != excludePosition) {
             int tempTrackDistance =
                     (otherTrackPosition - pos) * (otherTrackPosition - pos);
-            if (tempTrackDistance < *pTrackDistance || *pTrackDistance == -1)
+            if (tempTrackDistance < *pTrackDistance || *pTrackDistance == -1) {
                 *pTrackDistance = tempTrackDistance;
+            }
         }
     }
 }
@@ -1014,8 +1016,9 @@ void PlaylistDAO::shuffleTracks(const int playlistId, const QList<int>& position
                                  QString::number(-1),
                                  QString::number(playlistId)));
 
-        if (query.lastError().isValid())
+        if (query.lastError().isValid()) {
             qDebug() << query.lastError();
+        }
     }
 
     transaction.commit();
diff --git a/src/library/dao/trackdao.cpp b/src/library/dao/trackdao.cpp
index 1f5020bb7c..9b66cb4341 100644
--- a/src/library/dao/trackdao.cpp
+++ b/src/library/dao/trackdao.cpp
@@ -1127,10 +1127,14 @@ bool setTrackCoverInfo(const QSqlRecord& record, const int column,
     bool ok = false;
     coverInfo.source = static_cast<CoverInfo::Source>(
             record.value(column).toInt(&ok));
-    if (!ok) coverInfo.source = CoverInfo::UNKNOWN;
+    if (!ok) {
+        coverInfo.source = CoverInfo::UNKNOWN;
+    }
     coverInfo.type = static_cast<CoverInfo::Type>(
             record.value(column + 1).toInt(&ok));
-    if (!ok) coverInfo.type = CoverInfo::NONE;
+    if (!ok) {
+        coverInfo.type = CoverInfo::NONE;
+    }
     coverInfo.coverLocation = record.value(column + 2).toString();
     coverInfo.hash = record.value(column + 3).toUInt();
     pTrack->setCoverInfo(coverInfo);
diff --git a/src/library/dlgtagfetcher.cpp b/src/library/dlgtagfetcher.cpp
index fef419f9f1..8947763ebb 100644
--- a/src/library/dlgtagfetcher.cpp
+++ b/src/library/dlgtagfetcher.cpp
@@ -331,8 +331,9 @@ void DlgTagFetcher::addDivider(const QString& text, QTreeWidget* parent) const {
 }
 
 void DlgTagFetcher::resultSelected() {
-    if (!results->currentItem())
+    if (!results->currentItem()) {
         return;
+    }
 
     const int resultIndex = results->currentItem()->data(0, Qt::UserRole).toInt();
     m_data.m_selectedResult = resultIndex;
diff --git a/src/library/dlgtrackinfo.cpp b/src/library/dlgtrackinfo.cpp
index 15063c224c..76766dc5bd 100644
--- a/src/library/dlgtrackinfo.cpp
+++ b/src/library/dlgtrackinfo.cpp
@@ -374,8 +374,9 @@ void DlgTrackInfo::slotOpenInFileBrowser() {
 }
 
 void DlgTrackInfo::saveTrack() {
-    if (!m_pLoadedTrack)
+    if (!m_pLoadedTrack) {
         return;
+    }
 
     // First, disconnect the track changed signal. Otherwise we signal ourselves
     // and repopulate all these fields.
@@ -417,8 +418,9 @@ void DlgTrackInfo::saveTrack() {
 }
 
 void DlgTrackInfo::unloadTrack(bool save) {
-    if (!m_pLoadedTrack)
+    if (!m_pLoadedTrack) {
         return;
+    }
 
     if (save) {
         saveTrack();
diff --git a/src/library/itunes/itunesfeature.cpp b/src/library/itunes/itunesfeature.cpp
index d7fc40a5f5..c0ae347120 100644
--- a/src/library/itunes/itunesfeature.cpp
+++ b/src/library/itunes/itunesfeature.cpp
@@ -401,14 +401,17 @@ TreeItem* ITunesFeature::importLibrary() {
             if (xml.name() == "key") {
                 QString key = xml.readElementText();
                 if (key == "Music Folder") {
-                    if (isTracksParsed) isMusicFolderLocatedAfterTracks = true;
+                    if (isTracksParsed) {
+                        isMusicFolderLocatedAfterTracks = true;
+                    }
                     if (readNextStartElement(xml)) {
                         guessMusicLibraryMountpoint(xml);
                     }
                 } else if (key == "Tracks") {
                     parseTracks(xml);
-                    if (playlist_root != NULL)
+                    if (playlist_root != NULL) {
                         delete playlist_root;
+                    }
                     playlist_root = parsePlaylists(xml);
                     isTracksParsed = true;
                 }
@@ -664,8 +667,9 @@ TreeItem* ITunesFeature::parsePlaylists(QXmlStreamReader& xml) {
             continue;
         }
         if (xml.isEndElement()) {
-            if (xml.name() == "array")
+            if (xml.name() == "array") {
                 break;
+            }
         }
     }
     return pRootItem.release();
@@ -729,7 +733,9 @@ void ITunesFeature::parsePlaylist(QXmlStreamReader& xml, QSqlQuery& query_insert
                     isPlaylistItemsStarted = true;
 
                     //if the playlist is prebuild don't hit the database
-                    if (isSystemPlaylist) continue;
+                    if (isSystemPlaylist) {
+                        continue;
+                    }
                     query_insert_to_playlists.bindValue(":id", playlist_id);
                     query_insert_to_playlists.bindValue(":name", playlistname);
 
diff --git a/src/library/libraryfeature.cpp b/src/library/libraryfeature.cpp
index bf3a0e2e62..137667a36f 100644
--- a/src/library/libraryfeature.cpp
+++ b/src/library/libraryfeature.cpp
@@ -40,7 +40,9 @@ QStringList LibraryFeature::getPlaylistFiles(QFileDialog::FileMode mode) const {
     dialog.setModal(true);
 
     // If the user refuses return
-    if (! dialog.exec()) return QStringList();
+    if (!dialog.exec()) {
+        return QStringList();
+    }
     return dialog.selectedFiles();
 }
 
diff --git a/src/library/parsercsv.cpp b/src/library/parsercsv.cpp
index 83a0dd1065..10f39fff30 100644
--- a/src/library/parsercsv.cpp
+++ b/src/library/parsercsv.cpp
@@ -63,11 +63,11 @@ QList<QString> ParserCsv::parse(const QString& sFilename) {
 
         file.close();
 
-        if(m_sLocations.count() != 0)
+        if (m_sLocations.count() != 0) {
             return m_sLocations;
-        else
+        } else {
             return QList<QString>(); // NULL pointer returned when no locations were found
-
+        }
     }
 
     file.close();
diff --git a/src/library/parserpls.cpp b/src/library/parserpls.cpp
index 522d47bffc..d949b846d8 100644
--- a/src/library/parserpls.cpp
+++ b/src/library/parserpls.cpp
@@ -53,8 +53,9 @@ QList<QString> ParserPls::parse(const QString& sFilename) {
         //detect encoding
         bool isCRLF_encoded = ba.contains("\r\n");
         bool isCR_encoded = ba.contains("\r");
-        if(isCR_encoded && !isCRLF_encoded)
+        if (isCR_encoded && !isCRLF_encoded) {
             ba.replace('\r','\n');
+        }
         QTextStream textstream(ba.constData());
 
         while(!textstream.atEnd()) {
@@ -69,10 +70,11 @@ QList<QString> ParserPls::parse(const QString& sFilename) {
 
         file.close();
 
-        if(m_sLocations.count() != 0)
+        if (m_sLocations.count() != 0) {
             return m_sLocations;
-        else
+        } else {
             return QList<QString>(); // NULL pointer returned when no locations were found
+        }
     }
 
     file.close();
diff --git a/src/library/proxytrackmodel.cpp b/src/library/proxytrackmodel.cpp
index 590304e991..edb2dca060 100644
--- a/src/library/proxytrackmodel.cpp
+++ b/src/library/proxytrackmodel.cpp
@@ -118,8 +118,9 @@ TrackModel::CapabilitiesFlags ProxyTrackModel::getCapabilities() const {
 
 bool ProxyTrackModel::filterAcceptsRow(int sourceRow,
                                        const QModelIndex& sourceParent) const {
-    if (!m_bHandleSearches)
+    if (!m_bHandleSearches) {
         return QSortFilterProxyModel::filterAcceptsRow(sourceRow, sourceParent);
+    }
 
     if (m_pTrackModel == NULL) {
         return false;
@@ -139,8 +140,9 @@ bool ProxyTrackModel::filterAcceptsRow(int sourceRow,
         QVariant data = itemModel->data(index);
         if (data.canConvert(QMetaType::QString)) {
             QString strData = data.toString();
-            if (strData.contains(filter))
+            if (strData.contains(filter)) {
                 rowMatches = true;
+            }
         }
     }
     return rowMatches;
diff --git a/src/library/rekordbox/rekordbox_pdb.cpp b/src/library/rekordbox/rekordbox_pdb.cpp
index 6ad2d48c06..006bc2fd59 100644
--- a/src/library/rekordbox/rekordbox_pdb.cpp
+++ b/src/library/rekordbox/rekordbox_pdb.cpp
@@ -82,8 +82,9 @@ rekordbox_pdb_t::playlist_tree_row_t::~playlist_tree_row_t() {
 }
 
 bool rekordbox_pdb_t::playlist_tree_row_t::is_folder() {
-    if (f_is_folder)
+    if (f_is_folder) {
         return m_is_folder;
+    }
     m_is_folder = raw_is_folder() != 0;
     f_is_folder = true;
     return m_is_folder;
@@ -128,8 +129,9 @@ rekordbox_pdb_t::device_sql_short_ascii_t::~device_sql_short_ascii_t() {
 }
 
 int32_t rekordbox_pdb_t::device_sql_short_ascii_t::length() {
-    if (f_length)
+    if (f_length) {
         return m_length;
+    }
     m_length = (((mangled_length() - 1) / 2) - 1);
     f_length = true;
     return m_length;
@@ -160,8 +162,9 @@ rekordbox_pdb_t::album_row_t::~album_row_t() {
 }
 
 rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::album_row_t::name() {
-    if (f_name)
+    if (f_name) {
         return m_name;
+    }
     std::streampos _pos = m__io->pos();
     m__io->seek((_parent()->row_base() + ofs_name()));
     m_name = new device_sql_string_t(m__io, this, m__root);
@@ -218,24 +221,27 @@ rekordbox_pdb_t::page_t::~page_t() {
 }
 
 uint16_t rekordbox_pdb_t::page_t::num_rows() {
-    if (f_num_rows)
+    if (f_num_rows) {
         return m_num_rows;
+    }
     m_num_rows = (( ((num_rows_large() > num_rows_small()) && (num_rows_large() != 8191)) ) ? (num_rows_large()) : (num_rows_small()));
     f_num_rows = true;
     return m_num_rows;
 }
 
 int32_t rekordbox_pdb_t::page_t::num_groups() {
-    if (f_num_groups)
+    if (f_num_groups) {
         return m_num_groups;
+    }
     m_num_groups = (((num_rows() - 1) / 16) + 1);
     f_num_groups = true;
     return m_num_groups;
 }
 
 std::vector<rekordbox_pdb_t::row_group_t*>* rekordbox_pdb_t::page_t::row_groups() {
-    if (f_row_groups)
+    if (f_row_groups) {
         return m_row_groups;
+    }
     n_row_groups = true;
     if (is_data_page()) {
         n_row_groups = false;
@@ -251,16 +257,18 @@ std::vector<rekordbox_pdb_t::row_group_t*>* rekordbox_pdb_t::page_t::row_groups(
 }
 
 int32_t rekordbox_pdb_t::page_t::heap_pos() {
-    if (f_heap_pos)
+    if (f_heap_pos) {
         return m_heap_pos;
+    }
     m_heap_pos = _io()->pos();
     f_heap_pos = true;
     return m_heap_pos;
 }
 
 bool rekordbox_pdb_t::page_t::is_data_page() {
-    if (f_is_data_page)
+    if (f_is_data_page) {
         return m_is_data_page;
+    }
     m_is_data_page = (page_flags() & 64) == 0;
     f_is_data_page = true;
     return m_is_data_page;
@@ -291,16 +299,18 @@ rekordbox_pdb_t::row_group_t::~row_group_t() {
 }
 
 int32_t rekordbox_pdb_t::row_group_t::base() {
-    if (f_base)
+    if (f_base) {
         return m_base;
+    }
     m_base = (_root()->len_page() - (group_index() * 36));
     f_base = true;
     return m_base;
 }
 
 uint16_t rekordbox_pdb_t::row_group_t::row_present_flags() {
-    if (f_row_present_flags)
+    if (f_row_present_flags) {
         return m_row_present_flags;
+    }
     std::streampos _pos = m__io->pos();
     m__io->seek((base() - 4));
     m_row_present_flags = m__io->read_u2le();
@@ -310,8 +320,9 @@ uint16_t rekordbox_pdb_t::row_group_t::row_present_flags() {
 }
 
 std::vector<rekordbox_pdb_t::row_ref_t*>* rekordbox_pdb_t::row_group_t::rows() {
-    if (f_rows)
+    if (f_rows) {
         return m_rows;
+    }
     int l_rows = ((group_index() < (_parent()->num_groups() - 1)) ? (16) : ((kaitai::kstream::mod((_parent()->num_rows() - 1), 16) + 1)));
     m_rows = new std::vector<row_ref_t*>();
     m_rows->reserve(l_rows);
@@ -391,8 +402,9 @@ rekordbox_pdb_t::artist_row_t::~artist_row_t() {
 }
 
 uint16_t rekordbox_pdb_t::artist_row_t::ofs_name_far() {
-    if (f_ofs_name_far)
+    if (f_ofs_name_far) {
         return m_ofs_name_far;
+    }
     n_ofs_name_far = true;
     if (subtype() == 100) {
         n_ofs_name_far = false;
@@ -406,8 +418,9 @@ uint16_t rekordbox_pdb_t::artist_row_t::ofs_name_far() {
 }
 
 rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::artist_row_t::name() {
-    if (f_name)
+    if (f_name) {
         return m_name;
+    }
     std::streampos _pos = m__io->pos();
     m__io->seek((_parent()->row_base() + ((subtype() == 100) ? (ofs_name_far()) : (ofs_name_near()))));
     m_name = new device_sql_string_t(m__io, this, m__root);
@@ -435,8 +448,9 @@ rekordbox_pdb_t::page_ref_t::~page_ref_t() {
 }
 
 rekordbox_pdb_t::page_t* rekordbox_pdb_t::page_ref_t::body() {
-    if (f_body)
+    if (f_body) {
         return m_body;
+    }
     kaitai::kstream *io = _root()->_io();
     std::streampos _pos = io->pos();
     io->seek((_root()->len_page() * index()));
@@ -597,8 +611,9 @@ rekordbox_pdb_t::track_row_t::~track_row_t() {
 }
 
 rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::unknown_string_8() {
-    if (f_unknown_string_8)
+    if (f_unknown_string_8) {
         return m_unknown_string_8;
+    }
     std::streampos _pos = m__io->pos();
     m__io->seek((_parent()->row_base() + ofs_strings()->at(18)));
     m_unknown_string_8 = new device_sql_string_t(m__io, this, m__root);
@@ -608,8 +623,9 @@ rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::unknown_stri
 }
 
 rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::unknown_string_6() {
-    if (f_unknown_string_6)
+    if (f_unknown_string_6) {
         return m_unknown_string_6;
+    }
     std::streampos _pos = m__io->pos();
     m__io->seek((_parent()->row_base() + ofs_strings()->at(9)));
     m_unknown_string_6 = new device_sql_string_t(m__io, this, m__root);
@@ -619,8 +635,9 @@ rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::unknown_stri
 }
 
 rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::analyze_date() {
-    if (f_analyze_date)
+    if (f_analyze_date) {
         return m_analyze_date;
+    }
     std::streampos _pos = m__io->pos();
     m__io->seek((_parent()->row_base() + ofs_strings()->at(15)));
     m_analyze_date = new device_sql_string_t(m__io, this, m__root);
@@ -630,8 +647,9 @@ rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::analyze_date
 }
 
 rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::file_path() {
-    if (f_file_path)
+    if (f_file_path) {
         return m_file_path;
+    }
     std::streampos _pos = m__io->pos();
     m__io->seek((_parent()->row_base() + ofs_strings()->at(20)));
     m_file_path = new device_sql_string_t(m__io, this, m__root);
@@ -641,8 +659,9 @@ rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::file_path()
 }
 
 rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::autoload_hotcues() {
-    if (f_autoload_hotcues)
+    if (f_autoload_hotcues) {
         return m_autoload_hotcues;
+    }
     std::streampos _pos = m__io->pos();
     m__io->seek((_parent()->row_base() + ofs_strings()->at(7)));
     m_autoload_hotcues = new device_sql_string_t(m__io, this, m__root);
@@ -652,8 +671,9 @@ rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::autoload_hot
 }
 
 rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::date_added() {
-    if (f_date_added)
+    if (f_date_added) {
         return m_date_added;
+    }
     std::streampos _pos = m__io->pos();
     m__io->seek((_parent()->row_base() + ofs_strings()->at(10)));
     m_date_added = new device_sql_string_t(m__io, this, m__root);
@@ -663,8 +683,9 @@ rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::date_added()
 }
 
 rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::unknown_string_3() {
-    if (f_unknown_string_3)
+    if (f_unknown_string_3) {
         return m_unknown_string_3;
+    }
     std::streampos _pos = m__io->pos();
     m__io->seek((_parent()->row_base() + ofs_strings()->at(3)));
     m_unknown_string_3 = new device_sql_string_t(m__io, this, m__root);
@@ -674,8 +695,9 @@ rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::unknown_stri
 }
 
 rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::texter() {
-    if (f_texter)
+    if (f_texter) {
         return m_texter;
+    }
     std::streampos _pos = m__io->pos();
     m__io->seek((_parent()->row_base() + ofs_strings()->at(1)));
     m_texter = new device_sql_string_t(m__io, this, m__root);
@@ -685,8 +707,9 @@ rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::texter() {
 }
 
 rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::kuvo_public() {
-    if (f_kuvo_public)
+    if (f_kuvo_public) {
         return m_kuvo_public;
+    }
     std::streampos _pos = m__io->pos();
     m__io->seek((_parent()->row_base() + ofs_strings()->at(6)));
     m_kuvo_public = new device_sql_string_t(m__io, this, m__root);
@@ -696,8 +719,9 @@ rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::kuvo_public(
 }
 
 rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::mix_name() {
-    if (f_mix_name)
+    if (f_mix_name) {
         return m_mix_name;
+    }
     std::streampos _pos = m__io->pos();
     m__io->seek((_parent()->row_base() + ofs_strings()->at(12)));
     m_mix_name = new device_sql_string_t(m__io, this, m__root);
@@ -707,8 +731,9 @@ rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::mix_name() {
 }
 
 rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::unknown_string_5() {
-    if (f_unknown_string_5)
+    if (f_unknown_string_5) {
         return m_unknown_string_5;
+    }
     std::streampos _pos = m__io->pos();
     m__io->seek((_parent()->row_base() + ofs_strings()->at(8)));
     m_unknown_string_5 = new device_sql_string_t(m__io, this, m__root);
@@ -718,8 +743,9 @@ rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::unknown_stri
 }
 
 rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::unknown_string_4() {
-    if (f_unknown_string_4)
+    if (f_unknown_string_4) {
         return m_unknown_string_4;
+    }
     std::streampos _pos = m__io->pos();
     m__io->seek((_parent()->row_base() + ofs_strings()->at(4)));
     m_unknown_string_4 = new device_sql_string_t(m__io, this, m__root);
@@ -729,8 +755,9 @@ rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::unknown_stri
 }
 
 rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::message() {
-    if (f_message)
+    if (f_message) {
         return m_message;
+    }
     std::streampos _pos = m__io->pos();
     m__io->seek((_parent()->row_base() + ofs_strings()->at(5)));
     m_message = new device_sql_string_t(m__io, this, m__root);
@@ -740,8 +767,9 @@ rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::message() {
 }
 
 rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::unknown_string_2() {
-    if (f_unknown_string_2)
+    if (f_unknown_string_2) {
         return m_unknown_string_2;
+    }
     std::streampos _pos = m__io->pos();
     m__io->seek((_parent()->row_base() + ofs_strings()->at(2)));
     m_unknown_string_2 = new device_sql_string_t(m__io, this, m__root);
@@ -751,8 +779,9 @@ rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::unknown_stri
 }
 
 rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::unknown_string_1() {
-    if (f_unknown_string_1)
+    if (f_unknown_string_1) {
         return m_unknown_string_1;
+    }
     std::streampos _pos = m__io->pos();
     m__io->seek((_parent()->row_base() + ofs_strings()->at(0)));
     m_unknown_string_1 = new device_sql_string_t(m__io, this, m__root);
@@ -762,8 +791,9 @@ rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::unknown_stri
 }
 
 rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::unknown_string_7() {
-    if (f_unknown_string_7)
+    if (f_unknown_string_7) {
         return m_unknown_string_7;
+    }
     std::streampos _pos = m__io->pos();
     m__io->seek((_parent()->row_base() + ofs_strings()->at(13)));
     m_unknown_string_7 = new device_sql_string_t(m__io, this, m__root);
@@ -773,8 +803,9 @@ rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::unknown_stri
 }
 
 rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::filename() {
-    if (f_filename)
+    if (f_filename) {
         return m_filename;
+    }
     std::streampos _pos = m__io->pos();
     m__io->seek((_parent()->row_base() + ofs_strings()->at(19)));
     m_filename = new device_sql_string_t(m__io, this, m__root);
@@ -784,8 +815,9 @@ rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::filename() {
 }
 
 rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::analyze_path() {
-    if (f_analyze_path)
+    if (f_analyze_path) {
         return m_analyze_path;
+    }
     std::streampos _pos = m__io->pos();
     m__io->seek((_parent()->row_base() + ofs_strings()->at(14)));
     m_analyze_path = new device_sql_string_t(m__io, this, m__root);
@@ -795,8 +827,9 @@ rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::analyze_path
 }
 
 rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::comment() {
-    if (f_comment)
+    if (f_comment) {
         return m_comment;
+    }
     std::streampos _pos = m__io->pos();
     m__io->seek((_parent()->row_base() + ofs_strings()->at(16)));
     m_comment = new device_sql_string_t(m__io, this, m__root);
@@ -806,8 +839,9 @@ rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::comment() {
 }
 
 rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::release_date() {
-    if (f_release_date)
+    if (f_release_date) {
         return m_release_date;
+    }
     std::streampos _pos = m__io->pos();
     m__io->seek((_parent()->row_base() + ofs_strings()->at(11)));
     m_release_date = new device_sql_string_t(m__io, this, m__root);
@@ -817,8 +851,9 @@ rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::release_date
 }
 
 rekordbox_pdb_t::device_sql_string_t* rekordbox_pdb_t::track_row_t::title() {
-    if (f_title)
+    if (f_title) {
         return m_title;
+    }
     std::streampos _pos = m__io->pos();
     m__io->seek((_parent()->row_base() + ofs_strings()->at(17)));
     m_title = new device_sql_string_t(m__io, this, m__root);
@@ -914,8 +949,9 @@ rekordbox_pdb_t::row_ref_t::~row_ref_t() {
 }
 
 uint16_t rekordbox_pdb_t::row_ref_t::ofs_row() {
-    if (f_ofs_row)
+    if (f_ofs_row) {
         return m_ofs_row;
+    }
     std::streampos _pos = m__io->pos();
     m__io->seek((_parent()->base() - (6 + (2 * row_index()))));
     m_ofs_row = m__io->read_u2le();
@@ -925,24 +961,27 @@ uint16_t rekordbox_pdb_t::row_ref_t::ofs_row() {
 }
 
 int32_t rekordbox_pdb_t::row_ref_t::row_base() {