# # # patch "guitone/src/model/Branches.cpp" # from [145442c130649fddb7681cdd4397fc88b4c551a7] # to [1f5feb6e9aa372f17613326cf1300152b95e2b5d] # # patch "guitone/src/model/GetFile.cpp" # from [ccc266ee947217de7eafa0f5c7923af0b75b77f1] # to [61381507195bc0a8a4c32208c62b3af5672fac7d] # # patch "guitone/src/util/MemoryTrack.h" # from [b3e3adc29975d860dcff268fcce83fc2bc0eeebd] # to [56f358cb76682e1e668b4b33574f4577065a0259] # ============================================================ --- guitone/src/model/Branches.cpp 145442c130649fddb7681cdd4397fc88b4c551a7 +++ guitone/src/model/Branches.cpp 1f5feb6e9aa372f17613326cf1300152b95e2b5d @@ -48,6 +48,7 @@ void Branches::parseOutput() void Branches::parseOutput() { + branches.setHorizontalHeaderItem(0, mtnew(QStandardItem, tr("Branches"))); if(tree) { ============================================================ --- guitone/src/model/GetFile.cpp ccc266ee947217de7eafa0f5c7923af0b75b77f1 +++ guitone/src/model/GetFile.cpp 61381507195bc0a8a4c32208c62b3af5672fac7d @@ -133,7 +133,7 @@ void GetFile::applyDiff(Diff * diff) } Q_ASSERT(line->state == DiffLine::Added); - + fileContents.insert( lineStart - 1, mtnew(ContentLine, line->content, ContentLine::Added) ============================================================ --- guitone/src/util/MemoryTrack.h b3e3adc29975d860dcff268fcce83fc2bc0eeebd +++ guitone/src/util/MemoryTrack.h 56f358cb76682e1e668b4b33574f4577065a0259 @@ -28,7 +28,16 @@ void writeUnfreed(); void mtTrackDelete(void *ptr); void writeUnfreed(); +#ifdef _MSC_VER +#define _VAARGSHACK +#endif + +#ifdef _VAARGSHACK +#define mtnew(type, ...) mtvaargshackfunc(type, new type(__VA_ARGS__)) +#define mtvaargshackfunc(type, thenew) (type*) mtTrackNew(sizeof(type), (void*) thenew, __FILE__, __LINE__) +#else #define mtnew(type, ...) (type*) mtTrackNew(sizeof(type), (void*) new type(__VA_ARGS__), __FILE__, __LINE__) +#endif #define mtdelete(ptr) { mtTrackDelete(ptr); delete ptr; } #else