Change recommended version of 7-Zip to 4.65
*/
-// ID line follows -- this is updated by SVN
-// $Id: 7zCommon.cpp 7169 2010-05-16 14:44:19Z jtuc $
#include "stdafx.h"
#include "7zCommon.h"
* @brief Implementation of the About-dialog.
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: AboutDlg.cpp 6380 2009-01-25 22:13:36Z kimmov $
#include "stdafx.h"
#include "AboutDlg.h"
* @brief Declaration file for CAboutDlg.
*
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-#ifndef _ABOUTDLG_H_
-#define _ABOUTDLG_H_
+#pragma once
#include "statlink.h"
#include "Picture.h"
afx_msg void OnDrawItem(int nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStruct);
afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
};
-
-#endif // _ABOUTDLG_H_
*
* @brief Implementation file for ClearCase dialog
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "stdafx.h"
#include "CCPromptDlg.h"
* @brief Declaration file for ClearCase dialog.
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#if !defined(AFX_CCPROMPTDLG_H__7ED564F2_CCB8_11D4_92BB_00B0D0221937__INCLUDED_)
-#define AFX_CCPROMPTDLG_H__7ED564F2_CCB8_11D4_92BB_00B0D0221937__INCLUDED_
+#pragma once
/**
* @brief A dialog for ClearCase checkout/checkin.
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_CCPROMPTDLG_H__7ED564F2_CCB8_11D4_92BB_00B0D0221937__INCLUDED_)
* @brief Implementation file for CChildFrame
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: ChildFrm.cpp 7075 2009-12-30 22:57:20Z kimmov $
#include "stdafx.h"
#include "ChildFrm.h"
* @brief interface of the CChildFrame class
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: ChildFrm.h 5446 2008-06-07 12:14:19Z jtuc $
-
-#if !defined(AFX_CHILDFRM_H__BBCD4F8E_34E4_11D1_BAA6_00A024706EDC__INCLUDED_)
-#define AFX_CHILDFRM_H__BBCD4F8E_34E4_11D1_BAA6_00A024706EDC__INCLUDED_
+#pragma once
#include "SplitterWndEx.h"
#include "MergeEditStatus.h"
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_CHILDFRM_H__BBCD4F8E_34E4_11D1_BAA6_00A024706EDC__INCLUDED_)
* @brief Implementation file for Bitmap helper functions.
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "StdAfx.h"
#include "Bitmap.h"
* @brief Declaration file for Bitmap helper functions.
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _BITMAP_H_
-#define _BITMAP_H_
+#pragma once
class CBitmap;
class CDC;
CBitmap *CopyRectToBitmap(CDC *pDC, const CRect & rect);
void DrawBitmap(CDC *pDC, int x, int y, CBitmap *pBitmap);
CBitmap *GetDarkenedBitmap(CDC *pDC, CBitmap *pBitmap);
-
-#endif // _BITMAP_H_
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-
-#ifndef CMoveConstraint_h
-#define CMoveConstraint_h
+#pragma once
#include <afxtempl.h>
};
} // namespace
-
-#endif // CMoveConstraint_h
-
-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-
-
-#ifndef CSubclass_h
-#define CSubclass_h
+#pragma once
namespace prdlg {
} // namespace
-
-#endif CSubclass_h
-
*
* @brief ClipBoard helper functions implementations.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "ClipBoard.h"
*
* @brief ClipBoard helper functions definitions.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _CLIPBOARD_H_
-#define _CLIPBOARD_H_
+#pragma once
#include <windows.h>
#include "UnicodeString.h"
bool PutToClipboard(const String & text, HWND currentWindowHandle);
bool GetFromClipboard(String & text, HWND currentWindowHandle);
-
-#endif // _CLIPBOARD_H_
* @brief Implementation file for CColorButton
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "stdafx.h"
#include "ColorButton.h"
*
* @brief Declaration file for CColorButton class
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#if !defined(AFX_COLORBUTTON_H__75623C05_2D2D_4FBE_B819_661F49DEAE94__INCLUDED_)
-#define AFX_COLORBUTTON_H__75623C05_2D2D_4FBE_B819_661F49DEAE94__INCLUDED_
+#pragma once
/**
* @brief Button showing currently selected color.
COLORREF GetColor() const { return m_clrFill; };
virtual void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct);
};
-
-#endif // !defined(AFX_COLORBUTTON_H__75623C05_2D2D_4FBE_B819_661F49DEAE94__INCLUDED_)
+#pragma once
+
#include "UnicodeString.h"
#include <windows.h>
#include <vector>
*
* @brief Codepage converter using external libraries.
*/
-// ID line follows -- this is updated by SVN
-// $Id: $
#include "ExConverter.h"
#include <windows.h>
-#ifndef _EXCONVERTER_H_
-#define _EXCONVERTER_H_
+#pragma once
#include "UnicodeString.h"
-
-
struct CodePageInfo
{
int codepage;
{
static IExconverter *getInstance();
};
-
-#endif
*
* @brief Implements the Language Selection dialog class (which contains the language data)
*/
-// ID line follows -- this is updated by SVN
-// $Id: LanguageSelect.cpp 6499 2009-02-25 13:31:52Z kimmov $
#include "StdAfx.h"
#include "LanguageSelect.h"
*
* @brief Declaration file for CLanguageSelect dialog.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#if !defined(AFX_LANGUAGESELECT_H__4395A84F_E8DF_11D1_BBCB_00A024706EDC__INCLUDED_)
-#define AFX_LANGUAGESELECT_H__4395A84F_E8DF_11D1_BBCB_00A024706EDC__INCLUDED_
+#pragma once
#include "CMoveConstraint.h"
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_LANGUAGESELECT_H__4395A84F_E8DF_11D1_BBCB_00A024706EDC__INCLUDED_)
*
* @brief Implementation of the MDITabBar class
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "StdAfx.h"
#include "MDITabBar.h"
* @brief Declaration file for MDITabBar
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef MDITABBAR_H
-#define MDITABBAR_H
+#pragma once
/**
* @brief Class for Tab bar.
int GetItemIndexFromPoint(CPoint pt) const;
void SwapTabs(int nIndexA, int nIndexB);
};
-
-#endif // MDITABBAR_H
* @brief Implementation of Options management classes
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: OptionsMgr.cpp 6728 2009-05-10 21:13:36Z kimmov $
/* The MIT License
* @brief Interface for Options management classes
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
/* The MIT License
Copyright (c) 2004-2009 Kimmo Varis
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-
-#ifndef _OPTIONS_MGR_
-#define _OPTIONS_MGR_
+#pragma once
#include <map>
#include "UnicodeString.h"
private:
static varprop::VariantValue m_emptyValue;
};
-
-#endif // _OPTIONS_MGR_
*
* @brief Main implementation file for CPidlContainer
*/
-// Revision ID line follows -- this is updated by SVN
-// $Id$
#include "PidlContainer.h"
#include <ShlObj.h>
*
* @brief Declaration of class CPidlContainer
*/
-//
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _PIDLCONTAINER_H_
-#define _PIDLCONTAINER_H_
+#pragma once
#include <ShTypes.h>
#include <vector>
typedef std::vector<LPITEMIDLIST> PidlContainer;
PidlContainer m_container; /**< stores items */
};
-
-#endif // _PIDLCONTAINER_H_
* (http://www.abstractspoon.com/) but is modified to use in
* WinMerge.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "StdAfx.h"
#include "PreferencesDlg.h"
* (http://www.abstractspoon.com/) but is modified to use in
* WinMerge.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-
-#if !defined(AFX_PREFERENCESDLG_H__C3FCC72A_6C69_49A6_930D_D5C94EC31298__INCLUDED_)
-#define AFX_PREFERENCESDLG_H__C3FCC72A_6C69_49A6_930D_D5C94EC31298__INCLUDED_
+#pragma once
#if _MSC_VER > 1000
#pragma once
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PREFERENCESDLG_H__C3FCC72A_6C69_49A6_930D_D5C94EC31298__INCLUDED_)
* (http://www.abstractspoon.com/) but is modified to use in
* WinMerge.
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-#if !defined(AFX_PROPERTYPAGEHOST_H__43CF5AE7_C70B_443D_BC8B_7DA1D0E082DD__INCLUDED_)
-#define AFX_PROPERTYPAGEHOST_H__43CF5AE7_C70B_443D_BC8B_7DA1D0E082DD__INCLUDED_
+#pragma once
#if _MSC_VER > 1000
#pragma once
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PROPERTYPAGEHOST_H__43CF5AE7_C70B_443D_BC8B_7DA1D0E082DD__INCLUDED_)
*
* @brief Implementation of CRegKeyEx C++ wrapper class for reading Windows registry
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#define NOMINMAX
#include "RegKey.h"
/**
- * @file RegKey.cpp
+ * @file RegKey.h
*
* @brief Declaration of CRegKeyEx C++ wrapper class for reading Windows registry
*/
-// ID line follows -- this is updated by SVN
-// $Id$
+#pragma once
#include <Windows.h>
#include "UnicodeString.h"
* @brief Implementation of Registry Options management class.
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "RegOptionsMgr.h"
#include <windows.h>
* @brief Declaration for Registry options class.
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-
-#ifndef _REG_OPTIONSMGR_H_
-#define _REG_OPTIONSMGR_H_
+#pragma once
#include <Windows.h>
#include "OptionsMgr.h"
String m_registryRoot; /**< Registry path where to store options. */
bool m_serializing;
};
-
-#endif // _REG_OPTIONSMGR_H_
*
* @brief Main implementation file for CShellContextMenu
*/
-// Revision ID line follows -- this is updated by SVN
-// $Id: ShellContextMenu.cpp 6106 2008-11-20 14:25:18Z kimmov $
#include "StdAfx.h"
#include "ShellContextMenu.h"
*
* @brief Declaration of class CShellContextMenu
*/
-//
-// ID line follows -- this is updated by SVN
-// $Id: ShellContextMenu.h 6106 2008-11-20 14:25:18Z kimmov $
-
-#ifndef _SHELLCONTEXTMENU_H_
-#define _SHELLCONTEXTMENU_H_
+#pragma once
#include <comdef.h>
#include <ShlObj.h>
const UINT m_cmdFirst; /**< minimum value for a menu item identifier */
const UINT m_cmdLast; /**< maximum value for a menu item identifier */
};
-
-#endif // _SHELLCONTEXTMENU_H_
*
* @brief Implementation of ShellFileOperations class.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "ShellFileOperations.h"
#include <windows.h>
*
* @brief Declaration file for ShellFileOperations class.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _SHELL_FILE_OPERATIONS_H_
-#define _SHELL_FILE_OPERATIONS_H_
+#pragma once
#include <vector>
#include <Windows.h>
bool m_bOneToOneMapping; /**< Same amount of sources and destinations? */
bool m_isCanceled; /**< Did user cancel the operation? */
};
-
-#endif // _SHELL_FILE_OPERATIONS_H_
*
* @brief Implementation of CSortHeaderCtrl
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-//////////////////////////////////////////////////////////////////////
#include "StdAfx.h"
#include "SortHeaderCtrl.h"
*
* @brief Declaration of CSortHeaderCtrl
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-//////////////////////////////////////////////////////////////////////
-
-
-#ifndef __SORTHEADERCTRL_H__
-#define __SORTHEADERCTRL_H__
-
+#pragma once
/////////////////////////////////////////////////////////////////////////////
// CSortHeaderCtrl
DECLARE_MESSAGE_MAP()
};
-
-#endif
-// __SORTHEADERCTRL_H__
* @brief Implementation file for CSplitterWndEx
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: SplitterWndEx.cpp 6500 2009-02-25 13:36:26Z kimmov $
//
//////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////
/**
* @file SplitterWndEx.h
*
* @brief Declaration of CSplitterWndEx class
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-//
-//////////////////////////////////////////////////////////////////////
-
-#if !defined(AFX_SPLITTERWNDEX_H__68D1F449_015D_4575_9094_FA5D8C98BE63__INCLUDED_)
-#define AFX_SPLITTERWNDEX_H__68D1F449_015D_4575_9094_FA5D8C98BE63__INCLUDED_
-
+#pragma once
class CSplitterWndEx : public CSplitterWnd
{
virtual void OnDrawSplitter(CDC* pDC, ESplitType nType, const CRect& rect);
DECLARE_MESSAGE_MAP()
};
-
-#endif // !defined(AFX_SPLITTERWNDEX_H__68D1F449_015D_4575_9094_FA5D8C98BE63__INCLUDED_)
-#if !defined(AFX_SuperComboBox_H__8027D162_6B2C_11D1_BAEE_00A024706EDC__INCLUDED_)
-#define AFX_SuperComboBox_H__8027D162_6B2C_11D1_BAEE_00A024706EDC__INCLUDED_
+#pragma once
#if _MSC_VER >= 1000
#pragma once
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SuperComboBox_H__8027D162_6B2C_11D1_BAEE_00A024706EDC__INCLUDED_)
*
* @brief Implementation of the ToolBarXPThemes class
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id$
#include "StdAfx.h"
#include "ToolbarXPThemes.h"
* @brief Declaration file for ToolBarXPThemes
*
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-#ifndef _TOOLBAR_XPTHEMES_H_
-#define _TOOLBAR_XPTHEMES_H_
+#pragma once
/**
* @brief Toolbar class supporting XP themes.
DECLARE_MESSAGE_MAP()
};
-
-#endif // _TOOLBAR_XPTHEMES_H_
* @brief Implementation of Unicode enabled file classes.
* Classes include memory-mapped reader class and Stdio replacement class.
*/
-// ID line follows -- this is updated by SVN
-// $Id: UniFile.cpp 7056 2009-12-26 19:49:14Z kimmov $
/* The MIT License
Copyright (c) 2003 Perry Rapp
*
* @brief Declaration of Unicode file classes.
*/
-// ID line follows -- this is updated by SVN
-// $Id: UniFile.h 7056 2009-12-26 19:49:14Z kimmov $
-
-#ifndef UniFile_h_included
-#define UniFile_h_included
+#pragma once
#include "unicoder.h"
#include <cstdint>
int64_t m_data; // offset after any initial BOM
ucr::buffer m_ucrbuff;
};
-
-
-
-#endif // UniFile_h_included
*
* @brief String utilities.
*/
-// ID line follows -- this is updated by SVN
-// $Id: UnicodeString.cpp 7170 2010-05-16 15:19:15Z jtuc $
// String formatting code originally from Paul Senzee:
// http://www.senzee5.com/2006/05/c-formatting-stdstring.html
* @brief Unicode string based on std::wstring.
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _UNICODE_STRING_
-#define _UNICODE_STRING_
+#pragma once
#include <string>
#include <cstdarg>
}
return result;
}
-
-#endif // _UNICODE_STRING_
* @brief Common routines
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: coretools.cpp 7168 2010-05-16 13:45:23Z jtuc $
#include "coretools.h"
#ifdef _WIN32
*
* @brief Declaration file for Coretools.cpp
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef CORETOOLS_H
-#define CORETOOLS_H
+#pragma once
#include "UnicodeString.h"
void replace_char(TCHAR *s, int target, int repl);
size_t linelen(const char *string, size_t maxlen);
-
-#endif
-#ifndef CORETYPES_H
-#define CORETYPES_H
+#pragma once
#ifndef countof
#define countof(array) (sizeof(array)/sizeof((array)[0]))
#endif /* countof */
-#endif
important to be able to build 64-bit now.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#if defined(_MSC_VER)&&!defined(NO_ALLOCA_RECOVERY)||defined(ALLOCA_RECOVERY)
#undef ALLOCA_RECOVERY
-#ifndef __DLLPROXY_H__
-#define __DLLPROXY_H__
+#pragma once
struct DllProxy_ModuleState
{
extern struct {HMODULE DLL;CHAR SIG[sizeof#P MODULE + (sizeof MODULE == 1 ? MAX_PATH : 0)];} __declspec(dllimport) NAME;
#undef POLARITY
-
-#endif //__DLLPROXY_H__
\ No newline at end of file
2004/01/08 Perry Updated function comment preceding ReportError
2008/01/22 Kimmo Changed map argument name to disp_map to not confuse VC6
*/
-// ID line follows -- this is updated by SVN
-// $Id: lwdisp.c 4938 2008-01-22 13:54:38Z kimmov $
//#define _WIN32_IE 0x0300
//#define _WIN32_WINNT 0x0400
========== ================== ================================================
2003/11/28 Laoran header and RCS ID
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef __LWDISP_H__
-#define __LWDISP_H__
+#pragma once
#ifdef __cplusplus
extern "C"{
// Sorry, no extra support for plain old C...
#endif
-
-#endif //__LWDISP_H__
-#ifndef _MEMDC_H_
-#define _MEMDC_H_
+#pragma once
//////////////////////////////////////////////////
// CMemDC - memory DC
return this;
}
};
-
-#endif
\ No newline at end of file
*
* @date Created: 2003-11-24
*/
-// ID line follows -- this is updated by SVN
-// $Id: multiformatText.cpp 7082 2010-01-03 22:15:50Z sdottaka $
#define NOMINMAX
#include "multiformatText.h"
*
* @date Created: 2003-11-24
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id: multiformatText.h 6433 2009-02-10 19:00:27Z kimmov $
-
-#ifndef __MULTIFORMATTEXT_H__
-#define __MULTIFORMATTEXT_H__
+#pragma once
#include "UnicodeString.h"
#include "unicoder.h"
/// Convert file to UTF-8 (for diffutils)
bool AnyCodepageToUTF8(int codepage, const String& filepath, const String& filepathDst, int & nFileChanged, bool bWriteBOM);
-
-#endif //__MULTIFORMATTEXT_H__
*
* @brief Implementation of utility unicode conversion routines
*/
-// ID line follows -- this is updated by SVN
-// $Id: unicoder.cpp 7024 2009-10-22 18:26:45Z kimmov $
/* The MIT License
Copyright (c) 2003 Perry Rapp
*
* @brief Declaration of utility unicode conversion routines
*/
-// ID line follows -- this is updated by SVN
-// $Id: unicoder.h 6936 2009-07-26 17:17:18Z kimmov $
-
-#ifndef unicoder_h_included
-#define unicoder_h_included
+#pragma once
#include "UnicodeString.h"
#include "codepage.h"
bool EqualCodepages(int cp1, int cp2);
} // namespace ucr
-
-#endif // unicoder_h_included
-
*
* @brief Implementation of generic named property classes
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-//////////////////////////////////////////////////////////////////////
#include "varprop.h"
#include <cassert>
*
* @brief Declaration of generic named property classes
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-//////////////////////////////////////////////////////////////////////
-
-#ifndef varprop_h_included
-#define varprop_h_included
+#pragma once
#include <ctime>
#include "UnicodeString.h"
};
} // namespace
-
-#endif // varprop_h_included
*
* @brief Implementation of CVersionInfo class
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "version.h"
#include <windows.h>
*
* @brief Declaration of CVersionInfo class
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef VERSIONTOOLS_H
-#define VERSIONTOOLS_H
+#pragma once
#include <shlwapi.h>
#include <memory>
void QueryValue(LPCTSTR szId, String& s);
BOOL GetCodepageForLanguage(WORD wLanguage, WORD & wCodePage);
};
-
-
-#endif
-
-/*******************************************************************************
- END OF FILE
-*******************************************************************************/
-
*
* @brief Implementation file for BinaryCompare
*/
-// ID line follows -- this is updated by SVN
-// $Id: BinaryCompare.cpp 7153 2010-05-04 18:11:48Z kimmov $
#include "BinaryCompare.h"
#include "DiffItem.h"
*
* @brief Declaration file for BinaryCompare compare engine.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _BINARY_COMPARE_H_
-#define _BINARY_COMPARE_H_
+#pragma once
struct DIFFITEM;
class PathContext;
};
} // namespace CompareEngines
-
-#endif // _BINARY_COMPARE_H_
*
* @brief Implements ByteComparator class.
*/
-// ID line follows -- this is updated by SVN
-// $Id: ByteComparator.cpp 7090 2010-01-11 19:48:26Z kimmov $
#include "ByteComparator.h"
#include <cassert>
*
* @brief Declaration file for ByteComparator class.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef ByteComparator_h_included
-#define ByteComparator_h_included
+#pragma once
#include <cstdint>
};
} // namespace CompareEngines
-
-#endif // ByteComparator_h_included
*
* @brief Implementation file for ByteCompare
*/
-// ID line follows -- this is updated by SVN
-// $Id: ByteCompare.cpp 6932 2009-07-26 14:04:31Z kimmov $
#include "ByteCompare.h"
#include <cassert>
*
* @brief Declaration file for ByteCompare
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _BYTE_COMPARE_H_
-#define _BYTE_COMPARE_H_
+#pragma once
#include <memory>
#include "FileTextStats.h"
};
} // namespace CompareEngines
-
-#endif // _BYTE_COMPARE_H_
*
* @brief Implementation file for DiffUtils class.
*/
-// ID line follows -- this is updated by SVN
-// $Id: DiffUtils.cpp 6932 2009-07-26 14:04:31Z kimmov $
#include "diff.h"
#include "DiffUtils.h"
*
* @brief Declaration of DiffUtils class.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-
-#ifndef _DIFF_UTILS_H_
-#define _DIFF_UTILS_H_
+#pragma once
#include <memory>
} // namespace CompareEngines
-
-#endif // _DIFF_UTILS_H_
*
* @brief Implementation file for TimeSizeCompare
*/
-// ID line follows -- this is updated by SVN
-// $Id: TimeSizeCompare.cpp 7153 2010-05-04 18:11:48Z kimmov $
#include "TimeSizeCompare.h"
#include <cstdlib>
*
* @brief Declaration file for TimeSizeCompare compare engine.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _TIMESIZE_COMPARE_H_
-#define _TIMESIZE_COMPARE_H_
+#pragma once
struct DIFFITEM;
};
} // namespace CompareEngines
-
-#endif // _TIMESIZE_COMPARE_H_
*
* @brief Compare options implementation.
*/
-// ID line follows -- this is updated by SVN
-// $Id: ByteComparator.h 3397 2006-07-27 10:41:24Z kimmov $
#include "CompareOptions.h"
#include "diff.h"
*
* @brief Compare options classes and types.
*/
-// ID line follows -- this is updated by SVN
-// $Id: CompareOptions.h 5920 2008-09-07 16:15:10Z marcelgosselin $
-
-#ifndef CompareOptions_h_included
-#define CompareOptions_h_included
+#pragma once
/**
* @brief Whether to ignore whitespace (or to ignore changes in whitespace)
bool m_bStopAfterFirstDiff; /**< Optimize compare by stopping after first difference? */
};
-
-#endif // CompareOptions_h_included
*
* @brief Implementation file for CompareStatisticsDlg dialog
*/
-// ID line follows -- this is updated by SVN
-// $Id: CompareStatisticsDlg.cpp 5293 2008-04-14 05:58:23Z kimmov $
#include "stdafx.h"
#include "CompareStatisticsDlg.h"
*
* @brief Declaration file for CompareStatisticsDlg dialog
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _COMPARESTATISTICSDLG_H_
-#define _COMPARESTATISTICSDLG_H_
+#pragma once
class CompareStats;
private:
const CompareStats * m_pCompareStats; /**< Compare statistics structure. */
};
-
-#endif // _COMPARESTATISTICSDLG_H_
*
* @brief Implementation of CompareStats class.
*/
-// ID line follows -- this is updated by SVN
-// $Id: CompareStats.cpp 6945 2009-08-05 03:34:52Z marcelgosselin $
#include "CompareStats.h"
#include <cassert>
*
* @brief Declaration of class CompareStats
*/
-//
-// ID line follows -- this is updated by SVN
-// $Id: CompareStats.h 6914 2009-07-12 22:31:23Z kimmov $
-
-#ifndef _COMPARESTATS_H_
-#define _COMPARESTATS_H_
+#pragma once
#define POCO_NO_UNWINDOWS 1
#include <Poco/Mutex.h>
bool m_bCompareDone; /**< Have we finished last compare? */
int m_nDirs; /**< number of directories to compare */
};
-
-#endif // _COMPARESTATS_H_
*
* @brief CConfigLog implementation
*/
-// ID line follows -- this is updated by SVN
-// $Id: ConfigLog.cpp 7082 2010-01-03 22:15:50Z sdottaka $
#include "ConfigLog.h"
#include <cassert>
*
* @brief Declaration file ConfigLog class
*/
-// ID line follows -- this is updated by SVN
-// $Id: ConfigLog.h 7059 2009-12-27 00:06:59Z kimmov $
+#pragma once
-#ifndef _CONFIGLOG_H_
-#define _CONFIGLOG_H_
#include "UnicodeString.h"
#include <memory>
String m_sFileName;
std::unique_ptr<UniStdioFile> m_pfile;
};
-
-#endif /* _CONFIGLOG_H_ */
\ No newline at end of file
*
* @brief Implementation file for ConfirmFolderCopyDlg dialog
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "stdafx.h"
#include "ConfirmFolderCopyDlg.h"
*
* @brief Declaration file for ConfirmFolderCopyDlg dialog
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _CONFIRM_FOLDER_COPY_DLG_H_
-#define _CONFIRM_FOLDER_COPY_DLG_H_
+#pragma once
#include "CMoveConstraint.h"
private:
prdlg::CMoveConstraint m_constraint; //*< Resizes dialog controls when dialog resized */
};
-
-#endif // _CONFIRM_FOLDER_COPY_DLG_H_
*
* @brief Implementation for conflict file parser.
*/
-// ID line follows -- this is updated by SVN
-// $Id: ConflictFileParser.cpp 6638 2009-04-03 23:17:42Z sdottaka $
// Conflict file parsing method modified from original code got from:
// TortoiseCVS - a Windows shell extension for easy version control
*
* @brief Declaration ConflictFileParser.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
// Conflict file parsing method modified from original code got from:
// TortoiseCVS - a Windows shell extension for easy version control
// Copyright (C) 2000 - Francis Irving
// <francis@flourish.org> - January 2001
-#ifndef _CONFLICT_FILE_PARSER_H_
-#define _CONFLICT_FILE_PARSER_H_
+#pragma once
#include "UnicodeString.h"
bool ParseConflictFile(const String& conflictFileName,
const String& workingCopyFileName, const String& newRevisionFileName,
int iGuessEncodingType, bool &nestedConflicts);
-
-#endif // _CONFLICT_FILE_PARSER_H_
* @brief WinMerge constants, URLs, paths etc.
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: Constants.h 6729 2009-05-11 07:14:59Z kimmov $
-
-#ifndef _CONSTANTS_H_
-#define _CONSTANTS_H_
+#pragma once
/** @brief URL for hyperlink in About-dialog. */
const TCHAR WinMergeURL[] = _T("http://winmerge.org/");
FFILEOPEN_SETFOCUS = 0x0040, /**< Set focus to this pane */
FFILEOPEN_AUTOMERGE = 0x0080, /**< auto-merge at this pane */
};
-
-#endif // _CONSTANTS_H_
-#ifndef __DIFF3_H__\r
-#define __DIFF3_H__\r
+#pragma once\r
\r
#include <vector>\r
#include <algorithm>\r
\r
return diff3i;\r
}\r
-\r
-#endif\r
*
* @brief Implementation of CDiffContext
*/
-// ID line follows -- this is updated by SVN
-// $Id: DiffContext.cpp 7063 2009-12-27 15:28:16Z kimmov $
-//////////////////////////////////////////////////////////////////////
#include "DiffContext.h"
#include <Poco/ScopedLock.h>
*
* @brief Declarations of CDiffContext and diff structures
*/
-// ID line follows -- this is updated by SVN
-// $Id: DiffContext.h 6910 2009-07-12 09:06:54Z kimmov $
-
-#if !defined(AFX_DIFFCONTEXT_H__D3CC86BE_F11E_11D2_826C_00A024706EDC__INCLUDED_)
-#define AFX_DIFFCONTEXT_H__D3CC86BE_F11E_11D2_826C_00A024706EDC__INCLUDED_
#pragma once
+
#define POCO_NO_UNWINDOWS 1
#include <Poco/Mutex.h>
#include <Poco/ThreadLocal.h>
IAbortable *m_piAbortable; /**< Interface for aborting the compare. */
Poco::FastMutex m_mutex;
};
-
-#endif // !defined(AFX_DIFFCONTEXT_H__D3CC86BE_F11E_11D2_826C_00A024706EDC__INCLUDED_)
*
* @date Created: 2003-08-22
*/
-// ID line follows -- this is updated by SVN
-// $Id: DiffFileData.cpp 7162 2010-05-15 13:14:27Z jtuc $
#include "DiffFileData.h"
#include <vector>
*
* @date Created: 2003-08-22
*/
-// ID line follows -- this is updated by SVN
-// $Id: DiffFileData.h 5055 2008-02-19 18:35:40Z kimmov $
-
-#ifndef _DIFFFILEDATA_H_
-#define _DIFFFILEDATA_H_
+#pragma once
#include "FileLocation.h"
#include "FileTextStats.h"
private:
bool DoOpenFiles();
};
-
-#endif // _DIFFFILEDATA_H_
*
* @brief Implementation for DiffFileInfo routines
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "DiffFileInfo.h"
*
* @brief Declaration file for DiffFileInfo
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _DIFF_FILE_INFO_H_INCLUDED
-#define _DIFF_FILE_INFO_H_INCLUDED
+#pragma once
#include "DirItem.h"
#include "FileTextEncoding.h"
void ClearPartial();
bool IsEditableEncoding() const;
};
-
-#endif // _DIFF_FILE_INFO_H_INCLUDED
*
* @brief Implementation of DIFFITEM
*/
-// ID line follows -- this is updated by SVN
-// $Id: DiffItem.cpp 7063 2009-12-27 15:28:16Z kimmov $
#include "DiffItem.h"
#include "paths.h"
*
* @brief Declaration of DIFFITEM
*/
-// ID line follows -- this is updated by SVN
-// $Id: DiffItem.h 7063 2009-12-27 15:28:16Z kimmov $
-
-#ifndef _DIFF_ITEM_H_
-#define _DIFF_ITEM_H_
+#pragma once
#include "ListEntry.h"
#include "DiffFileInfo.h"
bool HasChildren() const;
void RemoveChildren();
};
-
-#endif // _DIFF_ITEM_H_
*
* @brief Implementation of DiffItemList
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "DiffItemList.h"
#include <cassert>
assert(diffpos);
DIFFITEM & di = GetDiffRefAt(diffpos);
di.customFlags1 = flag;
-}
\ No newline at end of file
+}
*
* @brief Declaration of DiffItemList
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _DIFF_ITEM_LIST_H_
-#define _DIFF_ITEM_LIST_H_
+#pragma once
#include "DiffItem.h"
#include <cstdint>
{
return *reinterpret_cast<DIFFITEM *>(diffpos);
}
-
-#endif // _DIFF_ITEM_LIST_H_
*
* @brief Implementation file for DiffList class
*/
-// ID line follows -- this is updated by SVN
-// $Id: DiffList.cpp 7105 2010-01-14 21:14:22Z kimmov $
#include "DiffList.h"
#include <cassert>
default:
return -1;
}
-}
\ No newline at end of file
+}
*
* @brief Declaration file for DiffList class
*/
-// ID line follows -- this is updated by SVN
-// $Id: DiffList.h 6705 2009-04-23 20:18:39Z kimmov $
-
-#ifndef _DIFFLIST_H_
-#define _DIFFLIST_H_
+#pragma once
#include <map>
#include <vector>
int m_lastSignificantRightOnly;
int m_lastSignificantConflict;
};
-
-#endif // _DIFFLIST_H_
* @brief Implementation file for CDiffTextBuffer
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: DiffTextBuffer.cpp 7082 2010-01-03 22:15:50Z sdottaka $
#include "StdAfx.h"
#include "DiffTextBuffer.h"
*
* @brief Declaration of CDiffTextBuffer class
*/
-// ID line follows -- this is updated by SVN
-// $Id: DiffTextBuffer.h 6879 2009-06-29 10:00:33Z kimmov $
-
-#ifndef _DIFFTEXT_BUFFER_H_
-#define _DIFFTEXT_BUFFER_H_
+#pragma once
#include "GhostTextBuffer.h"
#include "FileTextEncoding.h"
virtual void OnNotifyLineHasBeenEdited(int nLine);
bool IsInitialized() const;
};
-
-#endif // _DIFFTEXT_BUFFER_H_
*
* @brief Code for DiffThread class
*/
-// ID line follows -- this is updated by SVN
-// $Id: DiffThread.cpp 6910 2009-07-12 09:06:54Z kimmov $
#include "DiffThread.h"
#include <cassert>
*
* @brief Declaration file for CDiffThread
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _DIFFTHREAD_H
-#define _DIFFTHREAD_H
+#pragma once
#include <memory>
#define POCO_NO_UNWINDOWS 1
bool m_bAborting; /**< Is compare aborting? */
bool m_bOnlyRequested; /**< Are we comparing only requested items (Update?) */
};
-
-#endif /* _DIFFTHREAD_H */
-//////////////////////////////////////////////////////////////////////
/**
* @file DiffViewBar.cpp
*
* @brief Implementation file for CDiffViewBar
*
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-//
-//////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include "DiffViewBar.h"
-//////////////////////////////////////////////////////////////////////
/**
* @file DiffViewBar.h
*
* @brief Declaration of CDiffViewBar class
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-//
-//////////////////////////////////////////////////////////////////////
-
-#ifndef DIFFVIEWBAR_H
-#define DIFFVIEWBAR_H
-
+#pragma once
#include "sizecbar.h"
#include "scbarcf.h"
HWND m_hwndFrame; //*< Frame window handle */
};
-
-
-#endif // DIFFVIEWBAR_H
*
* @date Created: 2003-08-22
*/
-// ID line follows -- this is updated by SVN
-// $Id: DiffWrapper.cpp 7091 2010-01-11 20:27:43Z kimmov $
#define NOMINMAX
#include "DiffWrapper.h"
*
* @date Created: 2003-08-22
*/
-// ID line follows -- this is updated by SVN
-// $Id: DiffWrapper.h 7091 2010-01-11 20:27:43Z kimmov $
-
-#ifndef _DIFFWRAPPER_H
-#define _DIFFWRAPPER_H
+#pragma once
#include <memory>
#include "diff.h"
std::unique_ptr<FilterCommentsManager> m_FilterCommentsManager; /**< Comments filtering manager */
bool m_bPluginsEnabled; /**< Are plugins enabled? */
};
-
-
-#endif // _DIFFWRAPPER_H
*
* @brief Implementation of methods of CDirView that copy/move/delete files
*/
-// ID line follows -- this is updated by SVN
-// $Id: DirActions.cpp 6572 2009-03-18 18:51:20Z kimmov $
// It would be nice to make this independent of the UI (CDirView)
// but it needs access to the list of selected items.
* @brief Implementation file for DirCmpReport
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: DirCmpReport.cpp 7082 2010-01-03 22:15:50Z sdottaka $
-//
#include "stdafx.h"
#include <ctime>
* @brief Declaration file for DirCmpReport.
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _DIRCMPREPORT_H_
-#define _DIRCMPREPORT_H_
+#pragma once
#include <vector>
#include "UnicodeString.h"
IFileCmpReport *m_pFileCmpReport;
bool m_bIncludeFileCmpReport;
};
-
-#endif // _DIRCMPREPORT_H_
* @brief Implementation file for DirCmpReport dialog
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-//
#include "stdafx.h"
#include "DirCmpReportDlg.h"
* @brief Declaration file for DirCmpReport Dialog.
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _DIRCMPREPORTDLG_H_
-#define _DIRCMPREPORTDLG_H_
+#pragma once
#include "DirReportTypes.h"
#include "SuperComboBox.h"
BOOL m_bIncludeFileCmpReport; /**< Do we include file compare report in folder compare report? */
//}}AFX_DATA
};
-
-#endif // _DIRCMPREPORTDLG_H_
*
* @date Created: 2003-08-19
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "stdafx.h"
*
* @date Created: 2003-08-19
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-
-#if !defined(AFX_DIRCOLSDLG_H__2FCB576C_C609_4623_8C55_F3870F22CA0B__INCLUDED_)
-#define AFX_DIRCOLSDLG_H__2FCB576C_C609_4623_8C55_F3870F22CA0B__INCLUDED_
#pragma once
#include <vector>
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_DIRCOLSDLG_H__2FCB576C_C609_4623_8C55_F3870F22CA0B__INCLUDED_)
*
* @brief Implementation file for Directory compare state dialog
*/
-// ID line follows -- this is updated by SVN
-// $Id: DirCompProgressBar.cpp 4596 2007-10-07 09:44:06Z jtuc $
#include "stdafx.h"
#include "DirCompProgressBar.h"
*
* @brief Declaration file for Directory compare statusdialog class
*/
-// ID line follows -- this is updated by SVN
-// $Id: DirCompProgressBar.h 5444 2008-06-07 06:48:49Z kimmov $
-
-#if !defined(AFX_DIRCOMPPROGRESSBAR_H__8F66C090_C232_429F_A4A2_18D43CCC6C38__INCLUDED_)
-#define AFX_DIRCOMPPROGRESSBAR_H__8F66C090_C232_429F_A4A2_18D43CCC6C38__INCLUDED_
+#pragma once
#include "CompareStats.h"
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_DIRCOMPPROGRESSBAR_H__8F66C090_C232_429F_A4A2_18D43CCC6C38__INCLUDED_)
-
* @brief Implementation file for CDirDoc
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: DirDoc.cpp 6910 2009-07-12 09:06:54Z kimmov $
-//
#include "StdAfx.h"
#include "DirDoc.h"
* @brief Declaration file for CDirDoc
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: DirDoc.h 6136 2008-12-01 17:04:25Z kimmov $
-
-#if !defined(AFX_DIRDOC_H__0B17B4C1_356F_11D1_95CD_444553540000__INCLUDED_)
-#define AFX_DIRDOC_H__0B17B4C1_356F_11D1_95CD_444553540000__INCLUDED_
#pragma once
#include <memory>
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_DIRDOC_H__0B17B4C1_356F_11D1_95CD_444553540000__INCLUDED_)
* @brief Implementation file for DirCmpReport dialog
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: DirFilterDlg.cpp 4636 2007-10-16 16:56:52Z jtuc $
-//
#include "stdafx.h"
#include "Coretools.h"
* @brief Declaration file for DirCmpReport Dialog.
*
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id: DirFilterDlg.h 3456 2006-08-09 06:38:07Z jtuc $
-
-#ifndef _DIRCMPREPORTDLG_H_
-#define _DIRCMPREPORTDLG_H_
+#pragma once
#ifndef DirReportTypes_h_included
#include "DirReportTypes.h"
REPORT_TYPE m_nReportType; /**< Report type integer */
BOOL m_bCopyToClipboard; /**< Do we copy report to clipboard? */
};
-
-#endif // _DIRCMPREPORTDLG_H_
* @brief Implementation file for CDirFrame
*
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id: DirFrame.cpp 4739 2007-11-12 20:41:16Z jtuc $
#include "stdafx.h"
#include "DirFrame.h"
* @brief Declaration file for CDirFrame
*
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-#if !defined(AFX_DIRFRAME_H__95565903_35C4_11D1_BAA7_00A024706EDC__INCLUDED_)
-#define AFX_DIRFRAME_H__95565903_35C4_11D1_BAA7_00A024706EDC__INCLUDED_
+#pragma once
#include "EditorFilepathBar.h"
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_DIRFRAME_H__95565903_35C4_11D1_BAA7_00A024706EDC__INCLUDED_)
*
* @brief Implementation for DirItem routines
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "DirItem.h"
#ifdef _WIN32
*
* @brief Declaration file for DirItem
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _DIR_ITEM_H_INCLUDED
-#define _DIR_ITEM_H_INCLUDED
+#pragma once
#ifdef _MSC_VER
#pragma warning(disable: 4520)
bool Update(const String &sFilePath);
void ClearPartial();
};
-
-#endif // _DIR_ITEM_H_INCLUDED
-#ifndef DirReportTypes_h_included
-#define DirReportTypes_h_included
+#pragma once
/**
* @brief Report types in selection list.
REPORT_TYPE_SIMPLEHTML, /**< Simple html table */
REPORT_TYPE_SIMPLEXML, /**< Simple xml */
} REPORT_TYPE;
-
-
-#endif // DirReportTypes_h_included
*
* @brief Implementation of DirScan (q.v.) and helper functions
*/
-// ID line follows -- this is updated by SVN
-// $Id: DirScan.cpp 6909 2009-07-11 13:03:42Z kimmov $
#include "DirScan.h"
#include <cassert>
*
* @brief Declaration of DirScan module (see DirScan function)
*/
-// ID line follows -- this is updated by SVN
-// $Id: DirScan.h 6136 2008-12-01 17:04:25Z kimmov $
-
-#ifndef DirScan_h_included
-#define DirScan_h_included
+#pragma once
#include "UnicodeString.h"
#include <cstdint>
int DirScan_CompareItems(DiffFuncStruct *, uintptr_t parentdiffpos);
int DirScan_CompareRequestedItems(DiffFuncStruct *, uintptr_t parentdiffpos);
-
-#endif // DirScan_h_included
* @brief Implementation file for Directory traversal functions.
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: DirTravel.cpp 5761 2008-08-08 04:54:52Z marcelgosselin $
#include "DirTravel.h"
#include <algorithm>
* @brief Declaration file for Directory traversal functions.
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _DIR_TRAVEL_H_
-#define _DIR_TRAVEL_H_
+#pragma once
#include <vector>
#include "UnicodeString.h"
void LoadAndSortFiles(const String& sDir, DirItemArray * dirs, DirItemArray * files, bool casesensitive);
int collstr(const String & s1, const String & s2, bool casesensitive);
-
-#endif // _DIR_TRAVEL_H_
*
* @brief Main implementation file for CDirView
*/
-// ID line follows -- this is updated by SVN
-// $Id: DirView.cpp 7063 2009-12-27 15:28:16Z kimmov $
#include "StdAfx.h"
#include "DirView.h"
*
* @brief Declaration of class CDirView
*/
-//
-// ID line follows -- this is updated by SVN
-// $Id: DirView.h 7062 2009-12-27 14:43:51Z kimmov $
-
-#if !defined(AFX_DirView_H__16E7C721_351C_11D1_95CD_444553540000__INCLUDED_)
-#define AFX_DirView_H__16E7C721_351C_11D1_95CD_444553540000__INCLUDED_
+#pragma once
/////////////////////////////////////////////////////////////////////////////
// CDirView view
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_DirView_H__16E7C721_351C_11D1_95CD_444553540000__INCLUDED_)
-
*
* @date Created: 2003-08-19
*/
-// ID line follows -- this is updated by SVN
-// $Id: DirViewColHandler.cpp 6138 2008-12-01 17:24:02Z kimmov $
#include "StdAfx.h"
*
* @date Created: 2003-08-19
*/
-// ID line follows -- this is updated by SVN
-// $Id: DirViewColItems.cpp 7063 2009-12-27 15:28:16Z kimmov $
#include "stdafx.h"
*
* @date Created: 2003-08-19
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id: DirViewColItems.h 4619 2007-10-14 08:50:20Z jtuc $
-
-#ifndef DirViewColItems_h
-#define DirViewColItems_h
+#pragma once
class CDiffContext;
extern const int g_ncols;
extern const int g_ncols3;
-
-
-#endif // DirViewColItems_h
*
* @brief Implementation file for CEditorFilepathBar class
*/
-// ID line follows -- this is updated by SVN
-// $Id: EditorFilepathBar.cpp 5401 2008-05-30 12:09:27Z kimmov $
#include "stdafx.h"
#include "EditorFilepathBar.h"
* @brief Interface of the CEditorFilePathBar class.
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: EditorFilepathBar.h 5401 2008-05-30 12:09:27Z kimmov $
-
-#ifndef __EDITORFILEPATHBAR_H__
-#define __EDITORFILEPATHBAR_H__
+#pragma once
#include <memory>
#include "FilepathEdit.h"
std::unique_ptr<CFont> m_pFont; /**< Font for editcontrols */
int m_nPanes;
};
-
-
-#endif //__EDITORFILEPATHBAR_H__
\ No newline at end of file
// EncodingErrorBar.h : header file
//
-#if !defined(AFX_ENCODINGERRORBAR_H__7F99AF10_24E5_49AF_8D97_9A86A80BAD48__INCLUDED_)
-#define AFX_ENCODINGERRORBAR_H__7F99AF10_24E5_49AF_8D97_9A86A80BAD48__INCLUDED_
-
+#pragma once
/////////////////////////////////////////////////////////////////////////////
// CEncodingErrorBar dialog
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_ENCODINGERRORBAR_H__7F99AF10_24E5_49AF_8D97_9A86A80BAD48__INCLUDED_)
*
* @brief Environment related routines.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#define POCO_NO_UNWINDOWS 1
#include "Environment.h"
*
* @brief Declaration file for Environment-related routines.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _ENVIRONMENT_H_
-#define _ENVIRONMENT_H_
+#pragma once
#include "UnicodeString.h"
bool env_LoadRegistryFromFile(const String& sRegFilePath);
bool env_SaveRegistryToFile(const String& sRegFilePath, const String& sRegDir);
-
-#endif // _ENVIRONMENT_H_
*
* @brief Exceptions handlers (currently, only SE handler for try/catch)
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id$
+#pragma once
#ifdef _MSC_VER
SE_Handler() {}
#endif
};
-
-
-
-
*
* @brief Implementation of FileActionScript and related classes
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "stdafx.h"
#include "FileActionScript.h"
*
* @brief Declaration file for FileActionScript and related classes
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _FILEACTIONSCRIPT_H_
-#define _FILEACTIONSCRIPT_H_
+#pragma once
#include <vector>
#include <memory>
BOOL m_bUseRecycleBin; /**< Use recycle bin for script actions? */
HWND m_hParentWindow; /**< Parent window for showing messages */
};
-
-#endif // _FILEACTIONSCRIPT_H_
*
* @brief Implementation of FileFilter.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "FileFilter.h"
#include <vector>
*
* @brief Declaration file for FileFilter
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-#ifndef __FILEFILTER_H__
-#define __FILEFILTER_H__
+#pragma once
#include <vector>
#include <memory>
};
typedef std::shared_ptr<FileFilter> FileFilterPtr;
-
-#endif
*
* @brief Implementation file for FileFilterHelper class
*/
-// ID line follows -- this is updated by SVN
-// $Id: FileFilterHelper.cpp 7024 2009-10-22 18:26:45Z kimmov $
#include "FileFilterHelper.h"
#include "UnicodeString.h"
*
* @brief Declaration file for FileFilterHelper
*/
-// ID line follows -- this is updated by SVN
-// $Id: FileFilterHelper.h 7024 2009-10-22 18:26:45Z kimmov $
-
-#ifndef _FILEFILTERHELPER_H_
-#define _FILEFILTERHELPER_H_
+#pragma once
#include <vector>
#include <memory>
String m_sGlobalFilterPath; /*< Path for shared filters */
String m_sUserSelFilterPath; /*< Path for user's private filters */
};
-
-#endif // _FILEFILTERHELPER_H_
*
* @brief Implementation of FileFilterMgr and supporting routines
*/
-// ID line follows -- this is updated by SVN
-// $Id: FileFilterMgr.cpp 7024 2009-10-22 18:26:45Z kimmov $
#include "FileFilterMgr.h"
#include <vector>
*
* @brief Declaration file for FileFilterMgr
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef FileFilterMgr_h_included
-#define FileFilterMgr_h_included
+#pragma once
#include <vector>
#include "UnicodeString.h"
bool TestAgainstRegList(const std::vector<FileFilterElementPtr> *filterList, const String& szTest);
void EmptyFilterList(std::vector<FileFilterElementPtr> *filterList);
-
-
-#endif // FileFilterMgr_h_included
*
* @brief Implementation of FileFilters -dialog
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "stdafx.h"
#include "FileFiltersDlg.h"
*
* @brief Declaration file for File Filters dialog
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#if !defined(AFX_FILTERSDLG_H__6180CBC3_99BB_4C85_B0EA_BA85D219285E__INCLUDED_)
-#define AFX_FILTERSDLG_H__6180CBC3_99BB_4C85_B0EA_BA85D219285E__INCLUDED_
+#pragma once
#if _MSC_VER > 1000
#pragma once
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_FILTERSDLG_H__6180CBC3_99BB_4C85_B0EA_BA85D219285E__INCLUDED_)
* @brief Declaration for FileLocation class.
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef FileLocation_included
-#define FileLocation_included
+#pragma once
#include "FileTextEncoding.h"
// Copy constructor & copy operator should do the obvious correct things
};
-
-#endif // FileLocation_included
*
* @brief Implementation of the file and folder selection routines.
*/
-// ID line follows -- this is updated by SVN
-// $Id: FileOrFolderSelect.cpp 6569 2009-03-15 14:33:03Z kimmov $
#include <windows.h>
#include "FileOrFolderSelect.h"
*
* @brief Declaration of the file and folder selection routines.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _FILE_OR_FOLDER_SELECTION_H_
-#define _FILE_OR_FOLDER_SELECTION_H_
+#pragma once
#include "UnicodeString.h"
HWND hwndOwner = NULL);
BOOL SelectFileOrFolder(HWND parent, String& path, LPCTSTR root_path = NULL);
-
-#endif
\ No newline at end of file
*
* @brief Implementation of FileTextEncoding structure
*/
-// ID line follows -- this is updated by SVN
-// $Id: FileTextEncoding.cpp 7172 2010-05-19 12:57:18Z jtuc $
#include "FileTextEncoding.h"
#include "unicoder.h"
*
* @brief Declaration of FileTextEncoding structure
*/
-// ID line follows -- this is updated by SVN
-// $Id: FileTextEncoding.h 7172 2010-05-19 12:57:18Z jtuc $
-
-#ifndef FileTextEncoding_h_included
-#define FileTextEncoding_h_included
+#pragma once
#include "unicoder.h"
bool operator==(const FileTextEncoding & fte2) const { return Collate(*this, fte2) == 0; }
bool operator!=(const FileTextEncoding & fte2) const { return Collate(*this, fte2) != 0; }
};
-
-
-#endif // FileTextEncoding_h_included
*
* @brief Declaration file for FileTextStats structure.
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-#ifndef FileTextStats_h_included
-#define FileTextStats_h_included
+#pragma once
/**
* @brief Structure containing statistics about compared file.
FileTextStats() { clear(); }
void clear() { ncrs = nlfs = ncrlfs = nzeros = 0; }
};
-
-
-#endif // FileTextStats_h_included
*
* @brief Implementation of file transformations
*/
-// ID line follows -- this is updated by SVN
-// $Id: FileTransform.cpp 7082 2010-01-03 22:15:50Z sdottaka $
#include "FileTransform.h"
#include <vector>
*
* @brief Declaration of file transformations
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id: FileTransform.h 6857 2009-06-25 07:46:29Z kimmov $
-
-#ifndef FileTransform_h
-#define FileTransform_h
+#pragma once
#include <vector>
#include "UnicodeString.h"
* @note Event EDITOR_SCRIPT, ?
*/
bool TextTransform_Interactive(String & text, const wchar_t *TransformationEvent, int iFncChosen);
-
-#endif // FileTransform_h
*
* @brief Implementation for FileVersion
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "FileVersion.h"
#include "UnicodeString.h"
*
* @brief Declaration file for FileVersion
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _FILE_VERSION_H_
-#define _FILE_VERSION_H_
+#pragma once
#include "UnicodeString.h"
void SetFileVersionNone() { m_fileVersionMS = 0xffffffff; m_fileVersionLS = 0xfffffffe; };
String GetFileVersionString() const;
};
-
-#endif // _FILE_VERSION_H_
*
* @brief Implementation of the CFilepathEdit class.
*/
-// ID line follows -- this is updated by SVN
-// $Id: FilepathEdit.cpp 6500 2009-02-25 13:36:26Z kimmov $
#include "stdafx.h"
#include "FilepathEdit.h"
*
* @brief Declaration file for CFilepathEdit class.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef __FILEPATHEDIT_H__
-#define __FILEPATHEDIT_H__
+#pragma once
/**
* @brief Read-only control to display a filepath.
/////////////////////////////////////////////////////////////////////////////
-
-#endif //__FILEPATHEDIT_H__
*\r
* @brief FilterCommentsManager class declaration.\r
*/\r
-\r
-#ifndef _FILTERCOMMENTSMANAGER_H_\r
-#define _FILTERCOMMENTSMANAGER_H_\r
+#pragma once\r
\r
#include <string>\r
#include <map>\r
String m_IniFileName;\r
bool m_loaded;\r
};\r
-\r
-#endif // _FILTERCOMMENTSMANAGER_H_\r
*
* @brief Implementation file for FilterList.
*/
-// ID line follows -- this is updated by SVN
-// $Id: FilterList.cpp 7164 2010-05-15 13:57:32Z jtuc $
#include "FilterList.h"
#include <vector>
*
* @brief Declaration file for FilterList.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _FILTERLIST_H_
-#define _FILTERLIST_H_
+#pragma once
#include <vector>
#include <string>
const std::string *m_lastMatchExpression;
};
-
-
-#endif // _FILTERLIST_H_
*
* @brief Implementation file for FolderCmp
*/
-// ID line follows -- this is updated by SVN
-// $Id: FolderCmp.cpp 7024 2009-10-22 18:26:45Z kimmov $
#include "diff.h"
#include "FolderCmp.h"
*
* @brief Declaration file for FolderCmp
*/
-// ID line follows -- this is updated by SVN
-// $Id: FolderCmp.h 6856 2009-06-25 06:34:42Z kimmov $
-
-#ifndef _FOLDERCMP_H_
-#define _FOLDERCMP_H_
+#pragma once
#include <memory>
#include "DiffFileData.h"
std::unique_ptr<CompareEngines::BinaryCompare> m_pBinaryCompare;
std::unique_ptr<CompareEngines::TimeSizeCompare> m_pTimeSizeCompare;
};
-
-
-#endif // _FOLDERCMP_H_
*
* @brief Implementation of GhostTextBuffer class.
*/
-// ID line follows -- this is updated by SVN
-// $Id: GhostTextBuffer.cpp 6878 2009-06-29 09:28:13Z kimmov $
#include "StdAfx.h"
#include "GhostTextBuffer.h"
*
* @brief Declaration of CGhostTextBuffer (subclasses CCrystalTextBuffer to handle ghost lines)
*/
-// ID line follows -- this is updated by SVN
-// $Id: GhostTextBuffer.h 5762 2008-08-08 05:32:15Z kimmov $
-
-#ifndef __GHOSTTEXTBUFFER_H__
-#define __GHOSTTEXTBUFFER_H__
+#pragma once
#include <vector>
#include "ccrystaltextbuffer.h"
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-
-#endif //__GHOSTTEXTBUFFER_H__
*
* @brief Declaration of CGhostTextView (subclasses CCrystalEditViewEx to handle ghost lines)
*/
-
-
-#ifndef __GHOSTTEXTVIEW_H__
-#define __GHOSTTEXTVIEW_H__
+#pragma once
#include "crystalEditViewex.h"
/////////////////////////////////////////////////////////////////////////////
-
-
-#endif //__GHOSTTEXTVIEW_H__
* @brief Declaration for GhostUndoRecord structure.
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _GHOST_UNDO_RECORD_H_
-#define _GHOST_UNDO_RECORD_H_
+#pragma once
/**
* @brief Support For Descriptions On Undo/Redo Actions.
{
}
};
-
-#endif // _GHOST_UNDO_RECORD_H_
* @brief Implementation file for CHexMergeDoc
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: HexMergeDoc.cpp 7166 2010-05-16 12:05:13Z jtuc $
#include "stdafx.h"
#include "HexMergeDoc.h"
*
* @brief Declaration of CHexMergeDoc class
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id: HexMergeDoc.h 7166 2010-05-16 12:05:13Z jtuc $
+#pragma once
#include "PathContext.h"
#include "DiffFileInfo.h"
* @brief Implementation file for CHexMergeFrame
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: HexMergeFrm.cpp 7166 2010-05-16 12:05:13Z jtuc $
#include "stdafx.h"
#include "HexMergeFrm.h"
* @brief interface of the CHexMergeFrame class
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: HexMergeFrm.h 7166 2010-05-16 12:05:13Z jtuc $
+#pragma once
#include "SplitterWndEx.h"
#include "EditorFilepathBar.h"
* @brief Implementation file for CHexMergeView
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: HexMergeView.cpp 7165 2010-05-15 14:04:43Z jtuc $
#include "stdafx.h"
#include "HexMergeFrm.h"
*
* @brief Declaration of CHexMergeDoc class
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id$
+#pragma once
#include "DiffFileInfo.h"
-#ifndef IAbortable_h_included
-#define IAbortable_h_included
+#pragma once
/** @brief callback to check if dirscan needs to abort */
class IAbortable
public:
virtual bool ShouldAbort() const = 0;
};
-
-#endif // IAbortable_h_included
-#ifndef _ILISTCTRL_H_
-#define _ILISTCTRL_H_
+#pragma once
#include "UnicodeString.h"
virtual int GetIconCount() const = 0;
virtual std::string GetIconPNGData(int iconIndex) const = 0;
};
-
-#endif
+#pragma once
+
#include "IListCtrl.h"
#include <commctrl.h>
#include <atlimage.h>
* @brief Declaration file for IOptionsPanel Interface
*
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-#ifndef _IOPTIONSPANEL_H_
-#define _IOPTIONSPANEL_H_
+#pragma once
/**
* @brief Interface for Options Panels.
virtual void ReadOptions() = 0;
virtual void WriteOptions() = 0;
};
-
-#endif // IOPTIONSPANEL_H_
* @brief Implementation file for CImgMergeFrame
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: ImgMergeFrm.cpp 7166 2010-05-16 12:05:13Z jtuc $
#include "stdafx.h"
#include "ImgMergeFrm.h"
* @brief interface of the CImgMergeFrame class
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: ImgMergeFrm.h 7166 2010-05-16 12:05:13Z jtuc $
+#pragma once
#include "EditorFilepathBar.h"
#include "PathContext.h"
*
* @brief Declaration of Map from int to int, with a couple new methods
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-#ifndef IntToIntMap_h_included
-#define IntToIntMap_h_included
+#pragma once
/**
* @brief An int->int map with helper methods for finding largest bin
return maxKey;
}
};
-
-
-#endif // IntToIntMap_h_included
* @brief Declaration file for JumpList helper functions.
*
*/
-#ifndef _JUMPLIST_H_
-#define _JUMPLIST_H_
+#pragma once
#include "UnicodeString.h"
#include <vector>
bool AddToRecentDocs(const String& app_path = _T(""), const String& params = _T(""), const String& title = _T(""), const String& desc = _T(""), int icon_index = 0);
std::vector<Item> GetRecentDocs(size_t nMaxItems);
}
-
-#endif
*
* @brief Implementation of Line Filter dialog
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "stdafx.h"
#include "LineFiltersList.h"
* @brief Declaration file for Line Filter dialog
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#if !defined(AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_)
-#define AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_
+#pragma once
class LineFiltersList;
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_)
*
* @brief Implementation for LineFiltersList class.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "LineFiltersList.h"
#include <vector>
*
* @brief Declaration file for LineFiltersList class
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _LINEFILTERS_LIST_H_
-#define _LINEFILTERS_LIST_H_
+#pragma once
#include <vector>
#include <memory>
std::vector<LineFilterItemPtr> m_items; /**< List for linefilter items */
COptionsMgr * m_pOptionsMgr; /**< Options-manager for storage */
};
-
-#endif // _LINEFILTERS_LIST_H_
*
* @brief Declaration of ListEntry
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-#ifndef _LIST_ENTRY_H_INCLUDED
-#define _LIST_ENTRY_H_INCLUDED
+#pragma once
/**
* @brief Simple LIST_ENTRY wrapper
ListEntry(const ListEntry &); // disallow copy construction
void operator=(const ListEntry &); // disallow assignment
};
-
-#endif // _LIST_ENTRY_H_INCLUDED
*
* @brief Implementation of the dialog used to select codepages
*/
-// ID line follows -- this is updated by SVN
-// $Id: LoadSaveCodepageDlg.cpp 5394 2008-05-29 09:47:36Z kimmov $
#include "stdafx.h"
#include "LoadSaveCodepageDlg.h"
*
* @brief Declaration of the dialog used to select codepages
*/
-// ID line follows -- this is updated by SVN
-// $Id: LoadSaveCodepageDlg.h 5444 2008-06-07 06:48:49Z kimmov $
-
-
-#if !defined(AFX_LOADSAVECODEPAGEDLG_H__B9A16700_6F1A_4DF1_8EB3_0A1D772DCE91__INCLUDED_)
-#define AFX_LOADSAVECODEPAGEDLG_H__B9A16700_6F1A_4DF1_8EB3_0A1D772DCE91__INCLUDED_
#pragma once
#include "CMoveConstraint.h"
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_LOADSAVECODEPAGEDLG_H__B9A16700_6F1A_4DF1_8EB3_0A1D772DCE91__INCLUDED_)
-//////////////////////////////////////////////////////////////////////
/**
* @file LocationBar.cpp
*
* @brief Implementation file for CLocationBar
*
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-//
-//////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include "LocationBar.h"
//
//////////////////////////////////////////////////////////////////////
-#ifndef LOCATIONBAR_H
-#define LOCATIONBAR_H
-
+#pragma once
#include "sizecbar.h"
#include "scbarcf.h"
HWND m_hwndFrame; //*< Frame window handle */
};
-
-#endif // LOCATIONBAR_H
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: LocationView.cpp 7127 2010-03-10 21:03:58Z kimmov $
#include "StdAfx.h"
#include "LocationView.h"
-//////////////////////////////////////////////////////////////////////
/**
* @file LocationView.h
*
* @brief Declaration of CLocationView class
*/
-//
-//////////////////////////////////////////////////////////////////////
-
-// ID line follows -- this is updated by SVN
-// $Id: LocationView.h 6085 2008-11-12 17:31:24Z kimmov $
-
-#ifndef __LOCATIONVIEW_H__
-#define __LOCATIONVIEW_H__
+#pragma once
#include <vector>
#include <memory>
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-
-#endif //__LOCATIONVIEW_H__
*
* @brief Implementation of the CMainFrame class
*/
-// ID line follows -- this is updated by SVN
-// $Id: MainFrm.cpp 7063 2009-12-27 15:28:16Z kimmov $
#include "StdAfx.h"
#include "MainFrm.h"
* @brief Declaration file for CMainFrame
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: MainFrm.h 6940 2009-08-01 17:29:01Z kimmov $
-
-#if !defined(AFX_MAINFRM_H__BBCD4F8C_34E4_11D1_BAA6_00A024706EDC__INCLUDED_)
-#define AFX_MAINFRM_H__BBCD4F8C_34E4_11D1_BAA6_00A024706EDC__INCLUDED_
+#pragma once
#include <vector>
#include <memory>
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_MAINFRM_H__BBCD4F8C_34E4_11D1_BAA6_00A024706EDC__INCLUDED_)
* @brief Defines the class behaviors for the application.
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: Merge.cpp 6861 2009-06-25 12:11:07Z kimmov $
#include "stdafx.h"
#include "Merge.h"
* @brief main header file for the MERGE application
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#if !defined(AFX_MERGE_H__BBCD4F88_34E4_11D1_BAA6_00A024706EDC__INCLUDED_)
-#define AFX_MERGE_H__BBCD4F88_34E4_11D1_BAA6_00A024706EDC__INCLUDED_
+#pragma once
#ifndef __AFXWIN_H__
#error include 'stdafx.h' before including this file for PCH
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_MERGE_H__BBCD4F88_34E4_11D1_BAA6_00A024706EDC__INCLUDED_)
* @brief Declaration file for Merge7zFormatMergePluginImpl class
*
*/
+#pragma once
+
#include <Windows.h>
#define DllBuild_Merge7z 10 // Minimum DllBuild of Merge7z plugin required
* @brief Declaration file for Merge7zFormatShellImpl class
*
*/
+#pragma once
+
#include <Windows.h>
#define DllBuild_Merge7z 10 // Minimum DllBuild of Merge7z plugin required
virtual BSTR GetDefaultName(HWND, LPCTSTR);
static Merge7z::Format *GuessFormat(const String& path);
};
-
-#ifndef __MERGEAPP_H__
-#define __MERGEAPP_H__
+#pragma once
#include "UnicodeString.h"
/** @brief Lang aware version of AfxFormatString2() */
String LangFormatString2(unsigned, const TCHAR *, const TCHAR *);
-
-
-#endif /* __MERGEAPP_H__ */
\ No newline at end of file
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: MergeCmdLineInfo.cpp 6940 2009-08-01 17:29:01Z kimmov $
#include "MergeCmdLineInfo.h"
#include <cstring>
* @brief Implementation file for CMergeDoc
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: MergeDoc.cpp 7107 2010-01-14 21:43:14Z kimmov $
#include "StdAfx.h"
#include "MergeDoc.h"
}
}
return list;
-}
\ No newline at end of file
+}
*
* @brief Declaration of CMergeDoc class
*/
-// ID line follows -- this is updated by SVN
-// $Id: MergeDoc.h 7086 2010-01-09 13:38:25Z kimmov $
-
-#if !defined(AFX_MERGEDOC_H__BBCD4F90_34E4_11D1_BAA6_00A024706EDC__INCLUDED_)
-#define AFX_MERGEDOC_H__BBCD4F90_34E4_11D1_BAA6_00A024706EDC__INCLUDED_
+#pragma once
#include "DiffTextBuffer.h"
#include <vector>
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_MERGEDOC_H__BBCD4F90_34E4_11D1_BAA6_00A024706EDC__INCLUDED_)
* @brief Code to layout diff blocks, to find matching lines, and insert ghost lines
*
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id: MergeDocDiffSync.cpp 7054 2009-12-22 17:59:08Z kimmov $
#include "StdAfx.h"
#include <vector>
* @brief Implementation file for CMergeDoc
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: MergeDocEncoding.cpp 4921 2008-01-16 20:20:54Z kimmov $
#include "stdafx.h"
#include "MergeDoc.h"
* @brief Implementation file for word diff highlighting (F4) for merge edit & detail views
*
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id: MergeDocLineDiffs.cpp 7067 2009-12-29 14:22:46Z kimmov $
#include "StdAfx.h"
#include "MergeDoc.h"
* @brief Interface for merge edit view to display status bar info
*
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id: MergeEditStatus.h 1587 2004-06-20 16:33:26Z kimmov $
+#pragma once
/**
* @brief Interface for merge edit view to display status bar info
*
* @brief Implementation of the CMergeEditView class
*/
-// ID line follows -- this is updated by SVN
-// $Id: MergeEditView.cpp 7142 2010-04-28 17:05:50Z kimmov $
#include "StdAfx.h"
#include "MergeEditView.h"
* @brief Declaration file for CMergeEditView
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: MergeEditView.h 6655 2009-04-14 19:18:31Z kimmov $
-
-#if !defined(AFX_MERGEEDITVIEW_H__0CE31CFD_4BEE_4378_ADB4_B7C9F50A9F53__INCLUDED_)
-#define AFX_MERGEEDITVIEW_H__0CE31CFD_4BEE_4378_ADB4_B7C9F50A9F53__INCLUDED_
+#pragma once
/**
* @brief Non-diff lines shown above diff when scrolling to it
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_MERGEEDITVIEW_H__0CE31CFD_4BEE_4378_ADB4_B7C9F50A9F53__INCLUDED_)
*
* @brief Additional lineflags for editor.
*/
-// ID line follows -- this is updated by SVN
-// $Id: MergeLineFlags.h 4762 2007-11-18 09:52:04Z kimmov $
-
-#ifndef MergeLineFlags_h_included
-#define MergeLineFlags_h_included
+#pragma once
/**
The Crystal Editor keeps a DWORD of flags for each line.
// Flags for non-ignored difference
// Note that we must include ghost flag to include ghost lines
#define LF_NONTRIVIAL_DIFF ((LF_DIFF | LF_GHOST) & (~LF_TRIVIAL))
-
-#endif // MergeLineFlags_h_included
*
* @brief Moved block detection code.
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id$
#include <map>
#include <cassert>
*
* @brief Declaration of MovedLines class
*/
-
-#ifndef _MOVEDLINES_H_
-#define _MOVEDLINES_H_
+#pragma once
#include <map>
MovedLinesMap m_moved0; /**< Moved lines map for first side */
MovedLinesMap m_moved1; /**< Moved lines map for second side */
};
-
-#endif // _MOVEDLINES_H_
*
* @brief Implementation of the COpenView class
*/
-// ID line follows -- this is updated by SVN
-// $Id: OpenDlg.cpp 6861 2009-06-25 12:11:07Z kimmov $
#include "stdafx.h"
#include "OpenView.h"
}
}
return CFormView::PreTranslateMessage(pMsg);
-}
\ No newline at end of file
+}
* @brief Declaration file for COpenView window
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: OpenView.h 5444 2008-06-07 06:48:49Z kimmov $
#pragma once
-#ifndef _OPTIONS_CUSTOMCOLORS_H_
-#define _OPTIONS_CUSTOMCOLORS_H_
+#pragma once
#include <windows.h>
void Save(const COLORREF * colors);
}}
-
-#endif
*
* @brief Constants for option-names
*/
-// ID line follows -- this is updated by SVN
-// $Id: OptionsDef.h 6910 2009-07-12 09:06:54Z kimmov $
-
-#ifndef _OPTIONS_DEF_H_
-#define _OPTIONS_DEF_H_
+#pragma once
#include "UnicodeString.h"
const TCHAR OPT_FONT_QUALITY[] = _T("Quality");
const TCHAR OPT_FONT_PITCHANDFAMILY[] = _T("PitchAndFamily");
const TCHAR OPT_FONT_FACENAME[] = _T("FaceName");
-
-#endif // _OPTIONS_DEF_H_
-#ifndef _OPTIONS_EDITOR_COLOR_SETTING_H_
-#define _OPTIONS_EDITOR_COLOR_SETTING_H_
+#pragma once
#include <windows.h>
void Save(const COLORSETTINGS& colors);
}}
-
-#endif
-#include <windows.h>\r
-#include "UnicodeString.h"\r
+#pragma once\r
\r
struct DIFFOPTIONS;\r
\r
void Save(const DIFFOPTIONS& options);\r
\r
}}\r
-\r
+#pragma once\r
+\r
#include <windows.h>\r
#include "UnicodeString.h"\r
\r
void Reset(const String& name);\r
\r
}}\r
-\r
-\r
-\r
*
* @brief Options initialisation.
*/
-// ID line follows -- this is updated by SVN
-// $Id: OptionsInit.cpp 6910 2009-07-12 09:06:54Z kimmov $
#include "stdafx.h"
#include <vector>
*
* @brief Implementation of OptionsPanel class.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "stdafx.h"
#include "OptionsMgr.h"
* @brief Declaration file for OptionsPanel class.
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _OPTIONS_PANEL_H_
-#define _OPTIONS_PANEL_H_
+#pragma once
#include "IOptionsPanel.h"
private:
COptionsMgr * m_pOptionsMgr; /**< Options-manager for storage */
};
-
-#endif // _OPTIONS_PANEL_H_
*
* @brief Implementation for OptionsSyntaxColors class.
*/
-// ID line follows -- this is updated by SVN
-// $Id: OptionsSyntaxColors.cpp 6727 2009-05-10 08:25:18Z kimmov $
#include "OptionsSyntaxColors.h"
#include <vector>
*
* @brief Declaration file for SyntaxColors class utility
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _OPTIONS_SYNTAX_COLORS_H_
-#define _OPTIONS_SYNTAX_COLORS_H_
+#pragma once
class SyntaxColors;
void Save(const ::SyntaxColors *pSyntaxColors);
}}
-
-#endif // _OPTIONS_SYNTAX_COLORS_H_
*
* @brief Implementation of Patch creation dialog
*/
-// ID line follows -- this is updated by SVN
-// $Id: PatchDlg.cpp 6783 2009-05-25 06:47:22Z kimmov $
#include "StdAfx.h"
#include "PatchDlg.h"
*
* @brief Declaration file for patch creation dialog
*/
-// ID line follows -- this is updated by SVN
-// $Id: PatchDlg.h 6783 2009-05-25 06:47:22Z kimmov $
-
-#if !defined(AFX_PATCHDLG_H__AB3CE671_1328_11D7_B088_005004D9D386__INCLUDED_)
-#define AFX_PATCHDLG_H__AB3CE671_1328_11D7_B088_005004D9D386__INCLUDED_
+#pragma once
#include "resource.h"
#include "SuperComboBox.h"
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PATCHDLG_H__AB3CE671_1328_11D7_B088_005004D9D386__INCLUDED_)
+#pragma once
struct file_data;
struct change;
*
* @brief Code file routines
*/
-// ID line follows -- this is updated by SVN
-// $Id: PatchTool.cpp 6858 2009-06-25 07:48:26Z kimmov $
#include "StdAfx.h"
#include "PatchTool.h"
*
* @brief Declaration file for PatchTool class
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _PATCHTOOL_H_
-#define _PATCHTOOL_H_
+#pragma once
#include "DiffWrapper.h"
String m_sPatchFile; /**< Patch file path and filename. */
BOOL m_bOpenToEditor; /**< Is patch file opened to external editor? */
};
-
-#endif // _PATCHTOOL_H_
* @brief Implementation file for PathInfo and PathContext
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: PathContext.cpp 4929 2008-01-18 20:03:57Z kimmov $
#include "PathContext.h"
#include <cassert>
*
* @brief Declarations of PathInfo and PathContext
*/
-// ID line follows -- this is updated by SVN
-// $Id: PathContext.h 4929 2008-01-18 20:03:57Z kimmov $
-
-
-#ifndef _PATH_CONTEXT_H_
-#define _PATH_CONTEXT_H_
+#pragma once
#include "UnicodeString.h"
#include <vector>
const PathContext *m_pPathContext;
int m_sel;
};
-
-#endif // _PATH_CONTEXT_H_
-#ifndef PluginManager_h_included
-#define PluginManager_h_included
+#pragma once
#define POCO_NO_UNWINDOWS 1
#include <Poco/Mutex.h>
PluginFileInfoMap m_pluginSettings;
Poco::FastMutex m_mutex;
};
-
-#endif // PluginManager_h_included
*
* @brief Support for VBS Scriptlets, VB ActiveX DLL, VC++ COM DLL
*/
-// ID line follows -- this is updated by SVN
-// $Id: Plugins.cpp 7052 2009-12-22 17:45:22Z kimmov $
#include "Plugins.h"
#define POCO_NO_UNWINDOWS 1
*
* @brief Declaration file for VBS Scriptlets, VB ActiveX DLL, VC++ COM DLL
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef __PLUGINS_H__
-#define __PLUGINS_H__
+#pragma once
#include <Poco/Foundation.h>
#include <string>
* @brief Call the plugin "ShowSettingsDialog" method
*/
bool InvokeShowSettingsDialog(LPDISPATCH piScript);
-
-
-#endif //__PLUGINS_H__
*
* @brief Implementation file for PluginsList dialog
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "stdafx.h"
#include "PluginsListDlg.h"
*
* @brief Declaration file for PluginsList dialog
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _PLUGINS_LIST_DIALOG_H_
-#define _PLUGINS_LIST_DIALOG_H_
-
+#pragma once
/**
* @brief A dialog listing plugins.
public:
CListCtrl m_list; /**< A list control for plugins. */
};
-
-#endif // _PLUGINS_LIST_DIALOG_H_
*
* @brief Implementation file for ProjectFile class.
*/
-// ID line follows -- this is updated by CVS
-// $Id: ProjectFile.cpp 7081 2010-01-01 20:33:30Z kimmov $
#include "ProjectFile.h"
*
* @brief Declaration file ProjectFile class
*/
-// ID line follows -- this is updated by CVS
-// $Id: ProjectFile.h 6392 2009-01-27 21:50:22Z kimmov $
-
-#ifndef _PROJECT_FILE_H_
-#define _PROJECT_FILE_H_
+#pragma once
#include "UnicodeString.h"
#include "PathContext.h"
bool m_bMiddleReadOnly; /**< Is middle path opened as read-only */
bool m_bRightReadOnly; /**< Is right path opened as read-only */
};
-
-#endif // #ifdef _PROJECT_FILE_H_
*
* @brief Implementation file for ProjectFilePaths dialog
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "stdafx.h"
#include "ProjectFilePathsDlg.h"
*
* @brief Declaration file for ProjectFilePathsDlg dialog
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-#ifndef _PROJECTFILEPATHSDLG_H_
-#define _PROJECTFILEPATHSDLG_H_
+#pragma once
/**
* @brief Dialog allowing user to load, edit and save project files.
afx_msg void OnBnClickedProjOpen();
afx_msg void OnBnClickedProjSave();
};
-
-#endif // _PROJECTFILEPATHSDLG_H_
-
*
* @brief Implementation of PropArchive propertysheet
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "stdafx.h"
#include "PropArchive.h"
* @brief Declaration file for PropArchive propertyheet
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _PROP_ARCHIVE_H_
-#define _PROP_ARCHIVE_H_
+#pragma once
#include "StatLink.h"
#include "OptionsPanel.h"
int m_nInstallType;
BOOL m_bProbeType;
};
-#endif // _PROP_ARCHIVE_H_
*
* @brief Implementation of PropBackups propertysheet
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "stdafx.h"
#include "PropBackups.h"
* @brief Declaration file for PropBackups propertyheet
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _PROPBACKUPS_H_
-#define _PROPBACKUPS_H_
+#pragma once
#include "OptionsPanel.h"
DECLARE_MESSAGE_MAP()
};
-
-#endif // _PROPBACKUPS_H_
* @brief Implementation file for PropCodepage propertyheet
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: PropCodepage.cpp 6908 2009-07-11 08:29:49Z kimmov $
#include "stdafx.h"
#include "PropCodepage.h"
*
* @brief Declaration of PropCodepage class
*/
-// ID line follows -- this is updated by SVN
-// $Id: PropCodepage.h 6908 2009-07-11 08:29:49Z kimmov $
-
-#if !defined(AFX_PROPCODEPAGE_H__0DF931F8_E845_48B7_A658_3BEE6D3EAF85__INCLUDED_)
-#define AFX_PROPCODEPAGE_H__0DF931F8_E845_48B7_A658_3BEE6D3EAF85__INCLUDED_
+#pragma once
#include "OptionsPanel.h"
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PROPCODEPAGE_H__0DF931F8_E845_48B7_A658_3BEE6D3EAF85__INCLUDED_)
*
* @brief Implementation of PropMergeColors propertysheet
*/
-// ID line follows -- this is updated by SVN
-// $Id: PropColors.cpp 6908 2009-07-11 08:29:49Z kimmov $
#include "stdafx.h"
#include "PropColors.h"
* @brief Declaration file for PropMergeColors propertyheet
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: PropColors.h 6908 2009-07-11 08:29:49Z kimmov $
-
-#if !defined(AFX_PROPCOLORS_H__9C0A0F92_CDD6_40FE_BEFC_101B1E22FFDD__INCLUDED_)
-#define AFX_PROPCOLORS_H__9C0A0F92_CDD6_40FE_BEFC_101B1E22FFDD__INCLUDED_
-
+#pragma once
#include "ColorButton.h"
#include "OptionsPanel.h"
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PROPCOLORS_H__9C0A0F92_CDD6_40FE_BEFC_101B1E22FFDD__INCLUDED_)
*
* @brief Implementation of PropCompare propertysheet
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "stdafx.h"
#include "PropCompare.h"
*
* @brief Declaration of PropCompare propertysheet
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _PROPPAGE_COMPARE_H_
-#define _PROPPAGE_COMPARE_H_
+#pragma once
#include "OptionsPanel.h"
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // _PROPPAGE_COMPARE_H_
*
* @brief Implementation of PropCompareBinary propertysheet
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "stdafx.h"
#include "PropCompareBinary.h"
*
* @brief Declaration of PropCompareBinary propertysheet
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _PROPPAGE_COMPAREBINARY_H_
-#define _PROPPAGE_COMPAREBINARY_H_
+#pragma once
#include "OptionsPanel.h"
#include "UnicodeString.h"
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // _PROPPAGE_COMPAREBINARY_H_
*
* @brief Implementation of PropCompareFolder propertysheet
*/
-// ID line follows -- this is updated by SVN
-// $Id: PropCompareFolder.cpp 6921 2009-07-23 15:20:41Z kimmov $
#include "stdafx.h"
#include "PropCompareFolder.h"
*
* @brief Declaration of PropCompareFolder propertysheet
*/
-// ID line follows -- this is updated by SVN
-// $Id: PropCompareFolder.h 6921 2009-07-23 15:20:41Z kimmov $
-
-#ifndef _PROPCOMPARE_FOLDER_H_
-#define _PROPCOMPARE_FOLDER_H_
+#pragma once
#include "OptionsPanel.h"
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // _PROPCOMPARE_FOLDER_H_
*
* @brief Implementation of PropCompareImage propertysheet
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "stdafx.h"
#include "PropCompareImage.h"
*
* @brief Declaration of PropCompareImage propertysheet
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _PROPPAGE_COMPAREIMAGE_H_
-#define _PROPPAGE_COMPAREIMAGE_H_
+#pragma once
#include "OptionsPanel.h"
#include "UnicodeString.h"
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // _PROPPAGE_COMPAREIMAGE_H_
*
* @brief Implementation of PropEditor propertysheet
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "stdafx.h"
#include "PropEditor.h"
* @brief Declaration file for PropEditor propertyheet
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#if !defined(AFX_PROPEDITOR_H__1F2D57BB_6C09_488B_834D_575A94B2BDB8__INCLUDED_)
-#define AFX_PROPEDITOR_H__1F2D57BB_6C09_488B_834D_575A94B2BDB8__INCLUDED_
+#pragma once
#include "OptionsPanel.h"
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PROPEDITOR_H__1F2D57BB_6C09_488B_834D_575A94B2BDB8__INCLUDED_)
* @brief Implementation file for PropGeneral propertyheet
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "stdafx.h"
#include "PropGeneral.h"
*
* @brief Declaration of PropGeneral class
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#if !defined(AFX_PROPGENERAL_H__30AD07B0_E420_11D1_BBC5_00A024706EDC__INCLUDED_)
-#define AFX_PROPGENERAL_H__30AD07B0_E420_11D1_BBC5_00A024706EDC__INCLUDED_
+#pragma once
#include "OptionsPanel.h"
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PROPGENERAL_H__30AD07B0_E420_11D1_BBC5_00A024706EDC__INCLUDED_)
*
* @brief PropRegistry implementation file
*/
-// ID line follows -- this is updated by SVN
-// $Id: PropRegistry.cpp 6908 2009-07-11 08:29:49Z kimmov $
#include "stdafx.h"
#include "PropRegistry.h"
*
* @brief Declaration file PropRegistry
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef PropRegistry_h_included
-#define PropRegistry_h_included
+#pragma once
#include "OptionsPanel.h"
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // PropRegistry_h_included
* @brief Implementation file for Shell Options dialog.
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: PropShell.cpp 6725 2009-05-09 14:31:24Z kimmov $
#include "stdafx.h"
#include "PropShell.h"
*
* @brief Declaration of Shell options dialog class
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _PROP_SHELL_H_
-#define _PROP_SHELL_H_
+#pragma once
#include "OptionsPanel.h"
void SaveMergePath();
};
-
-#endif // _PROP_SHELL_H_
*
* @brief Implementation of PropSyntaxColors propertysheet
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "stdafx.h"
#include "PropSyntaxColors.h"
* @brief Declaration file for PropSyntaxColors propertyheet
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _PROP_SYNTAX_COLORS_H_
-#define _PROP_SYNTAX_COLORS_H_
+#pragma once
#include "ColorButton.h"
#include "OptionsPanel.h"
SyntaxColors *m_pTempColors;
COLORREF m_cCustColors[16];
};
-#endif // _PROP_SYNTAX_COLORS_H_
*
* @brief Implementation of PropTextColors propertysheet
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "stdafx.h"
#include "PropTextColors.h"
* @brief Declaration file for PropTextColors propertyheet
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#if !defined(PropTextColors_h_included)
-#define PropTextColors_h_included
+#pragma once
#include "ColorButton.h"
#include "OptionsPanel.h"
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // PropTextColors_h_included
*
* @brief VSS properties dialog implementation.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "stdafx.h"
#include "PropVss.h"
*
* @brief Declaration of VSS properties dialog.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#if !defined(AFX_PROPVSS_H__30AD07AF_E420_11D1_BBC5_00A024706EDC__INCLUDED_)
-#define AFX_PROPVSS_H__30AD07AF_E420_11D1_BBC5_00A024706EDC__INCLUDED_
+#pragma once
#include "OptionsPanel.h"
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PROPVSS_H__30AD07AF_E420_11D1_BBC5_00A024706EDC__INCLUDED_)
*
* @brief Implementation file for SaveClosingDlg dialog
*/
-// ID line follows -- this is updated by SVN
-// $Id: SaveClosingDlg.cpp 4704 2007-11-03 12:10:48Z jtuc $
#include "stdafx.h"
#include "SaveClosingDlg.h"
*
* @brief Declaration file for SaveClosingDlg dialog
*/
-// ID line follows -- this is updated by SVN
-// $Id: SaveClosingDlg.h 5444 2008-06-07 06:48:49Z kimmov $
-
-
-#ifndef _SAVECLOSINGDLG_H_
-#define _SAVECLOSINGDLG_H_
+#pragma once
#include "CMoveConstraint.h"
BOOL m_bAskForMiddle; /**< Is middle file modified? */
BOOL m_bAskForRight; /**< Is right file modified? */
};
-
-#endif // _SAVECLOSINGDLG_H_
*
* @brief Unpacker plugin selection dialog implementation.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-//
#include "stdafx.h"
#include "SelectUnpackerDlg.h"
*
* @brief Declaration file for the dialog SelectUnpacker
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-#if !defined(AFX_SELECTUNPACKERDLG_H__C8FD4C3A_5ED5_43D3_ADAE_A2378369705C__INCLUDED_)
-#define AFX_SELECTUNPACKERDLG_H__C8FD4C3A_5ED5_43D3_ADAE_A2378369705C__INCLUDED_
+#pragma once
#include <vector>
#include <memory>
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SELECTUNPACKERDLG_H__C8FD4C3A_5ED5_43D3_ADAE_A2378369705C__INCLUDED_)
*
* @brief Dialog where user choose shared or private filter
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "stdafx.h"
#include "SharedFilterDlg.h"
* @brief Declaration file for CSharedFilterDlg.
*
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-#if !defined(AFX_SHAREDFILTERDLG_H__94FD9E42_5C27_49DE_B2FB_77A0B0B03A87__INCLUDED_)
-#define AFX_SHAREDFILTERDLG_H__94FD9E42_5C27_49DE_B2FB_77A0B0B03A87__INCLUDED_
-
+#pragma once
/////////////////////////////////////////////////////////////////////////////
// CSharedFilterDlg dialog
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_SHAREDFILTERDLG_H__94FD9E42_5C27_49DE_B2FB_77A0B0B03A87__INCLUDED_)
*
* @brief Implementation file for some source control-related functions.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "StdAfx.h"
#define POCO_NO_UNWINDOWS 1
// stdafx.cpp : source file that includes just the standard includes
// Merge.pch will be the pre-compiled header
// stdafx.obj will contain the pre-compiled type information
-//
-// RCS ID line follows -- this is updated by CVS
-// $Id: StdAfx.cpp 6457 2009-02-15 14:08:50Z kimmov $
#include "stdafx.h"
#include "Merge.h"
*
* @brief Project-wide includes and declarations
*/
-// ID line follows -- this is updated by SVN
-// $Id: StdAfx.h 6457 2009-02-15 14:08:50Z kimmov $
-
-#if !defined(AFX_STDAFX_H__BBCD4F8A_34E4_11D1_BAA6_00A024706EDC__INCLUDED_)
-#define AFX_STDAFX_H__BBCD4F8A_34E4_11D1_BAA6_00A024706EDC__INCLUDED_
+#pragma once
#if _MSC_VER >= 1500
#if defined _M_IX86
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_STDAFX_H__BBCD4F8A_34E4_11D1_BAA6_00A024706EDC__INCLUDED_)
-#ifndef _TFILE_H_
-#define _TFILE_H_
+#pragma once
#define POCO_NO_UNWINDOWS 1
#include <Poco/File.h>
void moveTo(const String& path) { File::moveTo(ucr::toUTF8(path)); }
void renameTo(const String& path) { File::renameTo(ucr::toUTF8(path)); }
};
-
-#endif
* @brief Implementation file for TempFile
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: TempFile.cpp 6723 2009-05-09 09:13:26Z sdottaka $
#include "TempFile.h"
#include <windows.h>
*
* @brief Declaration of TempFile
*/
-// ID line follows -- this is updated by SVN
-// $Id: TempFile.h 6566 2009-03-12 18:16:39Z kimmov $
-
-#ifndef _TEMP_FILE_
-#define _TEMP_FILE_
+#pragma once
#include <vector>
#include "UnicodeString.h"
void CleanupWMtemp();
bool ClearTempfolder(const String &pathName);
-
-#endif // _TEMP_FILE_
*
* @brief Dialog for testing file filters
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "stdafx.h"
#include "TestFilterDlg.h"
* @brief Declaration file for CTestFilterDlg class
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#if !defined(AFX_TESTFILTERDLG_H__1261AD7A_512F_47BC_882F_2E2D41C5072F__INCLUDED_)
-#define AFX_TESTFILTERDLG_H__1261AD7A_512F_47BC_882F_2E2D41C5072F__INCLUDED_
#pragma once
struct FileFilter;
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_TESTFILTERDLG_H__1261AD7A_512F_47BC_882F_2E2D41C5072F__INCLUDED_)
*
* @brief Implementation of UniMarkdownFile class.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "UniMarkdownFile.h"
#include <cassert>
*
* @brief Declaration of UniMarkdownFile class.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
+#pragma once
#include <memory>
#include "Common/UniFile.h"
*
* @brief Implementation file for VSSHelper class
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "VSSHelper.h"
*
* @brief Declaration file for VSSHelper
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _VSSHELPER_H_
-#define _VSSHELPER_H_
+#pragma once
#include <Windows.h>
#include "UnicodeString.h"
String m_strVssProjectFull;
};
-
-#endif // _VSSHELPER_H_
*
* @brief Code for CVssPromptDlg class
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "stdafx.h"
#include "VssPromptDlg.h"
*
* @brief Declaration file for CVssPromptDlg
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-#if !defined(AFX_VSSPROMPTDLG_H__F767E53B_90F4_11D1_BB11_00A024706EDC__INCLUDED_)
-#define AFX_VSSPROMPTDLG_H__F767E53B_90F4_11D1_BB11_00A024706EDC__INCLUDED_
+#pragma once
#include "SuperComboBox.h"
#include "afxwin.h"
//{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_VSSPROMPTDLG_H__F767E53B_90F4_11D1_BB11_00A024706EDC__INCLUDED_)
*
* @brief Implementation of the WMGotoDlg dialog.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "stdafx.h"
#include "WMGotoDlg.h"
* @brief Declaration file for WMGotoDlg dialog.
*
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#if !defined(AFX_WMGOTODLG_H__A9D2366D_6358_4A74_9A45_6681D22EC786__INCLUDED_)
-#define AFX_WMGOTODLG_H__A9D2366D_6358_4A74_9A45_6681D22EC786__INCLUDED_
-
+#pragma once
/**
* @brief Class for Goto-dialog.
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_WMGOTODLG_H__A9D2366D_6358_4A74_9A45_6681D22EC786__INCLUDED_)
*
* @brief Implementation of the WaitStatusCursur class.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
#include "stdafx.h"
#include "WaitStatusCursor.h"
*
* @brief Declaration WaitStatusCursor classes.
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef WaitStatusCursor_included_h
-#define WaitStatusCursor_included_h
+#pragma once
class IStatusDisplay;
virtual void ChangeStatus(LPCTSTR str) = 0;
virtual void EndStatus(LPCTSTR str, LPCTSTR oldstr) = 0;
};
-
-#endif // WaitStatusCursor_included_h
(c) 1998-2003 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
- $Id$
-
* Changes 2005-01-09 Jochen Tucht
This file originates from the Tidy library (tidy.sourceforge.net).
Dependencies on other parts of the library have been removed to make it
Runtime-allocated index arrays have been added to improve lookup speed.
*/
-#ifndef _CHARSETS_H_
-#define _CHARSETS_H_
+#pragma once
#ifdef __cplusplus
#define extern extern "C"
extern void charsets_cleanup(void);
#undef extern
-
-#endif // _CHARSETS_H_
/**
* @file codepage.cpp
*/
-// RCS ID line follows -- this is updated by SVN
-// $Id$
#include "codepage.h"
#include <windows.h>
/**
* @file codepage.h
*/
-// RCS ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef __CODEPAGE_H__
-#define __CODEPAGE_H__
+#pragma once
#ifndef CP_UTF8
#define CP_UTF8 65001
#endif
bool isCodepageInstalled(int codepage);
-
-#endif //__CODEPAGE_H__
* @brief Deducing codepage from file contents, when we can
*
*/
-// ID line follows -- this is updated by SVN
-// $Id: codepage_detect.cpp 7172 2010-05-19 12:57:18Z jtuc $
#include "codepage_detect.h"
#include <cstdio>
*
* @brief Declaration file for codepage detection routines.
*/
-// ID line follows -- this is updated by SVN
-// $Id: codepage_detect.h 5584 2008-07-09 12:09:56Z kimmov $
-
-#ifndef codepage_detect_h_included
-#define codepage_detect_h_included
+#pragma once
#include "UnicodeString.h"
#include "FileTextEncoding.h"
FileTextEncoding GuessCodepageEncoding(const String& filepath, int guessEncodingType);
-
-#endif // codepage_detect_h_included
*
* @brief Declaration file for file routines
*/
-// ID line follows -- this is updated by SVN
-// $Id$
-
-#ifndef _FILES_H_INCLUDED
-#define _FILES_H_INCLUDED
+#pragma once
/**
* @brief File-operation return-statuses
FRESULT_LOSSY = 0x10000,
};
};
-
-#endif // _FILES_H
* @brief Interface definition for the hekseditor window.\r
*\r
*/\r
-// ID line follows -- this is updated by SVN\r
-// $Id: heksedit.h 492 2009-04-11 15:17:02Z jtuc $\r
-\r
-#ifndef _HEKSEDIT_H_\r
-#define _HEKSEDIT_H_\r
+#pragma once\r
\r
#ifndef HEKSEDIT_INTERFACE_VERSION\r
#define HEKSEDIT_INTERFACE_VERSION 2\r
virtual void STDMETHODCALLTYPE CMD_character_set() = 0;\r
virtual void STDMETHODCALLTYPE read_ini_data(TCHAR *key = 0) = 0;\r
};\r
-\r
-#endif // _HEKSEDIT_H_\r
*
* @brief Implementation of helper functions involving locale
*/
-// ID line follows -- this is updated by SVN
-// $Id: locality.cpp 5918 2008-09-07 16:05:46Z sdottaka $
#include "locality.h"
#include <cstdint>
*
* @brief Declaration of helper functions involving locale
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-#ifndef locality_h_included
-#define locality_h_included
+#pragma once
#include "UnicodeString.h"
#include <cstdint>
String TimeString(const int64_t * tim);
};
-
-#endif // locality_h_included
+#pragma once
+
#include <map>
#include <string>
#include "UnicodeString.h"
*
* @brief Path handling routines
*/
-// ID line follows -- this is updated by SVN
-// $Id: paths.cpp 6514 2009-03-01 16:55:11Z kimmov $
#include "paths.h"
#include <windows.h>
bool paths_IsURLorCLSID(const String& path)
{
return (path.find(_T("://")) != String::npos || path.find(_T("::{")) != String::npos);
-}
\ No newline at end of file
+}
*
* @brief Declaration file for path routines
*/
-// ID line follows -- this is updated by SVN
-// $Id: paths.h 5301 2008-04-16 12:51:56Z kimmov $
-
-#ifndef paths_h_included
-#define paths_h_included
+#pragma once
#include "PathContext.h"
#include "UnicodeString.h"
void paths_SplitViewName(const TCHAR *s, String * path, String * name, String * ext);
String paths_GetPathOnly(const String& fullpath);
bool paths_IsURLorCLSID(const String& path);
-
-#endif // paths_h_included
* @brief Implementation file for sd_ComputeWordDiffs (q.v.)
*
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id: stringdiffs.cpp 7149 2010-05-03 17:08:20Z kimmov $
#include "stringdiffs.h"
#define NOMINMAX
* @brief Interface file declaring sd_ComputeWordDiffs (q.v.)
*
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id: stringdiffs.h 6712 2009-05-03 09:37:54Z kimmov $
-
-#ifndef stringdiffs_h_included
-#define stringdiffs_h_included
+#pragma once
#include "UnicodeString.h"
#include <vector>
void sd_ComputeByteDiff(const String& str1, const String& str2,
bool casitive, int xwhite,
int begin[2], int end[2], bool equal);
-
-
-#endif // stringdiffs_h_included
* @brief Declaration file for class stringdiffs
*
*/
-// RCS ID line follows -- this is updated by CVS
-// $Id: stringdiffsi.h 7047 2009-12-21 19:08:49Z kimmov $
-
-#ifndef stringdiffsi_h_included
-#define stringdiffsi_h_included
+#pragma once
#include <vector>
std::vector<word> m_words2;
std::vector<wdiff> m_wdiffs;
};
-
-
-#endif // stringdiffsi_h_included
OSDN Git Service
