[Winmerge-svn] SF.net SVN: winmerge:[7485] branches/R2_14/Src

[<ge...@us...>]

Revision: 7485
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7485&view=rev
Author:   gerundt
Date:     2010-12-28 21:05:18 +0000 (Tue, 28 Dec 2010)

Log Message:
-----------
Don't edit file filters through FileFilterHelper. Removes CMainFrame dependency from FileFilterHelper.

Modified Paths:
--------------
    branches/R2_14/Src/FileFilterHelper.cpp
    branches/R2_14/Src/FileFilterHelper.h
    branches/R2_14/Src/FileFiltersDlg.cpp
    branches/R2_14/Src/FileFiltersDlg.h

Modified: branches/R2_14/Src/FileFilterHelper.cpp
===================================================================
--- branches/R2_14/Src/FileFilterHelper.cpp	2010-12-28 20:56:59 UTC (rev 7484)
+++ branches/R2_14/Src/FileFilterHelper.cpp	2010-12-28 21:05:18 UTC (rev 7485)
@@ -25,7 +25,6 @@
 #include "stdafx.h"
 #include "Ucs2Utf8.h"
 #include "UnicodeString.h"
-#include "MainFrm.h"
 #include "FilterList.h"
 #include "DirItem.h"
 #include "FileFilterMgr.h"
@@ -284,15 +283,6 @@
 }
 
 /**
- * @brief Open filter file to external editor for modifying.
- * @param [in] szFileFilterterPath Path of filter file to edit.
- */
-void FileFilterHelper::EditFileFilter(LPCTSTR szFileFilterPath)
-{
-	CMainFrame::OpenFileToExternalEditor(szFileFilterPath);
-}
-
-/**
  * @brief Load in all filter patterns in a directory (unless already in map).
  * @param [in,out] patternsLoaded Map where found filterfiles are added.
  * @param [in] sPattern Directory wildcard defining files to add to map as filter files.

Modified: branches/R2_14/Src/FileFilterHelper.h
===================================================================
--- branches/R2_14/Src/FileFilterHelper.h	2010-12-28 20:56:59 UTC (rev 7484)
+++ branches/R2_14/Src/FileFilterHelper.h	2010-12-28 21:05:18 UTC (rev 7485)
@@ -104,7 +104,6 @@
 
 	FileFilterMgr * GetManager() const;
 	void SetFileFilterPath(LPCTSTR szFileFilterPath);
-	void EditFileFilter(LPCTSTR szFileFilterPath);
 	void GetFileFilters(FILEFILTER_INFOLIST * filters, CString & selected) const;
 	CString GetFileFilterName(LPCTSTR filterPath) const;
 	CString GetFileFilterPath(LPCTSTR filterName) const;

Modified: branches/R2_14/Src/FileFiltersDlg.cpp
===================================================================
--- branches/R2_14/Src/FileFiltersDlg.cpp	2010-12-28 20:56:59 UTC (rev 7484)
+++ branches/R2_14/Src/FileFiltersDlg.cpp	2010-12-28 21:05:18 UTC (rev 7485)
@@ -236,11 +236,20 @@
 	if (sel > 0)
 	{
 		CString path = m_listFilters.GetItemText(sel, 2);
-		theApp.m_globalFileFilter.EditFileFilter(path);
+		EditFileFilter(path);
 	}
 }
 
 /**
+ * @brief Edit file filter in external editor.
+ * @param [in] path Full path to file filter to edit.
+ */
+void FileFiltersDlg::EditFileFilter(LPCTSTR path)
+{
+	CMainFrame::OpenFileToExternalEditor(path);
+}
+
+/**
  * @brief Edit selected filter when its double-clicked.
  * @param [in] pNMHDR List control item data.
  * @param [out] pResult Result of the action is returned in here.
@@ -450,7 +459,7 @@
 			ResMsgBox1(IDS_FILEFILTER_TMPL_COPY, templatePath.c_str(), MB_ICONERROR);
 			return;
 		}
-		theApp.m_globalFileFilter.EditFileFilter(s);
+		EditFileFilter(s);
 		FileFilterMgr *pMgr = theApp.m_globalFileFilter.GetManager();
 		int retval = pMgr->AddFilter(s);
 		if (retval == FILTER_OK)

Modified: branches/R2_14/Src/FileFiltersDlg.h
===================================================================
--- branches/R2_14/Src/FileFiltersDlg.h	2010-12-28 20:56:59 UTC (rev 7484)
+++ branches/R2_14/Src/FileFiltersDlg.h	2010-12-28 21:05:18 UTC (rev 7485)
@@ -63,6 +63,7 @@
 	void AddToGrid(int filterIndex);
 	bool IsFilterItemNone(int item) const;
 	void UpdateFiltersList();
+	void EditFileFilter(LPCTSTR path);
 
 // Overrides
 	// ClassWizard generated virtual function overrides


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.