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

List:       koffice-devel
Subject:    branches/koffice/1.6/koffice/kplato
From:       Dag Andersen <danders () get2net ! dk>
Date:       2006-09-04 8:24:38
Message-ID: 1157358278.009442.24436.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 580677 by danders:

Fix the compile problem:
Add the missing overbookedResources() to kptnode, using
the same solultion method as for similar cases.
(Bad timing pulling a stunt like this 2 days before tagging,
and then going away for the weekend, sorry :( )
CCMAIL: koffice-devel@kde.org


 M  +1 -2      kptganttview.cc  
 M  +4 -0      kptnode.cc  
 M  +2 -0      kptnode.h  


--- branches/koffice/1.6/koffice/kplato/kptganttview.cc #580676:580677
@@ -622,8 +622,7 @@
         }
         if (task->resourceOverbooked()) {
             ok = false;
-#warning FIXME
-            QStringList rl = task->currentSchedule()->overbookedResources();
+            QStringList rl = task->overbookedResources();
             sts += "\n" + i18n("arg: list of resources", "Resource overbooked: %1").arg(rl.join(","));
             
         }
--- branches/koffice/1.6/koffice/kplato/kptnode.cc #580676:580677
@@ -380,6 +380,10 @@
     }
 }
 
+QStringList Node::overbookedResources() const {
+    return m_currentSchedule ? m_currentSchedule->overbookedResources() : QStringList();
+}
+
 void Node::saveRelations(QDomElement &element) const {
     QPtrListIterator<Relation> it(m_dependChildNodes);
     for (; it.current(); ++it) {
--- branches/koffice/1.6/koffice/kplato/kptnode.h #580676:580677
@@ -262,6 +262,8 @@
     /// The assigned resource is overbooked
     virtual bool resourceOverbooked() const
         { return m_currentSchedule ? m_currentSchedule->resourceOverbooked : false; }
+    /// Return a list of overbooked resources
+    virtual QStringList overbookedResources() const;
     /// Calculates if the assigned resource is overbooked 
     /// within the duration of this node
     virtual void calcResourceOverbooked();
_______________________________________________
koffice-devel mailing list
koffice-devel@kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel
[prev in list] [next in list] [prev in thread] [next in thread]