• R/O
  • SSH
  • HTTPS

tortoisesvn: コミット


コミットメタ情報

リビジョン28532 (tree)
日時2019-03-15 01:10:31
作者csware

ログメッセージ

Drop unused code

変更サマリ

差分

--- trunk/src/TortoiseMerge/BaseView.cpp (revision 28531)
+++ trunk/src/TortoiseMerge/BaseView.cpp (revision 28532)
@@ -1587,14 +1587,6 @@
15871587 return IsStateRemoved(state);
15881588 }
15891589
1590-bool CBaseView::IsViewLineConflicted(int nLineIndex)
1591-{
1592- if (m_pViewData == 0)
1593- return false;
1594- const DiffStates state = m_pViewData->GetState(nLineIndex);
1595- return IsStateConflicted(state);
1596-}
1597-
15981590 COLORREF CBaseView::InlineDiffColor(int nLineIndex)
15991591 {
16001592 return IsLineRemoved(nLineIndex) ? m_InlineRemovedBk : m_InlineAddedBk;
@@ -2713,15 +2705,6 @@
27132705 SelectNextBlock(1, true, false);
27142706 }
27152707
2716-void CBaseView::HighlightLines(int nStart, int nEnd /* = -1 */)
2717-{
2718- ClearSelection();
2719- SetupAllSelection(nStart, max(nStart, nEnd));
2720-
2721- UpdateCaretPosition(SetupPoint(0, nStart));
2722- Invalidate();
2723-}
2724-
27252708 void CBaseView::HighlightViewLines(int nStart, int nEnd /* = -1 */)
27262709 {
27272710 ClearSelection();
@@ -5188,12 +5171,6 @@
51885171 return m_Screen2View[screenLine].nViewSubLine;
51895172 }
51905173
5191-CBaseView::TScreenLineInfo CBaseView::Screen2View::GetScreenLineInfo( int screenLine )
5192-{
5193- RebuildIfNecessary();
5194- return m_Screen2View[screenLine];
5195-}
5196-
51975174 /**
51985175 doing partial rebuild, whole screen2view vector is built, but uses ScreenedViewLine cache to do it faster
51995176 */
@@ -5864,13 +5841,6 @@
58645841 }
58655842 }
58665843
5867-void CBaseView::OnToggleReadonly()
5868-{
5869- if (IsReadonlyChangable()) {
5870- SetWritable(IsReadonly());
5871- }
5872-}
5873-
58745844 int CBaseView::SaveFile(int nFlags)
58755845 {
58765846 Invalidate();
--- trunk/src/TortoiseMerge/BaseView.h (revision 28531)
+++ trunk/src/TortoiseMerge/BaseView.h (revision 28532)
@@ -127,7 +127,6 @@
127127 static void UpdateLocator() { if (m_pwndLocator) m_pwndLocator->DocumentUpdated(); }
128128 void WrapChanged();
129129
130- void HighlightLines(int start, int end = -1);
131130 void HighlightViewLines(int start, int end = -1);
132131 inline BOOL IsHidden() const {return m_bIsHidden;}
133132 inline void SetHidden(BOOL bHidden) {m_bIsHidden = bHidden;}
@@ -167,7 +166,6 @@
167166 bool IsLineRemoved(int nLineIndex);
168167 bool IsViewLineRemoved(int nViewLine);
169168 bool IsBlockWhitespaceOnly(int nLineIndex, bool& bIdentical, int& blockstart, int& blockend);
170- bool IsViewLineConflicted(int nLineIndex);
171169 bool HasNextConflict();
172170 bool HasPrevConflict();
173171 bool HasNextDiff();
@@ -344,7 +342,6 @@
344342 afx_msg void OnEditFindnextStart();
345343 afx_msg void OnEditFindprevStart();
346344 afx_msg void OnEditGotoline();
347- afx_msg void OnToggleReadonly();
348345
349346 DECLARE_MESSAGE_MAP()
350347
@@ -658,7 +655,6 @@
658655
659656 int GetViewLineForScreen(int screenLine);
660657 int GetSubLineOffset(int screenLine);
661- TScreenLineInfo GetScreenLineInfo(int screenLine);
662658 int FindScreenLineForViewLine(int viewLine);
663659 void ScheduleFullRebuild(CViewData * ViewData);
664660 void ScheduleRangeRebuild(CViewData * ViewData, int FirstViewLine, int LastViewLine);
--- trunk/src/TortoiseMerge/DiffData.cpp (revision 28531)
+++ trunk/src/TortoiseMerge/DiffData.cpp (revision 28532)
@@ -1,4 +1,4 @@
1-// TortoiseMerge - a Diff/Patch program
1+// TortoiseMerge - a Diff/Patch program
22
33 // Copyright (C) 2006-2017 - TortoiseSVN
44
@@ -689,7 +689,6 @@
689689 m_arDiff3LinesYour.Reserve(lengthHint);
690690 m_arDiff3LinesTheir.Reserve(lengthHint);
691691
692- CRegDWORD contextLines = CRegDWORD(L"Software\\TortoiseMerge\\ContextLines", 3);
693692 svn_diff_file_options_t * options = CreateDiffFileOptions(dwIgnoreWS, bIgnoreEOL, pool);
694693
695694 // convert CString filenames (UTF-16 or ANSI) to UTF-8
--- trunk/src/TortoiseMerge/SetMainPage.cpp (revision 28531)
+++ trunk/src/TortoiseMerge/SetMainPage.cpp (revision 28532)
@@ -250,12 +250,6 @@
250250 SetModified();
251251 }
252252
253-void CSetMainPage::OnBnClickedWhitespace()
254-{
255- m_bReloadNeeded = TRUE;
256- SetModified();
257-}
258-
259253 BOOL CSetMainPage::DialogEnableWindow(UINT nID, BOOL bEnable)
260254 {
261255 CWnd * pwndDlgItem = GetDlgItem(nID);
--- trunk/src/TortoiseMerge/SetMainPage.h (revision 28531)
+++ trunk/src/TortoiseMerge/SetMainPage.h (revision 28532)
@@ -1,4 +1,4 @@
1-// TortoiseMerge - a Diff/Patch program
1+// TortoiseMerge - a Diff/Patch program
22
33 // Copyright (C) 2006-2010, 2013-2014 - TortoiseSVN
44
@@ -51,7 +51,6 @@
5151
5252 afx_msg void OnModified();
5353 afx_msg void OnModifiedWithReload();
54- afx_msg void OnBnClickedWhitespace();
5554
5655 DECLARE_MESSAGE_MAP()
5756
--- trunk/src/TortoiseMerge/XSplitter.cpp (revision 28531)
+++ trunk/src/TortoiseMerge/XSplitter.cpp (revision 28532)
@@ -1,4 +1,4 @@
1-// TortoiseMerge - a Diff/Patch program
1+// TortoiseMerge - a Diff/Patch program
22
33 // Copyright (C) 2006, 2011, 2016 - TortoiseSVN
44
@@ -73,50 +73,6 @@
7373 return CSplitterWnd::OnSetCursor(pWnd, nHitTest, message);
7474 }
7575
76-BOOL CXSplitter::ReplaceView(int row, int col,CRuntimeClass * pViewClass,SIZE size)
77-{
78- CCreateContext context;
79- BOOL bSetActive;
80-
81- if ((GetPane(row, col)->IsKindOf(pViewClass)) != FALSE)
82- return FALSE;
83-
84- // Get pointer to CDocument object so that it can be used in the creation
85- // process of the new view
86- CDocument * pDoc= ((CView *)GetPane(row,col))->GetDocument();
87- CView * pActiveView=GetParentFrame()->GetActiveView();
88- if (!pActiveView || pActiveView == GetPane(row, col))
89- bSetActive=TRUE;
90- else
91- bSetActive=FALSE;
92-
93- // set flag so that document will not be deleted when view is destroyed
94- pDoc->m_bAutoDelete=FALSE;
95- // Delete existing view
96- ((CView *) GetPane(row,col))->DestroyWindow();
97- // set flag back to default
98- pDoc->m_bAutoDelete=TRUE;
99-
100- // Create new view
101- context.m_pNewViewClass=pViewClass;
102- context.m_pCurrentDoc=pDoc;
103- context.m_pNewDocTemplate = nullptr;
104- context.m_pLastView = nullptr;
105- context.m_pCurrentFrame = nullptr;
106-
107- CreateView(row,col,pViewClass,size, &context);
108-
109- CView * pNewView= (CView *)GetPane(row,col);
110-
111- if (bSetActive!=FALSE)
112- GetParentFrame()->SetActiveView(pNewView);
113-
114- RecalcLayout();
115- GetPane(row,col)->SendMessage(WM_PAINT);
116-
117- return TRUE;
118-}
119-
12076 void CXSplitter::HideRow(int nRowHide)
12177 {
12278 ASSERT_VALID( this );
--- trunk/src/TortoiseMerge/XSplitter.h (revision 28531)
+++ trunk/src/TortoiseMerge/XSplitter.h (revision 28532)
@@ -1,4 +1,4 @@
1-// TortoiseMerge - a Diff/Patch program
1+// TortoiseMerge - a Diff/Patch program
22
33 // Copyright (C) 2006, 2011 - TortoiseSVN
44
@@ -50,10 +50,6 @@
5050 */
5151 void LockBar(BOOL bState=TRUE) {m_bBarLocked=bState;}
5252 /**
53- * Replaces a view in the Splitter with another view.
54- */
55- BOOL ReplaceView(int row, int col,CRuntimeClass * pViewClass, SIZE size);
56- /**
5753 * Shows a splitter column which was previously hidden. Don't call
5854 * this method if the column is already visible! Check it first
5955 * with IsColumnHidden()
旧リポジトリブラウザで表示