comparison changesetscene.h @ 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
19 #define CHANGESETSCENE_H 19 #define CHANGESETSCENE_H
20 20
21 #include <QGraphicsScene> 21 #include <QGraphicsScene>
22 22
23 class ChangesetItem; 23 class ChangesetItem;
24 class Changeset;
24 class UncommittedItem; 25 class UncommittedItem;
25 class DateItem; 26 class DateItem;
26 27
27 class ChangesetScene : public QGraphicsScene 28 class ChangesetScene : public QGraphicsScene
28 { 29 {
44 void showSummary(); 45 void showSummary();
45 void showWork(); 46 void showWork();
46 47
47 void updateTo(QString id); 48 void updateTo(QString id);
48 void diffToParent(QString id, QString parent); 49 void diffToParent(QString id, QString parent);
50 void showSummary(Changeset *);
49 void diffToCurrent(QString id); 51 void diffToCurrent(QString id);
50 void mergeFrom(QString id); 52 void mergeFrom(QString id);
51 void tag(QString id); 53 void tag(QString id);
52 54
53 private slots: 55 private slots: