Removed all references to DiffView

diff --git a/Src/ChildFrm.cpp b/Src/ChildFrm.cpp
index 12238b2..f74e9d0 100644 (file)
--- 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 a274d52..8194d00 100644 (file)
--- 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 c28244d..d387e4a 100644 (file)
--- 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 27bf80e..175e7c9 100644 (file)
--- 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 c1929b9..ffc9544 100644 (file)
--- 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