From ae3a5a0a13af8c035c60fad3e78439cd3245a3f5 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 10 Feb 2013 16:00:32 +0100 Subject: [PATCH] Moved #include "git2.h" to stdafx.h Signed-off-by: Sven Strickroth --- src/Git/Git.cpp | 1 - src/Git/GitStatus.cpp | 1 - src/Git/gitindex.h | 1 - src/Git/stdafx.h | 4 ++++ src/TGitCache/stdafx.h | 3 +++ src/TortoiseProc/AppUtils.cpp | 1 - src/TortoiseProc/BrowseRefsDlg.cpp | 1 - src/TortoiseProc/Commands/CloneCommand.cpp | 1 - src/TortoiseProc/Commands/CreateRepositoryCommand.cpp | 1 - src/TortoiseProc/GitProgressDlg.cpp | 1 - src/TortoiseProc/RepositoryBrowser.h | 1 - src/TortoiseProc/SubmoduleUpdateDlg.cpp | 1 - src/TortoiseProc/stdafx.h | 3 +++ src/TortoiseShell/GITPropertyPage.h | 1 - src/TortoiseShell/stdafx.h | 1 + 15 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp index 185ccb8d1..3c9531c2f 100644 --- a/src/Git/Git.cpp +++ b/src/Git/Git.cpp @@ -27,7 +27,6 @@ #include "UnicodeUtils.h" #include "gitdll.h" #include -#include "git2.h" int CGit::m_LogEncode=CP_UTF8; typedef CComCritSecLock CAutoLocker; diff --git a/src/Git/GitStatus.cpp b/src/Git/GitStatus.cpp index 494772f18..f46242b4c 100644 --- a/src/Git/GitStatus.cpp +++ b/src/Git/GitStatus.cpp @@ -34,7 +34,6 @@ //# include "PathUtils.h" #endif #include "git.h" -#include "git2.h" #include "gitindex.h" #include "shellcache.h" diff --git a/src/Git/gitindex.h b/src/Git/gitindex.h index cdc4c6596..a4fa93958 100644 --- a/src/Git/gitindex.h +++ b/src/Git/gitindex.h @@ -21,7 +21,6 @@ #include "gitdll.h" #include "gitstatus.h" #include "SharedMutex.h" -#include "git2.h" #include "UnicodeUtils.h" class CGitIndex diff --git a/src/Git/stdafx.h b/src/Git/stdafx.h index 2a5ac109d..be3e4ff17 100644 --- a/src/Git/stdafx.h +++ b/src/Git/stdafx.h @@ -47,3 +47,7 @@ #include #include + +#pragma warning(push) +#include "git2.h" +#pragma warning(pop) diff --git a/src/TGitCache/stdafx.h b/src/TGitCache/stdafx.h index b3faabf87..d0061d2c1 100644 --- a/src/TGitCache/stdafx.h +++ b/src/TGitCache/stdafx.h @@ -37,6 +37,9 @@ using namespace ATL; #include #pragma warning(pop) +#pragma warning(push) +#include "git2.h" +#pragma warning(pop) typedef CComCritSecLock AutoLocker; diff --git a/src/TortoiseProc/AppUtils.cpp b/src/TortoiseProc/AppUtils.cpp index 61e12f566..13fb2023f 100644 --- a/src/TortoiseProc/AppUtils.cpp +++ b/src/TortoiseProc/AppUtils.cpp @@ -64,7 +64,6 @@ #include "BisectStartDlg.h" #include "SysProgressDlg.h" #include "UserPassword.h" -#include "git2.h" CAppUtils::CAppUtils(void) { diff --git a/src/TortoiseProc/BrowseRefsDlg.cpp b/src/TortoiseProc/BrowseRefsDlg.cpp index 432e0a1b0..2359fbcb3 100644 --- a/src/TortoiseProc/BrowseRefsDlg.cpp +++ b/src/TortoiseProc/BrowseRefsDlg.cpp @@ -32,7 +32,6 @@ #include "IconMenu.h" #include "FileDiffDlg.h" #include "DeleteRemoteTagDlg.h" -#include "git2.h" #include "UnicodeUtils.h" #include "InputDlg.h" diff --git a/src/TortoiseProc/Commands/CloneCommand.cpp b/src/TortoiseProc/Commands/CloneCommand.cpp index c404efd4c..2fa2f8903 100644 --- a/src/TortoiseProc/Commands/CloneCommand.cpp +++ b/src/TortoiseProc/Commands/CloneCommand.cpp @@ -27,7 +27,6 @@ #include "CloneDlg.h" #include "ProgressDlg.h" #include "AppUtils.h" -#include "git2.h" #include "UnicodeUtils.h" #include "SysProgressDlg.h" diff --git a/src/TortoiseProc/Commands/CreateRepositoryCommand.cpp b/src/TortoiseProc/Commands/CreateRepositoryCommand.cpp index bb967036d..36e8a1960 100644 --- a/src/TortoiseProc/Commands/CreateRepositoryCommand.cpp +++ b/src/TortoiseProc/Commands/CreateRepositoryCommand.cpp @@ -21,7 +21,6 @@ #include "CreateRepositoryCommand.h" #include "ShellUpdater.h" #include "MessageBox.h" -#include "git2.h" #include "UnicodeUtils.h" #include "CreateRepoDlg.h" diff --git a/src/TortoiseProc/GitProgressDlg.cpp b/src/TortoiseProc/GitProgressDlg.cpp index 776bb24cd..34de015b0 100644 --- a/src/TortoiseProc/GitProgressDlg.cpp +++ b/src/TortoiseProc/GitProgressDlg.cpp @@ -43,7 +43,6 @@ #include "BugTraqAssociations.h" #include "patch.h" #include "MassiveGitTask.h" -#include "git2.h" #include "SmartHandle.h" static UINT WM_GITPROGRESS = RegisterWindowMessage(_T("TORTOISEGIT_GITPROGRESS_MSG")); diff --git a/src/TortoiseProc/RepositoryBrowser.h b/src/TortoiseProc/RepositoryBrowser.h index 670ce102e..13f31a8c6 100644 --- a/src/TortoiseProc/RepositoryBrowser.h +++ b/src/TortoiseProc/RepositoryBrowser.h @@ -19,7 +19,6 @@ // #pragma once -#include "git2.h" #include #include "StandAloneDlg.h" diff --git a/src/TortoiseProc/SubmoduleUpdateDlg.cpp b/src/TortoiseProc/SubmoduleUpdateDlg.cpp index d38ab1be5..1ac8e8bfb 100644 --- a/src/TortoiseProc/SubmoduleUpdateDlg.cpp +++ b/src/TortoiseProc/SubmoduleUpdateDlg.cpp @@ -21,7 +21,6 @@ #include "TortoiseProc.h" #include "SubmoduleUpdateDlg.h" #include "AppUtils.h" -#include "git2.h" #include "UnicodeUtils.h" IMPLEMENT_DYNAMIC(CSubmoduleUpdateDlg, CStandAloneDialog) diff --git a/src/TortoiseProc/stdafx.h b/src/TortoiseProc/stdafx.h index c5ce4ac70..b68036b3b 100644 --- a/src/TortoiseProc/stdafx.h +++ b/src/TortoiseProc/stdafx.h @@ -35,6 +35,9 @@ #define LVS_EX_DOUBLEBUFFER 0x00010000 #endif +#pragma warning(push) +#include "git2.h" +#pragma warning(pop) #pragma warning(push) #pragma warning(disable: 4702) // Unreachable code warnings in xtree diff --git a/src/TortoiseShell/GITPropertyPage.h b/src/TortoiseShell/GITPropertyPage.h index acdf4e6f4..aa23bdc3e 100644 --- a/src/TortoiseShell/GITPropertyPage.h +++ b/src/TortoiseShell/GITPropertyPage.h @@ -19,7 +19,6 @@ // #pragma once #include "ShellUpdater.h" -#include "git2.h" #define ListView_GetItemTextEx(hwndLV, i, iSubItem_, __buf) \ { \ diff --git a/src/TortoiseShell/stdafx.h b/src/TortoiseShell/stdafx.h index 7c0fe2ac7..5eb24dff2 100644 --- a/src/TortoiseShell/stdafx.h +++ b/src/TortoiseShell/stdafx.h @@ -35,6 +35,7 @@ #pragma warning(pop) #pragma warning(push) +#include "git2.h" //#include "apr_general.h" //#include "git_pools.h" //#include "git_client.h" -- 2.11.4.GIT