OSDN Git Service

* Use standard order of header files
authorsdottaka <none@none>
Sat, 18 Jan 2014 12:33:26 +0000 (21:33 +0900)
committersdottaka <none@none>
Sat, 18 Jan 2014 12:33:26 +0000 (21:33 +0900)
commit1c815a86419d0c3937cb180621238e13e59f3723
tree9affc0c845c1d3d1f68b7edac8a383bdbfb48036
parentaa6a07aad8b5a075c1ef7c482b13a00a4d86ff31
* Use standard order of header files
* Reduce inter-module dependencies. Especially from MainFrm.h
* Move the following variables and functions in CMainFrame class to CMergeApp class:

SyncFileToVCS()
CreateBackup()
HandleReadonlySave()
ShowVSSError()
ShowHelp()
UpdateCodepageModule()
CheckinToClearCase()
OpenFileToExternalEditor()
InitializeSourceControlMembers()
SaveToVersionControl()
GetMainSyntaxColors()
OpenFileOrUrl()
m_strSaveAsPath
m_bEscShutdown
m_vssHelper
m_bClearCaseTool
m_bExitIfNoDiff
m_pLineFilters
m_strVssUser
m_strVssPassword
m_strVssDatabase
m_strCCComment
m_bCheckinVCS
m_CheckOutMulti
m_bVCProjSync
m_bVssSuppressPathCheck
m_strDescriptions
m_pSyntaxColors

* Remove
CMainFrame::CenterToMainFrame()
CMainFrame::SetMainIcon()
CMainFrame::GetMainSyntaxColors()

--HG--
branch : stable
113 files changed:
Src/7zCommon.cpp
Src/7zCommon.h
Src/AboutDlg.cpp
Src/CCPrompt.cpp
Src/ChildFrm.cpp
Src/Common/Bitmap.cpp
Src/Common/CMoveConstraint.cpp
Src/Common/DragDrop.cpp
Src/Common/ExConverter.cpp
Src/Common/LanguageSelect.cpp
Src/Common/Picture.cpp
Src/Common/PreferencesDlg.cpp
Src/Common/RegKey.cpp
Src/Common/RegKey.h
Src/Common/RegOptionsMgr.cpp
Src/Common/RegOptionsMgr.h
Src/Common/ShellFileOperations.cpp
Src/Common/ShellFileOperations.h
Src/Common/SuperComboBox.cpp
Src/Common/unicoder.cpp
Src/ConfigLog.cpp
Src/ConfirmFolderCopyDlg.cpp
Src/DiffTextBuffer.cpp
Src/DiffViewBar.cpp
Src/DiffViewBar.h
Src/DiffWrapper.h
Src/DirActions.cpp
Src/DirCmpReportDlg.cpp
Src/DirColsDlg.cpp
Src/DirCompProgressBar.cpp
Src/DirDoc.cpp
Src/DirFrame.cpp
Src/DirItem.h
Src/DirView.cpp
Src/DirView.h
Src/DirViewColHandler.cpp
Src/DirViewColItems.cpp
Src/EditorFilepathBar.cpp
Src/EncodingErrorBar.cpp
Src/FileActionScript.cpp
Src/FileFilter.cpp
Src/FileFilter.h
Src/FileFiltersDlg.cpp
Src/FileFiltersDlg.h
Src/FileOrFolderSelect.cpp
Src/FileOrFolderSelect.h
Src/FilepathEdit.cpp
Src/FilterList.h
Src/GhostTextBuffer.cpp
Src/HexMergeDoc.cpp
Src/HexMergeDoc.h
Src/HexMergeFrm.cpp
Src/HexMergeView.cpp
Src/LineFiltersDlg.cpp
Src/LoadSaveCodepageDlg.cpp
Src/LocationBar.cpp
Src/LocationView.cpp
Src/LocationView.h
Src/MainFrm.cpp
Src/MainFrm.h
Src/Merge.cpp
Src/Merge.h
Src/Merge.vcxproj.filters
Src/MergeApp.cpp
Src/MergeApp.h
Src/MergeDoc.cpp
Src/MergeDoc.h
Src/MergeDocDiffSync.cpp
Src/MergeDocEncoding.cpp
Src/MergeDocLineDiffs.cpp
Src/MergeEditView.cpp
Src/MergeEditView.h
Src/OpenDoc.cpp
Src/OpenFrm.cpp
Src/OpenView.cpp
Src/OpenView.h
Src/OptionsInit.cpp
Src/PatchDlg.cpp
Src/PatchTool.cpp
Src/PatchTool.h
Src/Plugins.cpp
Src/PluginsListDlg.cpp
Src/ProjectFilePathsDlg.cpp
Src/PropArchive.cpp
Src/PropBackups.cpp
Src/PropCodepage.cpp
Src/PropColors.cpp
Src/PropCompare.cpp
Src/PropCompareFolder.cpp
Src/PropEditor.cpp
Src/PropGeneral.cpp
Src/PropRegistry.cpp
Src/PropShell.cpp
Src/PropSyntaxColors.cpp
Src/PropTextColors.cpp
Src/PropVss.cpp
Src/SaveClosingDlg.cpp
Src/SelectUnpackerDlg.cpp
Src/SelectUnpackerDlg.h
Src/SharedFilterDlg.cpp
Src/SourceControl.cpp
Src/Splash.cpp
Src/TestFilterDlg.cpp
Src/VSSHelper.cpp
Src/VSSHelper.h
Src/VssPrompt.cpp
Src/WMGotoDlg.cpp
Src/codepage.cpp
Src/dllpstub.cpp
Src/markdown.cpp
Src/paths.cpp
Src/stringdiffs.cpp
Translations/WinMerge/English.pot