diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:56:04 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:56:04 -0600 |
| commit | 303e108109ce526c414e8770119134dcc2f2d7bd (patch) | |
| tree | 16e7fdb1b604f30ac7b9cb7bbaeae90c34f438a6 /src/mergeresultwindow.h | |
| parent | f3372e7bea9bbc288e039d85d660450220a637d8 (diff) | |
| download | kdiff3-303e108109ce526c414e8770119134dcc2f2d7bd.tar.gz kdiff3-303e108109ce526c414e8770119134dcc2f2d7bd.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit f3372e7bea9bbc288e039d85d660450220a637d8.
Diffstat (limited to 'src/mergeresultwindow.h')
| -rw-r--r-- | src/mergeresultwindow.h | 4 |
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; |