From 98cf9d7bfff9d32c04f2273223b0bbc26155ea7d Mon Sep 17 00:00:00 2001
From: grimmd <none@none>
Date: Wed, 28 Mar 2001 04:27:16 +0000
Subject: [PATCH] Removed all references to DiffView

---
 Src/ChildFrm.cpp      | 1 -
 Src/MainFrm.cpp       | 1 -
 Src/Merge.cpp         | 1 -
 Src/MergeDoc.cpp      | 3 +--
 Src/MergeEditView.cpp | 6 +++---
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Src/ChildFrm.cpp b/Src/ChildFrm.cpp
index 12238b2c1..f74e9d06a 100644
--- a/Src/ChildFrm.cpp
+++ b/Src/ChildFrm.cpp
@@ -25,7 +25,6 @@
 #include "Merge.h"
 
 #include "ChildFrm.h"
-#include "DiffView.h"
 #include "MainFrm.h"
 #include "MergeEditView.h"
 
diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index a274d5284..8194d000c 100644
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -27,7 +27,6 @@
 #include <direct.h>
 #include "MainFrm.h"
 #include "ChildFrm.h"
-#include "DiffView.h"
 #include "DirView.h"
 #include "DirDoc.h"
 #include "OpenDlg.h"
diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index c28244d1e..d387e4ae2 100644
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -29,7 +29,6 @@
 #include "DirFrame.h"
 #include "MergeDoc.h"
 #include "DirDoc.h"
-#include "DiffView.h"
 #include "DirView.h"
 #include "Splash.h"
 #include "version.h"
diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index 27bf80ef3..175e7c994 100644
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -26,7 +26,6 @@
 #include "direct.h"
 
 #include "MainFrm.h"
-#include "DiffView.h"
 
 #include "diff.h"
 #include "getopt.h"
@@ -90,7 +89,7 @@ void CMergeDoc::DeleteContents ()
   CleanupTempFiles();
 }
 
-void CMergeDoc::OnFileEvent (WPARAM wEvent, LPCTSTR pszPathName)
+void CMergeDoc::OnFileEvent (WPARAM /*wEvent*/, LPCTSTR /*pszPathName*/)
 {
   /*if (!(theApp.m_dwFlags & EP_NOTIFY_CHANGES))
     return;
diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index c1929b936..ffc954407 100644
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -535,7 +535,7 @@ void CMergeEditView::OnAllLeft()
 	
 }
 
-void CMergeEditView::OnUpdateAllLeft(CCmdUI* pCmdUI) 
+void CMergeEditView::OnUpdateAllLeft(CCmdUI* /*pCmdUI*/) 
 {
 	// TODO: Add your command update UI handler code here
 	
@@ -547,7 +547,7 @@ void CMergeEditView::OnAllRight()
 	
 }
 
-void CMergeEditView::OnUpdateAllRight(CCmdUI* pCmdUI) 
+void CMergeEditView::OnUpdateAllRight(CCmdUI* /*pCmdUI*/) 
 {
 	// TODO: Add your command update UI handler code here
 	
@@ -616,7 +616,7 @@ void CMergeEditView::OnEditUndo()
 	
 }
 
-void CMergeEditView::OnUpdateEditUndo(CCmdUI* pCmdUI) 
+void CMergeEditView::OnUpdateEditUndo(CCmdUI* /*pCmdUI*/) 
 {
 	// TODO: Add your command update UI handler code here
 	
-- 
2.11.0