]> git.sesse.net Git - kdenlive/commitdiff
Add some brackets to make &&/|| precedence explicit
authorRay Lehtiniemi <rayl@mail.com>
Sun, 5 Apr 2009 01:27:04 +0000 (01:27 +0000)
committerRay Lehtiniemi <rayl@mail.com>
Sun, 5 Apr 2009 01:27:04 +0000 (01:27 +0000)
Signed-off-by: Ray Lehtiniemi <rayl@mail.com>
svn path=/trunk/kdenlive/; revision=3214

src/clipitem.cpp
src/customtrackview.cpp

index e270b4ee2df595f22b0836d2970d7f81535a9070..3cbd39ed7de18ef8dec5474f8a9d4aa491646a29 100644 (file)
@@ -757,7 +757,7 @@ void ClipItem::paint(QPainter *painter,
     // draw frame around clip
     QColor frameColor(Qt::black);
     int alphaBase = 60;
-    if (isSelected() || parentItem() && parentItem()->isSelected()) {
+    if (isSelected() || (parentItem() && parentItem()->isSelected())) {
         frameColor = QColor(Qt::red);
         alphaBase = 90;
     }
index 24ee9f21f068801b5229b6f04101de1d34790d68..f10b6cf1c58c4a4b9c4fd60d7fbe6a2ee059b54d 100644 (file)
@@ -728,7 +728,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
     if (m_dragItem->type() == AVWIDGET && !m_dragItem->isItemLocked()) emit clipItemSelected((ClipItem*) m_dragItem);
     else emit clipItemSelected(NULL);
 
-    if (event->modifiers() != Qt::ControlModifier && (m_dragItem->isSelected() || dragGroup && dragGroup->isSelected())) {
+    if (event->modifiers() != Qt::ControlModifier && (m_dragItem->isSelected() || (dragGroup && dragGroup->isSelected()))) {
         // If clicked item is selected, allow move
         if (dragGroup) dragGroup->setSelected(true);
         //event->accept();