[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra] plan: Make handling after dynamic_cast consistent
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2015-09-01 1:59:39
Message-ID: E1ZWarL-0006D6-NG () scm ! kde ! org
[Download RAW message or body]

Git commit 897324672bba51f0f783c682b35b05f7a0d2e6dd by Friedrich W. H. Kossebau.
Committed on 01/09/2015 at 01:18.
Pushed by kossebau into branch 'master'.

Make handling after dynamic_cast consistent

M  +1    -0    plan/kptview.cpp
M  +3    -0    plan/libs/models/kptnodeitemmodel.cpp

http://commits.kde.org/calligra/897324672bba51f0f783c682b35b05f7a0d2e6dd

diff --git a/plan/kptview.cpp b/plan/kptview.cpp
index b724816..26be1e2 100644
--- a/plan/kptview.cpp
+++ b/plan/kptview.cpp
@@ -2101,6 +2101,7 @@ void View::slotTaskProgress()
             }
         case Node::Type_Milestone: {
                 Task *task = dynamic_cast<Task *>( node );
+                Q_ASSERT( task );
                 MilestoneProgressDialog *dia = new MilestoneProgressDialog( *task, this );
                 connect(dia, SIGNAL(finished(int)), SLOT(slotMilestoneProgressFinished(int)));
                 dia->show();
diff --git a/plan/libs/models/kptnodeitemmodel.cpp b/plan/libs/models/kptnodeitemmodel.cpp
index e5c6187..599305e 100644
--- a/plan/libs/models/kptnodeitemmodel.cpp
+++ b/plan/libs/models/kptnodeitemmodel.cpp
@@ -1571,6 +1571,9 @@ QVariant NodeModel::remainingEffort( const Node *node, int role ) const
         }
         case Qt::EditRole: {
             const Task *t = dynamic_cast<const Task*>( node );
+            if ( t == 0 ) {
+                return QVariant();
+            }
             return t->completion().remainingEffort().toDouble( Duration::Unit_h );
         }
         case Role::DurationUnit:

[prev in list] [next in list] [prev in thread] [next in thread]