use enabled flag instead of repeated criateria check

diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index d9d6fa210d0d4bdf890a316a589fb4e54ff3fba8..cb7923dc763f90478659bb8d8d9adf810401b3ca 100644 (file)
--- a/src/mvc/delegate.cpp
+++ b/src/mvc/delegate.cpp
@@ -325,15 +325,11 @@ Delegate::ControlId Delegate::whichControlClicked(const QModelIndex &aIndex, con
     while (i.hasNext())
     {
         ControlId id = i.next();
-        if(mControls[id]->drawRect(static_cast<QTreeView*>(parent())->visualRect(aIndex)).contains(aPoint))
+        Control *control = mControls[id];
+        if (control->enabled()
+            and control->drawRect(static_cast<QTreeView*>(parent())->visualRect(aIndex)).contains(aPoint))
         {
-            if(id == WarningControl)
-            {
-                if(static_cast<Event*>(aIndex.internalPointer())->hasTimeConflict())
-                    return id;
-            }
-            else
-                return id;
+            return id;
         }
     }