Attachment #151889 for bug #220309

View | Details | Raw Unified | Return to bug 220309
Collapse All | Expand All

Lines 10-15 Link Here

(-)taskjuggler-2.4.0-orig/taskjuggler/FileToken.cpp (+1 lines)
10	* $Id: $	10	* $Id: $
11	*/	11	*/
12	#include "FileToken.h"	12	#include "FileToken.h"
		13	#include <cstdlib>
13		14
14	#include "tjlib-internal.h"	15	#include "tjlib-internal.h"
15		16

Lines 15-20 Link Here

(-)taskjuggler-2.4.0-orig/taskjuggler/FileToken.h (+2 lines)
15	#include <qtextstream.h>	15	#include <qtextstream.h>
16	#include <qptrlist.h>	16	#include <qptrlist.h>
17		17
		18	#include <memory>
		19
18	#include "MacroTable.h"	20	#include "MacroTable.h"
19	#include "Token.h"	21	#include "Token.h"
20		22

Lines 14-19 Link Here

(-)taskjuggler-2.4.0-orig/taskjuggler/ProjectFile.cpp (+1 lines)
14	#include "ProjectFile.h"	14	#include "ProjectFile.h"
15		15
16	#include <stdlib.h>	16	#include <stdlib.h>
		17	#include <memory>
17		18
18	#include <qtextstream.h>	19	#include <qtextstream.h>
19	#include <qregexp.h>	20	#include <qregexp.h>

Lines 23-29 class Scenario : public CoreAttributes Link Here

(-)taskjuggler-2.4.0-orig/taskjuggler/Scenario.h (-1 / +1 lines)
23	CoreAttributes* c2,	23	CoreAttributes* c2,
24	int level);	24	int level);
25	public:	25	public:
26	Scenario(Project* p, const QString& i, const QString& n, Scenario* p);	26	Scenario(Project* p, const QString& i, const QString& n, Scenario* pr);
27	virtual ~Scenario();	27	virtual ~Scenario();
28		28
29	virtual CAType getType() const { return CA_Scenario; }	29	virtual CAType getType() const { return CA_Scenario; }





    bool parseNode(const ParserNode* pn, QDomNode n, ParserTreeContext ptc);

    bool doTaskJuggler(QDomNode& n, ParserTreeContext& ptc);
    bool doProject(QDomNode& n, ParserTreeContext& ptc);
    bool doProjectStart(QDomNode& n, ParserTreeContext& ptc);
    bool doProjectEnd(QDomNode& n, ParserTreeContext& ptc);
    bool doProjectNow(QDomNode& n, ParserTreeContext& ptc);
    bool doCurrencyFormat(QDomNode& n, ParserTreeContext& ptc);
    bool doScenario(QDomNode& n, ParserTreeContext& ptc);
    bool doExtend(QDomNode& n, ParserTreeContext& ptc);
    bool doExtendAttribute(QDomNode& n, ParserTreeContext& ptc);
    bool doProjectWeekdayWorkingHours(QDomNode& n, ParserTreeContext& ptc);
    bool doProjectWeekdayWorkingHoursPost(QDomNode& n, ParserTreeContext& ptc);
    bool doShiftWeekdayWorkingHours(QDomNode& n, ParserTreeContext& ptc);
    bool doShiftWeekdayWorkingHoursPost(QDomNode& n, ParserTreeContext& ptc);
    bool doResourceWeekdayWorkingHours(QDomNode& n, ParserTreeContext& ptc);
    bool doResourceWeekdayWorkingHoursPost(QDomNode& n, ParserTreeContext& ptc);
    bool doTimeInterval(QDomNode& n, ParserTreeContext& ptc);
    bool doTimeIntervalStart(QDomNode& n, ParserTreeContext& ptc);
    bool doTimeIntervalEnd(QDomNode& n, ParserTreeContext& ptc);
    bool doProjectVacation(QDomNode& n, ParserTreeContext& ptc);
    bool doResourceVacation(QDomNode& n, ParserTreeContext& ptc);
    bool doVacationStart(QDomNode& n, ParserTreeContext& ptc);
    bool doVacationEnd(QDomNode& n, ParserTreeContext& ptc);
    bool doCustomAttribute(QDomNode& n, ParserTreeContext& ptc);
    bool doTextAttribute(QDomNode& n, ParserTreeContext& ptc);
    bool doReferenceAttribute(QDomNode& n, ParserTreeContext& ptc);
    bool doShiftList(QDomNode& n, ParserTreeContext& ptc);
    bool doShift(QDomNode& n, ParserTreeContext& ptc);
    bool doResourceList(QDomNode& n, ParserTreeContext& ptc);
    bool doResource(QDomNode& n, ParserTreeContext& ptc);
    bool doShiftSelection(QDomNode& n, ParserTreeContext& ptc);
    bool doAccountList(QDomNode& n, ParserTreeContext& ptc);
    bool doAccount(QDomNode& n, ParserTreeContext& ptc);
    bool doTaskList(QDomNode& n, ParserTreeContext& ptc);
    bool doTask(QDomNode& n, ParserTreeContext& ptc);
    bool doTaskScenario(QDomNode& n, ParserTreeContext& ptc);
    bool doTaskScenarioStart(QDomNode& n, ParserTreeContext& ptc);
    bool doTaskScenarioEnd(QDomNode& n, ParserTreeContext& ptc);
    bool doTaskScenarioMaxEnd(QDomNode& n, ParserTreeContext& ptc);
    bool doTaskScenarioMinEnd(QDomNode& n, ParserTreeContext& ptc);
    bool doTaskScenarioMaxStart(QDomNode& n, ParserTreeContext& ptc);
    bool doTaskScenarioMinStart(QDomNode& n, ParserTreeContext& ptc);
    bool doAllocate(QDomNode& n, ParserTreeContext& ptc);
    bool doCandidate(QDomNode& n, ParserTreeContext& ptc);
    bool doDepends(QDomNode& n, ParserTreeContext& ptc);
    bool doPrecedes(QDomNode& n, ParserTreeContext& ptc);
    bool doDependencyGapScenario(QDomNode& n, ParserTreeContext& ptc);
    bool doNote(QDomNode& n, ParserTreeContext& ptc);
    bool doFlag(QDomNode& n, ParserTreeContext& ptc);
    bool doResourceBooking(QDomNode& n, ParserTreeContext& ptc);
    bool doBooking(QDomNode& n, ParserTreeContext& ptc);
    bool doBookingPost(QDomNode& n, ParserTreeContext& ptc);

    QString masterFile;
    Project* project;

Return to bug 220309

Lines 76-132 private: Link Here

(-)taskjuggler-2.4.0-orig/taskjuggler/XMLFile.h (-50 / +50 lines)
76		76
77	bool parseNode(const ParserNode* pn, QDomNode n, ParserTreeContext ptc);	77	bool parseNode(const ParserNode* pn, QDomNode n, ParserTreeContext ptc);
78		78
79	bool doTaskJuggler(QDomNode& n, ParserTreeContext& n);	79	bool doTaskJuggler(QDomNode& n, ParserTreeContext& ptc);
80	bool doProject(QDomNode& n, ParserTreeContext& n);	80	bool doProject(QDomNode& n, ParserTreeContext& ptc);
81	bool doProjectStart(QDomNode& n, ParserTreeContext& n);	81	bool doProjectStart(QDomNode& n, ParserTreeContext& ptc);
82	bool doProjectEnd(QDomNode& n, ParserTreeContext& n);	82	bool doProjectEnd(QDomNode& n, ParserTreeContext& ptc);
83	bool doProjectNow(QDomNode& n, ParserTreeContext& n);	83	bool doProjectNow(QDomNode& n, ParserTreeContext& ptc);
84	bool doCurrencyFormat(QDomNode& n, ParserTreeContext& n);	84	bool doCurrencyFormat(QDomNode& n, ParserTreeContext& ptc);
85	bool doScenario(QDomNode& n, ParserTreeContext& n);	85	bool doScenario(QDomNode& n, ParserTreeContext& ptc);
86	bool doExtend(QDomNode& n, ParserTreeContext& n);	86	bool doExtend(QDomNode& n, ParserTreeContext& ptc);
87	bool doExtendAttribute(QDomNode& n, ParserTreeContext& n);	87	bool doExtendAttribute(QDomNode& n, ParserTreeContext& ptc);
88	bool doProjectWeekdayWorkingHours(QDomNode& n, ParserTreeContext& n);	88	bool doProjectWeekdayWorkingHours(QDomNode& n, ParserTreeContext& ptc);
89	bool doProjectWeekdayWorkingHoursPost(QDomNode& n, ParserTreeContext& n);	89	bool doProjectWeekdayWorkingHoursPost(QDomNode& n, ParserTreeContext& ptc);
90	bool doShiftWeekdayWorkingHours(QDomNode& n, ParserTreeContext& n);	90	bool doShiftWeekdayWorkingHours(QDomNode& n, ParserTreeContext& ptc);
91	bool doShiftWeekdayWorkingHoursPost(QDomNode& n, ParserTreeContext& n);	91	bool doShiftWeekdayWorkingHoursPost(QDomNode& n, ParserTreeContext& ptc);
92	bool doResourceWeekdayWorkingHours(QDomNode& n, ParserTreeContext& n);	92	bool doResourceWeekdayWorkingHours(QDomNode& n, ParserTreeContext& ptc);
93	bool doResourceWeekdayWorkingHoursPost(QDomNode& n, ParserTreeContext& n);	93	bool doResourceWeekdayWorkingHoursPost(QDomNode& n, ParserTreeContext& ptc);
94	bool doTimeInterval(QDomNode& n, ParserTreeContext& n);	94	bool doTimeInterval(QDomNode& n, ParserTreeContext& ptc);
95	bool doTimeIntervalStart(QDomNode& n, ParserTreeContext& n);	95	bool doTimeIntervalStart(QDomNode& n, ParserTreeContext& ptc);
96	bool doTimeIntervalEnd(QDomNode& n, ParserTreeContext& n);	96	bool doTimeIntervalEnd(QDomNode& n, ParserTreeContext& ptc);
97	bool doProjectVacation(QDomNode& n, ParserTreeContext& n);	97	bool doProjectVacation(QDomNode& n, ParserTreeContext& ptc);
98	bool doResourceVacation(QDomNode& n, ParserTreeContext& n);	98	bool doResourceVacation(QDomNode& n, ParserTreeContext& ptc);
99	bool doVacationStart(QDomNode& n, ParserTreeContext& n);	99	bool doVacationStart(QDomNode& n, ParserTreeContext& ptc);
100	bool doVacationEnd(QDomNode& n, ParserTreeContext& n);	100	bool doVacationEnd(QDomNode& n, ParserTreeContext& ptc);
101	bool doCustomAttribute(QDomNode& n, ParserTreeContext& n);	101	bool doCustomAttribute(QDomNode& n, ParserTreeContext& ptc);
102	bool doTextAttribute(QDomNode& n, ParserTreeContext& n);	102	bool doTextAttribute(QDomNode& n, ParserTreeContext& ptc);
103	bool doReferenceAttribute(QDomNode& n, ParserTreeContext& n);	103	bool doReferenceAttribute(QDomNode& n, ParserTreeContext& ptc);
104	bool doShiftList(QDomNode& n, ParserTreeContext& n);	104	bool doShiftList(QDomNode& n, ParserTreeContext& ptc);
105	bool doShift(QDomNode& n, ParserTreeContext& n);	105	bool doShift(QDomNode& n, ParserTreeContext& ptc);
106	bool doResourceList(QDomNode& n, ParserTreeContext& n);	106	bool doResourceList(QDomNode& n, ParserTreeContext& ptc);
107	bool doResource(QDomNode& n, ParserTreeContext& n);	107	bool doResource(QDomNode& n, ParserTreeContext& ptc);
108	bool doShiftSelection(QDomNode& n, ParserTreeContext& n);	108	bool doShiftSelection(QDomNode& n, ParserTreeContext& ptc);
109	bool doAccountList(QDomNode& n, ParserTreeContext& n);	109	bool doAccountList(QDomNode& n, ParserTreeContext& ptc);
110	bool doAccount(QDomNode& n, ParserTreeContext& n);	110	bool doAccount(QDomNode& n, ParserTreeContext& ptc);
111	bool doTaskList(QDomNode& n, ParserTreeContext& n);	111	bool doTaskList(QDomNode& n, ParserTreeContext& ptc);
112	bool doTask(QDomNode& n, ParserTreeContext& n);	112	bool doTask(QDomNode& n, ParserTreeContext& ptc);
113	bool doTaskScenario(QDomNode& n, ParserTreeContext& n);	113	bool doTaskScenario(QDomNode& n, ParserTreeContext& ptc);
114	bool doTaskScenarioStart(QDomNode& n, ParserTreeContext& n);	114	bool doTaskScenarioStart(QDomNode& n, ParserTreeContext& ptc);
115	bool doTaskScenarioEnd(QDomNode& n, ParserTreeContext& n);	115	bool doTaskScenarioEnd(QDomNode& n, ParserTreeContext& ptc);
116	bool doTaskScenarioMaxEnd(QDomNode& n, ParserTreeContext& n);	116	bool doTaskScenarioMaxEnd(QDomNode& n, ParserTreeContext& ptc);
117	bool doTaskScenarioMinEnd(QDomNode& n, ParserTreeContext& n);	117	bool doTaskScenarioMinEnd(QDomNode& n, ParserTreeContext& ptc);
118	bool doTaskScenarioMaxStart(QDomNode& n, ParserTreeContext& n);	118	bool doTaskScenarioMaxStart(QDomNode& n, ParserTreeContext& ptc);
119	bool doTaskScenarioMinStart(QDomNode& n, ParserTreeContext& n);	119	bool doTaskScenarioMinStart(QDomNode& n, ParserTreeContext& ptc);
120	bool doAllocate(QDomNode& n, ParserTreeContext& n);	120	bool doAllocate(QDomNode& n, ParserTreeContext& ptc);
121	bool doCandidate(QDomNode& n, ParserTreeContext& n);	121	bool doCandidate(QDomNode& n, ParserTreeContext& ptc);
122	bool doDepends(QDomNode& n, ParserTreeContext& n);	122	bool doDepends(QDomNode& n, ParserTreeContext& ptc);
123	bool doPrecedes(QDomNode& n, ParserTreeContext& n);	123	bool doPrecedes(QDomNode& n, ParserTreeContext& ptc);
124	bool doDependencyGapScenario(QDomNode& n, ParserTreeContext& ptc);	124	bool doDependencyGapScenario(QDomNode& n, ParserTreeContext& ptc);
125	bool doNote(QDomNode& n, ParserTreeContext& n);	125	bool doNote(QDomNode& n, ParserTreeContext& ptc);
126	bool doFlag(QDomNode& n, ParserTreeContext& n);	126	bool doFlag(QDomNode& n, ParserTreeContext& ptc);
127	bool doResourceBooking(QDomNode& n, ParserTreeContext& n);	127	bool doResourceBooking(QDomNode& n, ParserTreeContext& ptc);
128	bool doBooking(QDomNode& n, ParserTreeContext& n);	128	bool doBooking(QDomNode& n, ParserTreeContext& ptc);
129	bool doBookingPost(QDomNode& n, ParserTreeContext& n);	129	bool doBookingPost(QDomNode& n, ParserTreeContext& ptc);
130		130
131	QString masterFile;	131	QString masterFile;
132	Project* project;	132	Project* project;