summaryrefslogtreecommitdiffstats
path: root/src/mergeresultwindow.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mergeresultwindow.h')
-rw-r--r--src/mergeresultwindow.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mergeresultwindow.h b/src/mergeresultwindow.h
index 2b61e6f..ed524a5 100644
--- a/src/mergeresultwindow.h
+++ b/src/mergeresultwindow.h
@@ -110,7 +110,7 @@ public:
const LineData* pLineDataB, int sizeB,
const LineData* pLineDataC, int sizeC,
const Diff3LineList* pDiff3LineList,
- TotalDiffStatus* pTotalDiffStatus
+ TotalDifftqStatus* pTotalDifftqStatus
);
void reset();
@@ -187,7 +187,7 @@ private:
int m_sizeC;
const Diff3LineList* m_pDiff3LineList;
- TotalDiffStatus* m_pTotalDiffStatus;
+ TotalDifftqStatus* m_pTotalDifftqStatus;
bool m_bPaintingAllowed;
int m_delayedDrawTimer;