comparison src/connectionitem.h @ 516:2981d2defa61

Introduce a graphical representation for merge from a closed to an open branch (half a connection item)
author Chris Cannam
date Thu, 20 Oct 2011 12:04:47 +0100
parents b9c153e00e84
children 533519ebc0cb
comparison
equal deleted inserted replaced
515:fc35aa6d433e 516:2981d2defa61
48 ChangesetItem *child() { return m_child; } 48 ChangesetItem *child() { return m_child; }
49 49
50 void setParent(ChangesetItem *p) { m_parent = p; } 50 void setParent(ChangesetItem *p) { m_parent = p; }
51 void setChild(ChangesetItem *c) { m_child = c; } 51 void setChild(ChangesetItem *c) { m_child = c; }
52 void setChild(UncommittedItem *u) { m_uncommitted = u; } 52 void setChild(UncommittedItem *u) { m_uncommitted = u; }
53 void setMergedBranch(QString mb) { m_mergedBranch = mb; }
53 54
54 private: 55 private:
55 Type m_type; 56 Type m_type;
56 ChangesetItem *m_parent; 57 ChangesetItem *m_parent;
57 ChangesetItem *m_child; 58 ChangesetItem *m_child;
58 UncommittedItem *m_uncommitted; 59 UncommittedItem *m_uncommitted;
60 QString m_mergedBranch;
59 }; 61 };
60 62
61 #endif // CONNECTIONITEM_H 63 #endif // CONNECTIONITEM_H