comparison historywidget.cpp @ 307:5b4aa1c24407 new-branches-with-status-outside-tabs

Merge branch status_outside_tabs into branch new-branches, and make a new branch
author Chris Cannam
date Mon, 28 Feb 2011 13:09:37 +0000
parents f7cdd5b31aed 7708149d252a
children 4811eb34e819
comparison
equal deleted inserted replaced
278:f7cdd5b31aed 307:5b4aa1c24407
139 139
140 foreach (Changeset *cs, csets) { 140 foreach (Changeset *cs, csets) {
141 m_newIds.insert(cs->id()); 141 m_newIds.insert(cs->id());
142 } 142 }
143 143
144 DEBUG << "addChangesets: " << csets.size() << " new changesets" << endl; 144 DEBUG << "addChangesets: " << csets.size() << " new changesets have ("
145 << m_changesets.size() << " already)" << endl;
145 146
146 csets << m_changesets; 147 csets << m_changesets;
147 m_changesets = csets; 148 m_changesets = csets;
148 } 149 }
149 150
275 this, SIGNAL(diffToCurrent(QString))); 276 this, SIGNAL(diffToCurrent(QString)));
276 277
277 connect(scene, SIGNAL(diffToParent(QString, QString)), 278 connect(scene, SIGNAL(diffToParent(QString, QString)),
278 this, SIGNAL(diffToParent(QString, QString))); 279 this, SIGNAL(diffToParent(QString, QString)));
279 280
281 connect(scene, SIGNAL(showSummary(Changeset *)),
282 this, SIGNAL(showSummary(Changeset *)));
283
280 connect(scene, SIGNAL(mergeFrom(QString)), 284 connect(scene, SIGNAL(mergeFrom(QString)),
281 this, SIGNAL(mergeFrom(QString))); 285 this, SIGNAL(mergeFrom(QString)));
282 286
283 connect(scene, SIGNAL(newBranch(QString)), 287 connect(scene, SIGNAL(newBranch(QString)),
284 this, SIGNAL(newBranch(QString))); 288 this, SIGNAL(newBranch(QString)));