From 5a83ad3a4a3823001164fa1f236c5f5151d78fa7 Mon Sep 17 00:00:00 2001
From: Alexandre Quessy <alexandre@quessy.net>
Date: Tue, 19 Apr 2016 14:40:11 -0400
Subject: [PATCH] update coding style + add a todo: tooltips for solo/lock
 buttons

---
 MainWindow.cpp          |  26 ++++--
 MappingItemDelegate.cpp | 185 +++++++++++++++++++++++++++-------------
 MappingManager.cpp      |  65 +++++++++-----
 3 files changed, 189 insertions(+), 87 deletions(-)

diff --git a/MainWindow.cpp b/MainWindow.cpp
index eb5aea4..3136d48 100644
--- a/MainWindow.cpp
+++ b/MainWindow.cpp
@@ -162,8 +162,8 @@ void MainWindow::handleMappingItemChanged(const QModelIndex &index)
   // Change properties.
   mapping->setName(index.data(Qt::EditRole).toString());
   mapping->setVisible(index.data(Qt::CheckStateRole).toBool());
-  mapping->setSolo(index.data(Qt::CheckStateRole+1).toBool());
-  mapping->setLocked(index.data(Qt::CheckStateRole+2).toBool());
+  mapping->setSolo(index.data(Qt::CheckStateRole + 1).toBool());
+  mapping->setLocked(index.data(Qt::CheckStateRole + 2).toBool());
  }
 
 void MainWindow::handleMappingIndexesMoved()
@@ -188,7 +188,8 @@ void MainWindow::handlePaintItemSelected(QListWidgetItem* item)
   currentSelectedItem = item;
 }
 
-void MainWindow::handlePaintChanged(Paint::ptr paint) {
+void MainWindow::handlePaintChanged(Paint::ptr paint)
+{
   // Change currently selected item.
   uid curMappingId = getCurrentMappingId();
   removeCurrentMapping();
@@ -196,7 +197,8 @@ void MainWindow::handlePaintChanged(Paint::ptr paint) {
 
   uid paintId = mappingManager->getPaintId(paint);
 
-  if (paint->getType() == "media") {
+  if (paint->getType() == "media")
+  {
     QSharedPointer<Video> media = qSharedPointerCast<Video>(paint);
     Q_CHECK_PTR(media);
     updatePaintItem(paintId, media->getIcon(), strippedName(media->getUri()));
@@ -206,7 +208,8 @@ void MainWindow::handlePaintChanged(Paint::ptr paint) {
     //    if (!fileName.isEmpty())
     //      importMediaFile(fileName, paint, false);
   }
-  if (paint->getType() == "image") {
+  if (paint->getType() == "image")
+  {
     QSharedPointer<Image> image = qSharedPointerCast<Image>(paint);
     Q_CHECK_PTR(image);
     updatePaintItem(paintId, image->getIcon(), strippedName(image->getUri()));
@@ -216,7 +219,8 @@ void MainWindow::handlePaintChanged(Paint::ptr paint) {
     //    if (!fileName.isEmpty())
     //      importMediaFile(fileName, paint, true);
   }
-  else if (paint->getType() == "color") {
+  else if (paint->getType() == "color")
+  {
     // Pop-up color-choosing dialog to choose color paint.
     QSharedPointer<Color> color = qSharedPointerCast<Color>(paint);
     Q_CHECK_PTR(color);
@@ -224,7 +228,9 @@ void MainWindow::handlePaintChanged(Paint::ptr paint) {
   }
 
   if (curMappingId != NULL_UID)
+  {
     setCurrentMapping(curMappingId);
+  }
 }
 
 void MainWindow::mappingPropertyChanged(uid id, QString propertyName, QVariant value)
@@ -242,11 +248,17 @@ void MainWindow::mappingPropertyChanged(uid id, QString propertyName, QVariant v
   if (mapping == getCurrentMapping())
   {
     if (propertyName == "solo")
+    {
       mappingSoloAction->setChecked(value.toBool());
+    }
     else if (propertyName == "locked")
+    {
       mappingLockedAction->setChecked(value.toBool());
+    }
     else if (propertyName == "visible")
+    {
       mappingHideAction->setChecked(!value.toBool());
+    }
   }
 
   // Send to list items.
@@ -1537,7 +1549,7 @@ void MainWindow::createActions()
   //renamePaintAction->setShortcut(Qt::Key_F2);
   renamePaintAction->setToolTip(tr("Rename item"));
   renamePaintAction->setIconVisibleInMenu(false);
-  mappingSoloAction->setShortcutContext(Qt::ApplicationShortcut);
+  renamePaintAction->setShortcutContext(Qt::ApplicationShortcut);
   addAction(renamePaintAction);
   connect(renamePaintAction, SIGNAL(triggered()), this, SLOT(renamePaintItem()));
 
diff --git a/MappingItemDelegate.cpp b/MappingItemDelegate.cpp
index c2c300e..6a26e2d 100644
--- a/MappingItemDelegate.cpp
+++ b/MappingItemDelegate.cpp
@@ -31,85 +31,125 @@ void MappingItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &o
 {
   painter->setRenderHint(QPainter::Antialiasing);
 
-  if (index.isValid()) {
+  if (index.isValid())
+  {
     QRect rect = option.rect;
     int x = rect.x();
     int y = rect.y();
 
     if (option.state & QStyle::State_Selected)
+    {
       painter->fillRect(rect, MM::DARK_GRAY);
+    }
 
-    if (index.column() == MM::HideColumn) {
+    if (index.column() == MM::HideColumn)
+    {
       bool isVisible = index.model()->data(index, Qt::CheckStateRole).toBool();
-      if (isVisible) {
+      if (isVisible)
+      {
         QStyleOptionToolButton mappingMuteButton;
         mappingMuteButton.state |= QStyle::State_Enabled;
-        mappingMuteButton.rect = QRect(x + 4, y + 12, MM::MAPPING_LIST_ICON_SIZE, MM::MAPPING_LIST_ICON_SIZE);
+        mappingMuteButton.rect = QRect(x + 4, y + 12,
+                MM::MAPPING_LIST_ICON_SIZE, MM::MAPPING_LIST_ICON_SIZE);
         mappingMuteButton.icon = QIcon(":/visible-mapping");
-        mappingMuteButton.iconSize = QSize(MM::MAPPING_LIST_ICON_SIZE, MM::MAPPING_LIST_ICON_SIZE);
+        mappingMuteButton.iconSize = QSize(MM::MAPPING_LIST_ICON_SIZE,
+                MM::MAPPING_LIST_ICON_SIZE);
 
         QApplication::style()->drawControl(
               QStyle::CE_ToolButtonLabel, &mappingMuteButton, painter);
       }
     }
 
-    if(index.column() == MM::IconAndNameColum) {
+    if (index.column() == MM::IconAndNameColum)
+    {
       // Draw Icon
-      QIcon mappingIcon = qvariant_cast<QIcon>(index.model()->data(index, Qt::DecorationRole));
+      QIcon mappingIcon = qvariant_cast<QIcon>(index.model()->data(index,
+                  Qt::DecorationRole));
       QPixmap iconPixmap = mappingIcon.pixmap(24, 24);
       QRect iconRect(x + 5, y, 24, rect.height());
       QApplication::style()->drawItemPixmap(painter, iconRect,
-                                            Qt::AlignLeft | Qt::AlignVCenter, iconPixmap);
+              Qt::AlignLeft | Qt::AlignVCenter, iconPixmap);
 
       // Draw Text
       QString mappingName = index.model()->data(index, Qt::DisplayRole).toString();
       QRect textRect(x + 40, y, rect.width() - 40, rect.height());
       QPalette textColor = QPalette(MM::WHITE);
 
-      QApplication::style()->drawItemText(painter, textRect, Qt::AlignLeft | Qt::AlignVCenter,
-                                          textColor, true, mappingName, QPalette::Window);
+      QApplication::style()->drawItemText(painter, textRect,
+              Qt::AlignLeft | Qt::AlignVCenter,
+              textColor, true, mappingName, QPalette::Window);
     }
 
-    if (index.column() == MM::GroupButtonColum) {
-     bool isSolo = index.model()->data(index, Qt::CheckStateRole + 1).toBool();
-     bool isLocked = index.model()->data(index, Qt::CheckStateRole + 2).toBool();
-      // Create Buttons
+    if (index.column() == MM::GroupButtonColum)
+    {
+      bool isSolo = index.model()->data(index, Qt::CheckStateRole + 1).toBool();
+      bool isLocked = index.model()->data(index, Qt::CheckStateRole + 2).toBool();
+
+      // Create all mappings buttons:
+      // solo button
       QStyleOptionToolButton mappingSoloButton;
       mappingSoloButton.state |= QStyle::State_Enabled;
-      mappingSoloButton.rect = QRect(x + 10, y + 12, MM::MAPPING_LIST_ICON_SIZE, MM::MAPPING_LIST_ICON_SIZE);
+      mappingSoloButton.rect = QRect(x + 10, y + 12,
+              MM::MAPPING_LIST_ICON_SIZE, MM::MAPPING_LIST_ICON_SIZE);
       mappingSoloButton.icon = QIcon(":/solo-mapping");
-      mappingSoloButton.iconSize = QSize(MM::MAPPING_LIST_ICON_SIZE, MM::MAPPING_LIST_ICON_SIZE);
+      mappingSoloButton.iconSize = QSize(MM::MAPPING_LIST_ICON_SIZE,
+              MM::MAPPING_LIST_ICON_SIZE);
+      mappingSoloButton.text = tr("Solo mapping");
+      //TODO: show tooltip
+      //mappingSoloButton.toolButtonStyle = Qt::ToolButtonTextUnderIcon;
 
+      // lock button
       QStyleOptionToolButton mappingLockButton;
       mappingLockButton.state |= QStyle::State_Enabled;
-      mappingLockButton.rect = QRect(x + 40, y + 12, MM::MAPPING_LIST_ICON_SIZE, MM::MAPPING_LIST_ICON_SIZE);
+      mappingLockButton.rect = QRect(x + 40, y + 12, MM::MAPPING_LIST_ICON_SIZE,
+              MM::MAPPING_LIST_ICON_SIZE);
       mappingLockButton.icon = QIcon(":/lock-mapping");
-      mappingLockButton.iconSize = QSize(MM::MAPPING_LIST_ICON_SIZE, MM::MAPPING_LIST_ICON_SIZE);
+      mappingLockButton.iconSize = QSize(MM::MAPPING_LIST_ICON_SIZE,
+              MM::MAPPING_LIST_ICON_SIZE);
+      mappingLockButton.text = tr("Lock mapping");
+      //TODO: show tooltip
+      //mappingLockButton.toolButtonStyle = Qt::ToolButtonTextUnderIcon;
 
+      // duplicate button
       QStyleOptionToolButton mappingDuplicateButton;
       mappingDuplicateButton.state |= QStyle::State_Enabled;
-      mappingDuplicateButton.rect = QRect(x + 70, y + 12, MM::MAPPING_LIST_ICON_SIZE, MM::MAPPING_LIST_ICON_SIZE);
+      mappingDuplicateButton.rect = QRect(x + 70, y + 12,
+              MM::MAPPING_LIST_ICON_SIZE, MM::MAPPING_LIST_ICON_SIZE);
       mappingDuplicateButton.icon = QIcon(":/duplicate-mapping");
-      mappingDuplicateButton.iconSize = QSize(MM::MAPPING_LIST_ICON_SIZE, MM::MAPPING_LIST_ICON_SIZE);
+      mappingDuplicateButton.iconSize = QSize(MM::MAPPING_LIST_ICON_SIZE,
+              MM::MAPPING_LIST_ICON_SIZE);
+      mappingDuplicateButton.text = tr("Duplicate mapping");
+      //TODO: show tooltip
+      //mappingDuplicateButton.toolButtonStyle = Qt::ToolButtonTextUnderIcon;
 
+      // delete button
       QStyleOptionToolButton mappingDeleteButton;
       mappingDeleteButton.state |= QStyle::State_Enabled;
-      mappingDeleteButton.rect = QRect(x + 100, y + 12, MM::MAPPING_LIST_ICON_SIZE, MM::MAPPING_LIST_ICON_SIZE);
+      mappingDeleteButton.rect = QRect(x + 100, y + 12,
+              MM::MAPPING_LIST_ICON_SIZE, MM::MAPPING_LIST_ICON_SIZE);
       mappingDeleteButton.icon = QIcon(":/delete-mapping");
-      mappingDeleteButton.iconSize = QSize(MM::MAPPING_LIST_ICON_SIZE, MM::MAPPING_LIST_ICON_SIZE);
+      mappingDeleteButton.iconSize = QSize(MM::MAPPING_LIST_ICON_SIZE,
+              MM::MAPPING_LIST_ICON_SIZE);
+      mappingDeleteButton.text = tr("Delete mapping");
+      //TODO: show tooltip
+      //mappingDeleteButton.toolButtonStyle = Qt::ToolButtonTextUnderIcon;
 
-      if (isSolo) {
+      if (isSolo)
+      {
         QPainterPath mappingSoloPanel;
-        mappingSoloPanel.addRoundedRect(mappingSoloButton.rect.adjusted(-2, -2, 2, 2), 4, 4);
+        mappingSoloPanel.addRoundedRect(mappingSoloButton.rect.adjusted(
+              -2, -2, 2, 2), 4, 4);
         painter->setPen(QPen()); // No pen
         painter->fillPath(mappingSoloPanel, MM::DARK_BLUE);
         painter->drawPath(mappingSoloPanel);
       }
-      QApplication::style()->drawControl(
-            QStyle::CE_ToolButtonLabel, &mappingSoloButton, painter);
-      if (isLocked) {
+      QApplication::style()->drawControl( QStyle::CE_ToolButtonLabel,
+              &mappingSoloButton, painter);
+      if (isLocked)
+      {
         QPainterPath mappingLockPanel;
-        mappingLockPanel.addRoundedRect(QRectF(mappingLockButton.rect.adjusted(-2, -2, 2, 2)), 4, 4);
+        mappingLockPanel.addRoundedRect(QRectF(mappingLockButton.rect.adjusted(
+              -2, -2, 2, 2)), 4, 4);
         painter->setPen(QPen()); // No pen
         painter->fillPath(mappingLockPanel, MM::DARK_BLUE);
         painter->drawPath(mappingLockPanel);
@@ -120,22 +160,28 @@ void MappingItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &o
             QStyle::CE_ToolButtonLabel, &mappingDuplicateButton, painter);
       QApplication::style()->drawControl(
             QStyle::CE_ToolButtonLabel, &mappingDeleteButton, painter);
-
     }
-  } else {
+  }
+  else
+  {
     QStyledItemDelegate::paint(painter, option, index);
   }
 }
 
-QWidget *MappingItemDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const
+QWidget *MappingItemDelegate::createEditor(QWidget *parent,
+        const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
-  if (index.column() == MM::IconAndNameColum) {
+  if (index.column() == MM::IconAndNameColum)
+  {
     QLineEdit *editor = new QLineEdit(parent);
     editor->setFixedHeight(option.rect.height());
     editor->setContentsMargins(option.rect.x() + 4, 0, 0, 0);
     return editor;
-  } else
+  }
+  else
+  {
     return 0;
+  }
 }
 
 void MappingItemDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const
@@ -152,56 +198,75 @@ void MappingItemDelegate::setModelData(QWidget *editor, QAbstractItemModel *mode
   model->setData(index, nameEdit->text(), Qt::EditRole);
 }
 
-void MappingItemDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const
+void MappingItemDelegate::updateEditorGeometry(QWidget *editor,
+        const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
   Q_UNUSED(index);
   editor->setGeometry(option.rect);
 }
 
-bool MappingItemDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index)
+bool MappingItemDelegate::editorEvent(QEvent *event, QAbstractItemModel *model,
+        const QStyleOptionViewItem &option, const QModelIndex &index)
 {
   QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);
   QRect rect = option.rect;
   int x = rect.x();
   int y = rect.y();
 
-  QRect hideButtonRect = QRect(x + 4, y + 12, MM::MAPPING_LIST_ICON_SIZE, MM::MAPPING_LIST_ICON_SIZE);
-  QRect soloButtonRect = QRect(x + 10, y + 12, MM::MAPPING_LIST_ICON_SIZE, MM::MAPPING_LIST_ICON_SIZE);
-  QRect lockButtonRect = QRect(x + 40, y + 12, MM::MAPPING_LIST_ICON_SIZE, MM::MAPPING_LIST_ICON_SIZE);
-  QRect duplicateButtonRect = QRect(x + 70, y + 12, MM::MAPPING_LIST_ICON_SIZE, MM::MAPPING_LIST_ICON_SIZE);
-  QRect deleteButtonRect = QRect(x + 100, y + 12, MM::MAPPING_LIST_ICON_SIZE, MM::MAPPING_LIST_ICON_SIZE);
+  QRect hideButtonRect = QRect(x + 4, y + 12, MM::MAPPING_LIST_ICON_SIZE,
+          MM::MAPPING_LIST_ICON_SIZE);
+  QRect soloButtonRect = QRect(x + 10, y + 12, MM::MAPPING_LIST_ICON_SIZE,
+          MM::MAPPING_LIST_ICON_SIZE);
+  QRect lockButtonRect = QRect(x + 40, y + 12, MM::MAPPING_LIST_ICON_SIZE,
+          MM::MAPPING_LIST_ICON_SIZE);
+  QRect duplicateButtonRect = QRect(x + 70, y + 12, MM::MAPPING_LIST_ICON_SIZE,
+          MM::MAPPING_LIST_ICON_SIZE);
+  QRect deleteButtonRect = QRect(x + 100, y + 12, MM::MAPPING_LIST_ICON_SIZE,
+          MM::MAPPING_LIST_ICON_SIZE);
 
-  if (event->type() == QEvent::MouseMove) {
+  if (event->type() == QEvent::MouseMove)
+  {
     // TODO: handle tooltip
   }
-
-  if (event->type() == QEvent::MouseButtonPress) {
-
-    if (mouseEvent->buttons() & Qt::LeftButton && index.isValid()) {
-      if (index.column() == MM::HideColumn) {
+  else if (event->type() == QEvent::MouseButtonPress)
+  {
+    if (mouseEvent->buttons() & Qt::LeftButton && index.isValid())
+    {
+      if (index.column() == MM::HideColumn)
+      {
         if (hideButtonRect.contains(mouseEvent->pos()))
-          model->setData(index, !(index.data(Qt::CheckStateRole).toBool()), Qt::CheckStateRole);
+        {
+          model->setData(index, !(index.data(Qt::CheckStateRole).toBool()),
+                  Qt::CheckStateRole);
+        }
       }
-      if (index.column() == MM::GroupButtonColum) {
-
+      if (index.column() == MM::GroupButtonColum)
+      {
         if (soloButtonRect.contains(mouseEvent->pos()))
-          model->setData(index, !(index.data(Qt::CheckStateRole + 1).toBool()), Qt::CheckStateRole + 1);
-
-        if (lockButtonRect.contains(mouseEvent->pos()))
-          model->setData(index, !(index.data(Qt::CheckStateRole + 2).toBool()), Qt::CheckStateRole + 2);
-
-        if (duplicateButtonRect.contains(mouseEvent->pos()))
+        {
+          model->setData(index, !(index.data(Qt::CheckStateRole + 1).toBool()),
+                  Qt::CheckStateRole + 1);
+        }
+        else if (lockButtonRect.contains(mouseEvent->pos()))
+        {
+          model->setData(index, !(index.data(Qt::CheckStateRole + 2).toBool()),
+                  Qt::CheckStateRole + 2);
+        }
+        else if (duplicateButtonRect.contains(mouseEvent->pos()))
+        {
           emit itemDuplicated(index.data(Qt::UserRole).toInt());
-
-        if (deleteButtonRect.contains(mouseEvent->pos()))
+        }
+        else if (deleteButtonRect.contains(mouseEvent->pos()))
+        {
           emit itemRemoved(index.data(Qt::UserRole).toInt());
+        }
       }
     }
-
-    if (mouseEvent->buttons() & Qt::RightButton && index.isValid())
+    else if (mouseEvent->buttons() & Qt::RightButton && index.isValid())
+    {
       emit itemContextMenuRequested(mouseEvent->pos());
+    }
   }
-
   return QAbstractItemDelegate::editorEvent(event, model, option, index);
 }
 
diff --git a/MappingManager.cpp b/MappingManager.cpp
index 7503bb6..7401861 100644
--- a/MappingManager.cpp
+++ b/MappingManager.cpp
@@ -35,17 +35,19 @@ QMap<uid, Mapping::ptr> MappingManager::getPaintMappings(const Paint::ptr paint)
   for (QVector<Mapping::ptr>::const_iterator it = mappingVector.begin(); it != mappingVector.end(); ++it)
   {
     if ((*it)->getPaint() == paint)
+    {
       paintMappings[(*it)->getId()] = *it;
+    }
   }
   return paintMappings;
 }
 
 QMap<uid, Mapping::ptr> MappingManager::getPaintMappingsById(uid paintId) const
 {
-  return getPaintMappings( paintMap[paintId] );
+  return getPaintMappings(paintMap[paintId]);
 }
 
-uid MappingManager::addPaint(Paint::ptr paint )
+uid MappingManager::addPaint(Paint::ptr paint)
 {
   paintVector.push_back(paint);
   paintMap[paint->getId()] = paint;
@@ -62,35 +64,42 @@ bool MappingManager::removePaint(uid paintId)
     QMap<uid, Mapping::ptr> paintMappings = getPaintMappings(paint);
     for (QMap<uid, Mapping::ptr>::const_iterator it = paintMappings.constBegin();
          it != paintMappings.constEnd(); ++it)
+    {
       removeMapping(it.key());
+    }
 
     // Remove paint.
     int idx = paintVector.lastIndexOf(paint);
-    Q_ASSERT( idx != -1 );
+    Q_ASSERT(idx != -1);
     paintVector.remove(idx);
     paintMap.remove(paintId);
-
     return true;
   }
-
-  return false;
+  else
+  {
+    return false;
+  }
 }
 
-bool MappingManager::replacePaintMappings(Paint::ptr oldpaint, Paint::ptr newpaint)
+bool MappingManager::replacePaintMappings(Paint::ptr oldpaint,
+        Paint::ptr newpaint)
 {
   // Make sure the paint to which this paint refers to exists in the manager.
   if (oldpaint && newpaint)
   {
     QMap<uid, Mapping::ptr> paintMappings = getPaintMappings(oldpaint);
     for (QMap<uid, Mapping::ptr>::const_iterator it = paintMappings.constBegin();
-         it != paintMappings.constEnd(); ++it) {
+         it != paintMappings.constEnd(); ++it)
+    {
       Mapping::ptr mapping = it.value();
       mapping->setPaint(newpaint);
     }
     return true;
   }
-
-  return false;
+  else
+  {
+    return false;
+  }
 }
 
 uid MappingManager::addMapping(Mapping::ptr mapping)
@@ -117,8 +126,10 @@ bool MappingManager::removeMapping(uid mappingId)
 
     return true;
   }
-
-  return false;
+  else
+  {
+    return false;
+  }
 }
 
 QVector<Mapping::ptr> MappingManager::getVisibleMappings() const
@@ -127,7 +138,8 @@ QVector<Mapping::ptr> MappingManager::getVisibleMappings() const
 
   // First pass: check if one of the mappings is in solo mode.
   bool hasSolo = false;
-  for (QVector<Mapping::ptr>::const_iterator it = mappingVector.begin(); it != mappingVector.end(); ++it)
+  for (QVector<Mapping::ptr>::const_iterator it = mappingVector.begin();
+          it != mappingVector.end(); ++it)
   {
     if ((*it)->isSolo())
     {
@@ -137,11 +149,15 @@ QVector<Mapping::ptr> MappingManager::getVisibleMappings() const
   }
 
   // Second pass: fill the visible vector.
-  for (QVector<Mapping::ptr>::const_iterator it = mappingVector.begin(); it != mappingVector.end(); ++it)
+  for (QVector<Mapping::ptr>::const_iterator it = mappingVector.begin();
+          it != mappingVector.end(); ++it)
   {
     // Solo has priority over invisible (mute)
-    if ( (hasSolo && (*it)->isSolo() && (*it)->isVisible()) || (!hasSolo && (*it)->isVisible()) )
+    if ( (hasSolo && (*it)->isSolo() && (*it)->isVisible()) ||
+            (! hasSolo && (*it)->isVisible()) )
+    {
       visible.push_back(*it);
+    }
   }
 
   return visible;
@@ -152,19 +168,27 @@ bool MappingManager::mappingIsVisible(Mapping::ptr mapping) const
 {
   // Solo mappings are always visible.
   if (mapping->isSolo())
+  {
     return true;
+  }
 
   // Non-solo invisible mappings are always invisible.
-  else if (!mapping->isVisible())
+  else if (! mapping->isVisible())
+  {
     return false;
+  }
 
-  // Mapping is non-solo yet visible: check if another mapping is solo (which would thus make it invisible).
+  // Mapping is non-solo yet visible: check if another mapping is solo
+  // (which would thus make it invisible).
   else
   {
-    for (QVector<Mapping::ptr>::const_iterator it = mappingVector.begin(); it != mappingVector.end(); ++it)
+    for (QVector<Mapping::ptr>::const_iterator it = mappingVector.begin();
+            it != mappingVector.end(); ++it)
     {
       if ((*it)->isSolo())
+      {
         return false;
+      }
     }
 
     // Mapping is non-solo yet visible and there are no solo mappings.
@@ -178,12 +202,13 @@ void MappingManager::reorderMappings(QVector<uid> mappingIds)
   Q_ASSERT( mappingIds.size() == mappingVector.size() );
   mappingVector.clear();
   int depth = 0;
-  for (QVector<uid>::iterator it = mappingIds.begin(); it != mappingIds.end(); ++it)
+  for (QVector<uid>::iterator it = mappingIds.begin();
+          it != mappingIds.end(); ++it)
   {
     // Uid should be a key of the mappingMap.
     Q_ASSERT( mappingMap.contains(*it) );
     // Makes sure the uids are not repeated.
-    Q_ASSERT( !mappingVector.contains(mappingMap[*it]) );
+    Q_ASSERT( ! mappingVector.contains(mappingMap[*it]) );
     // Adds the mapping at the right place in the vector.
     Mapping::ptr mapping = mappingMap[*it];
     mapping->setDepth(depth);