# # # patch "guitone/res/i18n/guitone_de.ts" # from [18cb7220ff9be6fc8d2646d61bd0bb825917958d] # to [ba2bb18b98b4f3c34893be1658da9e1ae926b51b] # # patch "guitone/src/model/Ancestors.cpp" # from [006522686b40da7d61dd6d240646b8562fed2fdd] # to [81d57af07ba418801dbf929278e71d5a8bf4262c] # # patch "guitone/src/model/ChangesetModel.cpp" # from [2a4cebeca509ccde439e1cc141a5e206bb1a755a] # to [4d2f708a0de95674dec1b8782b8c09ba6b579496] # ============================================================ --- guitone/res/i18n/guitone_de.ts 18cb7220ff9be6fc8d2646d61bd0bb825917958d +++ guitone/res/i18n/guitone_de.ts ba2bb18b98b4f3c34893be1658da9e1ae926b51b @@ -136,20 +136,25 @@ ChangesetModel - + Revision ID - Revisions-ID + Revisions-ID - + Date - Datum + Datum - + Author - Autor + Autor + + + Changelog + + ContentDiff ============================================================ --- guitone/src/model/Ancestors.cpp 006522686b40da7d61dd6d240646b8562fed2fdd +++ guitone/src/model/Ancestors.cpp 81d57af07ba418801dbf929278e71d5a8bf4262c @@ -145,8 +145,7 @@ QModelIndex Ancestors::index(int row, in return QModelIndex(); } - QString *rev = new QString(selRevisions->at(row)); - return createIndex(row, column, rev); + return createIndex(row, column, 0); } QModelIndex Ancestors::parent(const QModelIndex& index) const ============================================================ --- guitone/src/model/ChangesetModel.cpp 2a4cebeca509ccde439e1cc141a5e206bb1a755a +++ guitone/src/model/ChangesetModel.cpp 4d2f708a0de95674dec1b8782b8c09ba6b579496 @@ -51,9 +51,10 @@ void ChangesetModel::setBranch(QString b void ChangesetModel::setBranch(QString branch) { currentBranch = branch; - if(branchMap[currentBranch].revisions.count() == 0) + BranchInfo *branchInfo = &branchMap[currentBranch]; + if(branchInfo->revisions.count() == 0) { - branchMap[currentBranch].certsRead = 0; + branchInfo->certsRead = 0; GetBranchLog *glog = new GetBranchLog(branch, this); } else @@ -130,11 +131,12 @@ QVariant ChangesetModel::data(const QMod if (role == Qt::DisplayRole) { + BranchInfo branchInfo = branchMap[currentBranch]; int row = index.row(); - if (branchMap[currentBranch].revisions.count() > row) + if (branchInfo.revisions.count() > row) { int col = index.column(); - QString rev = branchMap[currentBranch].revisions[row]; + QString rev = branchInfo.revisions[row]; if(changesetMap[rev] == NULL) return QVariant(); switch(col) { @@ -197,8 +199,7 @@ QModelIndex ChangesetModel::index(int ro return QModelIndex(); } - QString *rev = new QString(branchMap[currentBranch].revisions[row]); - return createIndex(row, column, rev); + return createIndex(row, column, 0); } QModelIndex ChangesetModel::parent(const QModelIndex& index) const