Mercurial > hg > easyhg
comparison changesetscene.cpp @ 296:d40294e164da status_outside_tabs
Merge from the default branch
author | Chris Cannam |
---|---|
date | Tue, 22 Feb 2011 13:03:03 +0000 |
parents | 37f67999b661 |
children | 5b4aa1c24407 |
comparison
equal
deleted
inserted
replaced
287:3fbafca196e4 | 296:d40294e164da |
---|---|
42 connect(item, SIGNAL(diffToCurrent(QString)), | 42 connect(item, SIGNAL(diffToCurrent(QString)), |
43 this, SIGNAL(diffToCurrent(QString))); | 43 this, SIGNAL(diffToCurrent(QString))); |
44 | 44 |
45 connect(item, SIGNAL(diffToParent(QString, QString)), | 45 connect(item, SIGNAL(diffToParent(QString, QString)), |
46 this, SIGNAL(diffToParent(QString, QString))); | 46 this, SIGNAL(diffToParent(QString, QString))); |
47 | |
48 connect(item, SIGNAL(showSummary(Changeset *)), | |
49 this, SIGNAL(showSummary(Changeset *))); | |
47 | 50 |
48 connect(item, SIGNAL(mergeFrom(QString)), | 51 connect(item, SIGNAL(mergeFrom(QString)), |
49 this, SIGNAL(mergeFrom(QString))); | 52 this, SIGNAL(mergeFrom(QString))); |
50 | 53 |
51 connect(item, SIGNAL(tag(QString)), | 54 connect(item, SIGNAL(tag(QString)), |
113 { | 116 { |
114 foreach (QGraphicsItem *it, items()) { | 117 foreach (QGraphicsItem *it, items()) { |
115 ChangesetItem *csit = dynamic_cast<ChangesetItem *>(it); | 118 ChangesetItem *csit = dynamic_cast<ChangesetItem *>(it); |
116 if (csit && csit->getId() == id) return csit; | 119 if (csit && csit->getId() == id) return csit; |
117 } | 120 } |
121 return 0; | |
118 } | 122 } |
119 | 123 |
120 | 124 |