Fix code style and errors

src/playlist/playlist.cpp

@@ -861,7 +861,7 @@ void Playlist::InsertItems(const PlaylistItemList &itemsIn, int pos, bool play_n
   // exercise vetoes
   SongList songs;
 
-  for (PlaylistItemPtr item : items) {
+  for (const PlaylistItemPtr &item : items) {
     songs << item->Metadata();
   }
 
@@ -1432,13 +1432,11 @@ PlaylistItemList Playlist::RemoveItemsWithoutUndo(int row, int count) {
   endRemoveRows();
 
   QList<int>::iterator it = virtual_items_.begin();
-  int i = 0;
   while (it != virtual_items_.end()) {
     if (*it >= items_.count())
       it = virtual_items_.erase(it);
     else
       ++it;
-    ++i;
   }
 
   // Reset current_virtual_index_
@@ -1738,7 +1736,7 @@ QSortFilterProxyModel *Playlist::proxy() const { return proxy_; }
 
 SongList Playlist::GetAllSongs() const {
   SongList ret;
-  for (PlaylistItemPtr item : items_) {
+  for (const PlaylistItemPtr &item : items_) {
     ret << item->Metadata();
   }
   return ret;
@@ -1748,7 +1746,7 @@ PlaylistItemList Playlist::GetAllItems() const { return items_; }
 
 quint64 Playlist::GetTotalLength() const {
   quint64 ret = 0;
-  for (PlaylistItemPtr item : items_) {
+  for (const PlaylistItemPtr &item : items_) {
     quint64 length = item->Metadata().length_nanosec();
     if (length > 0) ret += length;
   }

src/playlist/playlistbackend.cpp

@@ -291,7 +291,7 @@ void PlaylistBackend::SavePlaylist(int playlist, const PlaylistItemList &items,
   if (db_->CheckErrors(clear)) return;
 
   // Save the new ones
-  for (PlaylistItemPtr item : items) {
+  for (const PlaylistItemPtr &item : items) {
     insert.bindValue(":playlist", playlist);
     item->BindToQuery(&insert);
 

src/playlist/playlistdelegates.cpp

@@ -262,13 +262,9 @@ bool PlaylistDelegateBase::helpEvent(QHelpEvent *event, QAbstractItemView *view,
 
   switch (event->type()) {
     case QEvent::ToolTip: {
-      QRect displayed_text;
-      QSize real_text;
-      bool is_elided = false;
-
-      real_text = sizeHint(option, index);
-      displayed_text = view->visualRect(index);
-      is_elided = displayed_text.width() < real_text.width();
+      QSize real_text = sizeHint(option, index);
+      QRect displayed_text = view->visualRect(index);
+      bool is_elided = displayed_text.width() < real_text.width();
       if (is_elided) {
         QToolTip::showText(he->globalPos(), text, view);
       }

src/playlist/playlistfilterparser.cpp

@@ -296,7 +296,8 @@ FilterTree *FilterParser::parseAndGroup() {
       break;
     }
     checkAnd();  // if there's no 'AND', we'll add the term anyway...
-  } while (iter_ != end_);
+  }
+  while (iter_ != end_);
   return group;
 }
 
@@ -304,13 +305,13 @@ bool FilterParser::checkAnd() {
   if (iter_ != end_) {
     if (*iter_ == QChar('A')) {
       buf_ += *iter_;
-      iter_++;
+      ++iter_;
       if (iter_ != end_ && *iter_ == QChar('N')) {
         buf_ += *iter_;
-        iter_++;
+        ++iter_;
         if (iter_ != end_ && *iter_ == QChar('D')) {
           buf_ += *iter_;
-          iter_++;
+          ++iter_;
           if (iter_ != end_ && (iter_->isSpace() || *iter_ == QChar('-') || *iter_ == '(')) {
             advance();
             buf_.clear();
@@ -337,10 +338,10 @@ bool FilterParser::checkOr(bool step_over) {
     if (iter_ != end_) {
       if (*iter_ == 'O') {
         buf_ += *iter_;
-        iter_++;
+        ++iter_;
         if (iter_ != end_ && *iter_ == 'R') {
           buf_ += *iter_;
-          iter_++;
+          ++iter_;
           if (iter_ != end_ && (iter_->isSpace() || *iter_ == '-' || *iter_ == '(')) {
             if (step_over) {
               buf_.clear();
@@ -359,7 +360,7 @@ FilterTree *FilterParser::parseSearchExpression() {
   advance();
   if (iter_ == end_) return new NopFilter;
   if (*iter_ == '(') {
-    iter_++;
+    ++iter_;
     advance();
     FilterTree *tree = parseOrGroup();
     advance();
@@ -375,7 +376,8 @@ FilterTree *FilterParser::parseSearchExpression() {
     FilterTree *tree = parseSearchExpression();
     if (tree->type() != FilterTree::Nop) return new NotFilter(tree);
     return tree;
-  } else {
+  }
+  else {
     return parseSearchTerm();
   }
 }
@@ -401,10 +403,10 @@ FilterTree *FilterParser::parseSearchTerm() {
         buf_.clear();
         prefix.clear();  // prefix isn't allowed here - let's ignore it
       }
-      else if (iter_->isSpace() || *iter_ == '(' || *iter_ == ')' ||
-                 *iter_ == '-') {
+      else if (iter_->isSpace() || *iter_ == '(' || *iter_ == ')' || *iter_ == '-') {
         break;
-      } else if (buf_.isEmpty()) {
+      }
+      else if (buf_.isEmpty()) {
         // we don't know whether there is a column part in this search term thus we assume the latter and just try and read a prefix
         if (prefix.isEmpty() && (*iter_ == '>' || *iter_ == '<' || *iter_ == '=' || *iter_ == '!')) {
           prefix += *iter_;
@@ -428,8 +430,8 @@ FilterTree *FilterParser::parseSearchTerm() {
   return createSearchTermTreeNode(col, prefix, search);
 }
 
-FilterTree *FilterParser::createSearchTermTreeNode(
-    const QString &col, const QString &prefix, const QString &search) const {
+FilterTree *FilterParser::createSearchTermTreeNode(const QString &col, const QString &prefix, const QString &search) const {
+
   if (search.isEmpty() && prefix != "=") {
     return new NopFilter;
   }

src/playlist/playlistmanager.cpp

@@ -451,7 +451,7 @@ void PlaylistManager::SongsDiscovered(const SongList &songs) {
   for (const Song &song : songs) {
     for (const Data &data : playlists_) {
       PlaylistItemList items = data.p->collection_items_by_id(song.id());
-      for (PlaylistItemPtr item : items) {
+      for (PlaylistItemPtr &item : items) {
         if (item->Metadata().directory_id() != song.directory_id()) continue;
         static_cast<CollectionPlaylistItem*>(item.get())->SetMetadata(song);
         data.p->ItemChanged(item);

src/playlist/playlisttabbar.cpp

@@ -411,14 +411,10 @@ bool PlaylistTabBar::event(QEvent *e) {
     case QEvent::ToolTip: {
       QHelpEvent *he = static_cast<QHelpEvent*>(e);
 
-      QRect displayed_tab;
-      QSize real_tab;
-      bool is_elided = false;
-
-      real_tab = tabSizeHint(tabAt(he->pos()));
-      displayed_tab = tabRect(tabAt(he->pos()));
+      QSize real_tab = tabSizeHint(tabAt(he->pos()));
+      QRect displayed_tab = tabRect(tabAt(he->pos()));
       // Check whether the tab is elided or not
-      is_elided = displayed_tab.width() < real_tab.width();
+      bool is_elided = displayed_tab.width() < real_tab.width();
       if (!is_elided) {
         // If it's not elided, don't show the tooltip
         QToolTip::hideText();

src/playlist/songloaderinserter.cpp

@@ -38,6 +38,7 @@ SongLoaderInserter::SongLoaderInserter(TaskManager *task_manager, CollectionBack
       row_(-1),
       play_now_(true),
       enqueue_(false),
+      enqueue_next_(false),
       collection_(collection),
       player_(player) {}