Merge branch 'jl/DockingManager-fix-dock-2-float-tracking' (early part)

* 'jl/DockingManager-fix-dock-2-float-tracking' (early part): Finder: Fix a typo for the _nFoundFiles member.
npp-community · Oct 6, 2009 · 0ba3d8d · 0ba3d8d
2 parents 05dfeeb + 0aaee08
commit 0ba3d8d
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
@@ -195,7 +195,7 @@ class Finder : public DockingDlgInterface {
 		_ppEditView(NULL),
 		_pMainFoundInfos(&_foundInfos1),
 		_pMainMarkings(&_markings1),
-		nFoundFiles(0),
+		_nFoundFiles(0),
 		_lastFileHeaderPos(0),
 		_lastSearchHeaderPos(0)
 	{
@@ -246,7 +246,7 @@ protected :
 	SearchResultMarkings _MarkingsStruct;
 
 	ScintillaEditView _scintView;
-	unsigned int nFoundFiles;
+	unsigned int _nFoundFiles;
 
 	int _lastFileHeaderPos;
 	int _lastSearchHeaderPos;
@@ -2119,13 +2119,13 @@ void Finder::addFileHitCount(int count)
 	setFinderReadOnly(false);
 	_scintView.insertGenericTextFrom(_lastFileHeaderPos, text);
 	setFinderReadOnly(true);
-	nFoundFiles++;
+	_nFoundFiles++;
 }
 
 void Finder::addSearchHitCount(int count)
 {
 	TCHAR text[50];
-	wsprintf(text, TEXT(" (%i hits in %i files)"), count, nFoundFiles);
+	wsprintf(text, TEXT(" (%i hits in %i files)"), count, _nFoundFiles);
 	setFinderReadOnly(false);
 	_scintView.insertGenericTextFrom(_lastSearchHeaderPos, text);
 	setFinderReadOnly(true);
@@ -2173,7 +2173,7 @@ void Finder::beginNewFilesSearch()
 	_scintView.execute(SCI_SETCURRENTPOS, 0);
 	_pMainFoundInfos = _pMainFoundInfos == &_foundInfos1 ? &_foundInfos2 : &_foundInfos1;
 	_pMainMarkings = _pMainMarkings == &_markings1 ? &_markings2 : &_markings1;
-	nFoundFiles = 0;
+	_nFoundFiles = 0;
 
 	// fold all old searches (1st level only)
 	_scintView.collapse(searchHeaderLevel - SC_FOLDLEVELBASE, fold_collapse);