diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:09:35 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:09:35 -0600 |
| commit | c7e29c4606e72cf1d3d0052eec08805c8cf3fce7 (patch) | |
| tree | a20841af6b5c7f361530b5318594de081adb2772 /src/mergeresultwindow.h | |
| parent | 303e108109ce526c414e8770119134dcc2f2d7bd (diff) | |
| download | kdiff3-c7e29c4606e72cf1d3d0052eec08805c8cf3fce7.tar.gz kdiff3-c7e29c4606e72cf1d3d0052eec08805c8cf3fce7.zip | |
Rename old tq methods that no longer need a unique name
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 ed524a5..2b61e6f 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, - TotalDifftqStatus* pTotalDifftqStatus + TotalDiffStatus* pTotalDiffStatus ); void reset(); @@ -187,7 +187,7 @@ private: int m_sizeC; const Diff3LineList* m_pDiff3LineList; - TotalDifftqStatus* m_pTotalDifftqStatus; + TotalDiffStatus* m_pTotalDiffStatus; bool m_bPaintingAllowed; int m_delayedDrawTimer; |