# # # patch "src/model/GetFileProxyModel.cpp" # from [c170278024f3d7d37bfd46266398d5cf39308ca1] # to [0756529c21b7ccf99a17ac2a7fee473cf6a97aa3] # # patch "src/model/GetFileProxyModel.h" # from [23c0b8575dafbb56f6c2ef4fc575d6e9887d700a] # to [160c9b398234711a4819583a49ea950f4ee62b8a] # ============================================================ --- src/model/GetFileProxyModel.cpp c170278024f3d7d37bfd46266398d5cf39308ca1 +++ src/model/GetFileProxyModel.cpp 0756529c21b7ccf99a17ac2a7fee473cf6a97aa3 @@ -21,19 +21,19 @@ #include "GetFileProxyModel.h" #include "GetFile.h" -GetFileProxyModel::GetFileProxyModel(QObject *parent) -: QSortFilterProxyModel(parent), version(Both) +GetFileProxyModel::GetFileProxyModel(QObject * parent) + : QSortFilterProxyModel(parent), version(Both) { } -GetFileProxyModel::~GetFileProxyModel(void) {} +GetFileProxyModel::~GetFileProxyModel() {} -bool GetFileProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const +bool GetFileProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex & sourceParent) const { - QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent); - ContentLine * line = static_cast(index.internalPointer()); + QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent); + ContentLine * line = static_cast(index.internalPointer()); - if (line->marker == ContentLine::Added && version == Left) + if (line->marker == ContentLine::Added && version == Left) return false; if (line->marker == ContentLine::Removed && version == Right) return false; ============================================================ --- src/model/GetFileProxyModel.h 23c0b8575dafbb56f6c2ef4fc575d6e9887d700a +++ src/model/GetFileProxyModel.h 160c9b398234711a4819583a49ea950f4ee62b8a @@ -27,17 +27,17 @@ public: { public: - explicit GetFileProxyModel(QObject * parent); - ~GetFileProxyModel(void); - bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const; + explicit GetFileProxyModel(QObject * parent); + ~GetFileProxyModel(void); + bool filterAcceptsRow(int sourceRow, const QModelIndex & sourceParent) const; enum FileVersion { Left, Right, Both }; - + void setFileVersion(FileVersion version); FileVersion fileVersion() const; - + private: - FileVersion version; + FileVersion version; }; #endif