Fix CStringList TortoiseShell build problem

diff --git a/ext/ResizableLib/ResizableLib.vcproj b/ext/ResizableLib/ResizableLib.vcproj
index db50a1e..785463e 100644 (file)
--- a/ext/ResizableLib/ResizableLib.vcproj
+++ b/ext/ResizableLib/ResizableLib.vcproj
@@ -21,8 +21,8 @@
        <Configurations>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="..\..\obj\ResizableLib\Release"\r
-                       IntermediateDirectory="..\..\obj\ResizableLib\Release"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\ResizeableLib\$(ConfigurationName)\"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -98,8 +98,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="..\obj\ResizableLib\Debug"\r
-                       IntermediateDirectory="..\obj\ResizableLib\Debug"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\ResizeableLib\$(ConfigurationName)\"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r

diff --git a/ext/hunspell/hunspell.vcproj b/ext/hunspell/hunspell.vcproj
index 8b093e1..e7445c8 100644 (file)
--- a/ext/hunspell/hunspell.vcproj
+++ b/ext/hunspell/hunspell.vcproj
@@ -17,8 +17,8 @@
        <Configurations>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory=".\Release"\r
-                       IntermediateDirectory=".\Release"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\hunspell\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r
@@ -91,8 +91,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory=".\Debug"\r
-                       IntermediateDirectory=".\Debug"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\hunspell\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r

diff --git a/ext/scintilla/vcbuild/SciLexer.vcproj b/ext/scintilla/vcbuild/SciLexer.vcproj
index b81e0a1..f58d9f3 100644 (file)
--- a/ext/scintilla/vcbuild/SciLexer.vcproj
+++ b/ext/scintilla/vcbuild/SciLexer.vcproj
@@ -17,8 +17,8 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory=".\../bin"\r
-                       IntermediateDirectory=".\Debug"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\SciLexer\$(ConfigurationName)\"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r
@@ -113,8 +113,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory=".\../bin"\r
-                       IntermediateDirectory=".\Release"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\SciLexer\$(ConfigurationName)\"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r

diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp
index 26891ac..60c81ec 100644 (file)
--- a/src/Git/Git.cpp
+++ b/src/Git/Git.cpp
@@ -288,7 +288,7 @@ git_revnum_t CGit::GetHash(CString &friendname)
        return out;\r
 }\r
 \r
-int CGit::GetTagList(CStringList &list)\r
+int CGit::GetTagList(STRING_VECTOR &list)\r
 {\r
        int ret;\r
        CString cmd,output;\r
@@ -303,13 +303,13 @@ int CGit::GetTagList(CStringList &list)
                {\r
                        i++;\r
                        one=output.Tokenize(_T("\n"),pos);\r
-                       list.AddTail(one);\r
+                       list.push_back(one);\r
                }\r
        }\r
        return ret;\r
 }\r
 \r
-int CGit::GetBranchList(CStringList &list,int *current,BRANCH_TYPE type)\r
+int CGit::GetBranchList(STRING_VECTOR &list,int *current,BRANCH_TYPE type)\r
 {\r
        int ret;\r
        CString cmd,output;\r
@@ -330,7 +330,7 @@ int CGit::GetBranchList(CStringList &list,int *current,BRANCH_TYPE type)
                {\r
                        i++;\r
                        one=output.Tokenize(_T("\n"),pos);\r
-                       list.AddTail(one.Right(one.GetLength()-2));\r
+                       list.push_back(one.Right(one.GetLength()-2));\r
                        if(one[0] == _T('*'))\r
                                if(current)\r
                                        *current=i;\r
@@ -339,7 +339,7 @@ int CGit::GetBranchList(CStringList &list,int *current,BRANCH_TYPE type)
        return ret;\r
 }\r
 \r
-int CGit::GetRemoteList(CStringList &list)\r
+int CGit::GetRemoteList(STRING_VECTOR &list)\r
 {\r
        int ret;\r
        CString cmd,output;\r
@@ -359,7 +359,7 @@ int CGit::GetRemoteList(CStringList &list)
                                url=one.Right(one.GetLength()-start-1);\r
                                one=url;\r
                                one=one.Left(one.Find(_T("."),0));\r
-                               list.AddTail(one);\r
+                               list.push_back(one);\r
                        }\r
                }\r
        }\r

diff --git a/src/Git/Git.h b/src/Git/Git.h
index 833445a..653a493 100644 (file)
--- a/src/Git/Git.h
+++ b/src/Git/Git.h
@@ -13,6 +13,7 @@ enum
 typedef std::vector<CString> STRING_VECTOR;\r
 typedef std::map<CString, STRING_VECTOR> MAP_HASH_NAME;\r
 \r
+\r
 class CGit\r
 {\r
 private:\r
@@ -41,9 +42,9 @@ public:
                BRANCH_ALL=BRANCH_LOCAL|BRANCH_REMOTE,\r
        }BRANCH_TYPE;\r
 \r
-       int GetRemoteList(CStringList &list);\r
-       int GetBranchList(CStringList &list, int *Current,BRANCH_TYPE type=BRANCH_LOCAL);\r
-       int GetTagList(CStringList &list);\r
+       int GetRemoteList(STRING_VECTOR &list);\r
+       int GetBranchList(STRING_VECTOR &list, int *Current,BRANCH_TYPE type=BRANCH_LOCAL);\r
+       int GetTagList(STRING_VECTOR &list);\r
        int GetMapHashToFriendName(MAP_HASH_NAME &map);\r
        \r
        //hash is empty means all. -1 means all\r

diff --git a/src/Git/Git.vcproj b/src/Git/Git.vcproj
index 0ca9773..c2bdd05 100644 (file)
--- a/src/Git/Git.vcproj
+++ b/src/Git/Git.vcproj
@@ -18,7 +18,7 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
                        IntermediateDirectory="..\..\obj\git\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
@@ -82,8 +82,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\git\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
                        CharacterSet="1"\r

diff --git a/src/Git/GitRev.cpp b/src/Git/GitRev.cpp
index a0bf2da..05fb892 100644 (file)
--- a/src/Git/GitRev.cpp
+++ b/src/Git/GitRev.cpp
@@ -141,19 +141,19 @@ CTime GitRev::ConverFromString(CString input)
 \r
 int GitRev::SafeFetchFullInfo(CGit *git)\r
 {\r
-       if(InterlockedExchange(&m_IsUpdateing,TRUE) == FALSE)
-       {
-               //GitRev rev;
-               CString onelog;
-               git->GetLog(onelog,m_CommitHash,1);
-               CString oldhash=m_CommitHash;
-               ParserFromLog(onelog);
-               
-               ASSERT(oldhash==m_CommitHash);
-
-               InterlockedExchange(&m_IsUpdateing,FALSE);
-               InterlockedExchange(&m_IsFull,TRUE);
-               return 0;
-       }
+       if(InterlockedExchange(&m_IsUpdateing,TRUE) == FALSE)\r
+       {\r
+               //GitRev rev;\r
+               CString onelog;\r
+               git->GetLog(onelog,m_CommitHash,1);\r
+               CString oldhash=m_CommitHash;\r
+               ParserFromLog(onelog);\r
+               \r
+               //ASSERT(oldhash==m_CommitHash);\r
+\r
+               InterlockedExchange(&m_IsUpdateing,FALSE);\r
+               InterlockedExchange(&m_IsFull,TRUE);\r
+               return 0;\r
+       }\r
        return -1;\r
 }
\ No newline at end of file

diff --git a/src/TGitCache/CachedDirectory.h b/src/TGitCache/CachedDirectory.h
index 71e2da6..08e76cc 100644 (file)
--- a/src/TGitCache/CachedDirectory.h
+++ b/src/TGitCache/CachedDirectory.h
@@ -19,7 +19,7 @@
 #pragma once\r
 \r
 #include "StatusCacheEntry.h"\r
-#include "TSVNPath.h"\r
+#include "TGitPath.h"\r
 \r
 /**\r
  * \ingroup TSVNCache\r

diff --git a/src/TGitCache/TSVNCache.vcproj b/src/TGitCache/TSVNCache.vcproj
index 0bfdf05..bc4f210 100644 (file)
--- a/src/TGitCache/TSVNCache.vcproj
+++ b/src/TGitCache/TSVNCache.vcproj
@@ -21,8 +21,8 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="..\..\Bin\Debug\Bin"\r
-                       IntermediateDirectory="..\..\obj\TSVNCache\Debug"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\TSVNCache\$(ConfigurationName)\"\r
                        ConfigurationType="1"\r
                        UseOfATL="1"\r
                        CharacterSet="1"\r
@@ -45,7 +45,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;..\..\ext\gettext\include"\r
+                               AdditionalIncludeDirectories="&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\Git;..\..\ext\gettext\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;UNICODE;_UNICODE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -104,8 +104,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="..\..\bin\Release\bin"\r
-                       IntermediateDirectory="..\..\obj\TGitCache\Release"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\TSVNCache\$(ConfigurationName)\"\r
                        ConfigurationType="1"\r
                        UseOfATL="1"\r
                        CharacterSet="1"\r
@@ -129,7 +129,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                InlineFunctionExpansion="2"\r
-                               AdditionalIncludeDirectories="../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;..\..\ext\gettext\include"\r
+                               AdditionalIncludeDirectories="&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\Git;..\..\ext\gettext\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;UNICODE;_UNICODE"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
@@ -433,18 +433,6 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Svn\SVNAdminDir.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\SVN\SVNGlobal.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\Svn\SVNHelpers.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\Svn\SVNStatus.cpp"\r
                                >\r
                        </File>\r

diff --git a/src/TortoiseProc/ChooseVersion.h b/src/TortoiseProc/ChooseVersion.h
index f4e51b1..128fec0 100644 (file)
--- a/src/TortoiseProc/ChooseVersion.h
+++ b/src/TortoiseProc/ChooseVersion.h
@@ -58,11 +58,11 @@ protected:
 \r
        void Init()\r
        {\r
-               CStringList list;\r
+               STRING_VECTOR list;\r
                g_Git.GetTagList(list);\r
                m_ChooseVersioinTags.AddString(list);\r
 \r
-               list.RemoveAll();\r
+               list.clear();\r
                int current;\r
                g_Git.GetBranchList(list,&current,CGit::BRANCH_ALL);\r
                m_ChooseVersioinBranch.AddString(list);\r

diff --git a/src/TortoiseProc/FormatPatchDlg.cpp b/src/TortoiseProc/FormatPatchDlg.cpp
index 8087b4f..7528677 100644 (file)
--- a/src/TortoiseProc/FormatPatchDlg.cpp
+++ b/src/TortoiseProc/FormatPatchDlg.cpp
@@ -73,7 +73,7 @@ BOOL CFormatPatchDlg::OnInitDialog()
        m_cDir.LoadHistory(_T("Software\\TortoiseGit\\History\\FormatPatchURLS"), _T("path"));\r
        m_cDir.SetCurSel(0);\r
 \r
-       CStringList list;\r
+       STRING_VECTOR list;\r
        g_Git.GetBranchList(list,NULL,CGit::BRANCH_ALL);\r
        m_cSince.AddString(list);\r
 \r

diff --git a/src/TortoiseProc/PushDlg.cpp b/src/TortoiseProc/PushDlg.cpp
index 6330e55..fc10f83 100644 (file)
--- a/src/TortoiseProc/PushDlg.cpp
+++ b/src/TortoiseProc/PushDlg.cpp
@@ -67,27 +67,19 @@ BOOL CPushDlg::OnInitDialog()
        m_RemoteURL.EnableWindow(FALSE);\r
        CheckRadioButton(IDC_RD_REMOTE,IDC_RD_URL,IDC_RD_REMOTE);\r
 \r
-       CStringList list;\r
+       STRING_VECTOR list;\r
 \r
        if(!g_Git.GetRemoteList(list))\r
        {       \r
-               POSITION pos;\r
-               pos=list.GetHeadPosition();\r
-               while(pos)\r
-               {\r
-                       m_Remote.AddString(list.GetNext(pos));\r
-               }\r
+               for(int i=0;i<list.size();i++)\r
+                       m_Remote.AddString(list[i]);\r
        }\r
 \r
        int current=0;\r
        if(!g_Git.GetBranchList(list,&current))\r
        {\r
-               POSITION pos;\r
-               pos=list.GetHeadPosition();\r
-               while(pos)\r
-               {\r
-                       m_BranchSource.AddString(list.GetNext(pos));\r
-               }\r
+               for(int i=0;i<list.size();i++)\r
+                       m_BranchSource.AddString(list[i]);\r
        }\r
        m_BranchSource.SetCurSel(current);\r
        \r

diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj
index d2b88c3..d346634 100644 (file)
--- a/src/TortoiseProc/TortoiseProc.vcproj
+++ b/src/TortoiseProc/TortoiseProc.vcproj
@@ -21,8 +21,8 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="..\..\bin\Debug\bin"\r
-                       IntermediateDirectory="..\..\obj\TortoiseProc\Debug"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\TortoiseProc\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        UseOfMFC="2"\r
                        UseOfATL="1"\r
@@ -108,8 +108,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="..\..\bin\Release\bin"\r
-                       IntermediateDirectory="..\..\obj\TortoiseProc\Release"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\TortoiseProc\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        UseOfMFC="2"\r
                        CharacterSet="1"\r
@@ -167,7 +167,7 @@
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"\r
                                LinkIncremental="1"\r
-                               IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;"\r
+                               IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;LIBCMT"\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -566,11 +566,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\explorer.ico"\r
+                               RelativePath=".\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\explorer.ico"\r
+                               RelativePath="..\Resources\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -806,19 +806,19 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\newfolder.ico"\r
+                               RelativePath=".\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\newfolder.ico"\r
+                               RelativePath="..\Resources\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\open.ico"\r
+                               RelativePath=".\open.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\open.ico"\r
+                               RelativePath="..\Resources\open.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -922,19 +922,19 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\save.ico"\r
+                               RelativePath=".\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\save.ico"\r
+                               RelativePath="..\Resources\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\saveas.ico"\r
+                               RelativePath=".\saveas.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\saveas.ico"\r
+                               RelativePath="..\Resources\saveas.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1026,11 +1026,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\up.ico"\r
+                               RelativePath=".\up.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\up.ico"\r
+                               RelativePath="..\Resources\up.ico"\r
                                >\r
                        </File>\r
                        <File\r

diff --git a/src/TortoiseShell/TortoiseShell.vcproj b/src/TortoiseShell/TortoiseShell.vcproj
index c48e75a..23ed5c1 100644 (file)
--- a/src/TortoiseShell/TortoiseShell.vcproj
+++ b/src/TortoiseShell/TortoiseShell.vcproj
@@ -20,8 +20,8 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="..\..\bin\Debug\bin"\r
-                       IntermediateDirectory="..\..\obj\TortoiseShell\Debug"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\TortoiseShell\$(ConfigurationName)\"\r
                        ConfigurationType="2"\r
                        UseOfMFC="0"\r
                        UseOfATL="1"\r
@@ -126,8 +126,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="..\..\bin\Release\bin"\r
-                       IntermediateDirectory="..\..\obj\TortoiseShell\Release"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\TortoiseShell\$(ConfigurationName)\"\r
                        ConfigurationType="2"\r
                        UseOfMFC="0"\r
                        UseOfATL="1"\r

diff --git a/src/TortoiseUDiff/TortoiseUDiff.vcproj b/src/TortoiseUDiff/TortoiseUDiff.vcproj
index f5e930b..8366d4f 100644 (file)
--- a/src/TortoiseUDiff/TortoiseUDiff.vcproj
+++ b/src/TortoiseUDiff/TortoiseUDiff.vcproj
@@ -21,8 +21,8 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="..\..\bin\Debug\bin"\r
-                       IntermediateDirectory="..\..\obj\TortoiseUDiff\Debug"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\TortoiseUDiff\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        CharacterSet="1"\r
                        >\r
@@ -95,8 +95,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="..\..\bin\Release\bin"\r
-                       IntermediateDirectory="..\..\obj\TortoiseUDiff\Release"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\TortoiseUDiff\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r

diff --git a/src/Utils/MiscUI/HistoryCombo.cpp b/src/Utils/MiscUI/HistoryCombo.cpp
index d669707..e15f7e0 100644 (file)
--- a/src/Utils/MiscUI/HistoryCombo.cpp
+++ b/src/Utils/MiscUI/HistoryCombo.cpp
@@ -315,13 +315,11 @@ void CHistoryCombo::SetMaxHistoryItems(int nMaxItems)
        for (int n = m_nMaxHistoryItems; n < nNumItems; n++)\r
                DeleteString(m_nMaxHistoryItems);\r
 }\r
-void CHistoryCombo::AddString(CStringList &list)\r
+void CHistoryCombo::AddString(STRING_VECTOR &list)\r
 {\r
-       POSITION pos;\r
-       pos=list.GetHeadPosition();\r
-       while(pos)\r
+       for(int i=0;i<list.size();i++)\r
        {\r
-               AddString(list.GetNext(pos));\r
+               AddString(list[i]);\r
        }\r
 }\r
 CString CHistoryCombo::GetString() const\r

diff --git a/src/Utils/MiscUI/HistoryCombo.h b/src/Utils/MiscUI/HistoryCombo.h
index c5ee1b0..a3f29bd 100644 (file)
--- a/src/Utils/MiscUI/HistoryCombo.h
+++ b/src/Utils/MiscUI/HistoryCombo.h
@@ -36,6 +36,7 @@
  * \r
  * thats it. \r
  */\r
+#include "git.h"\r
 class CHistoryCombo : public CComboBoxEx\r
 {\r
 // Construction\r
@@ -111,7 +112,7 @@ public:
         */\r
        CString GetString() const;\r
 \r
-       void AddString(CStringList &list);\r
+       void AddString(STRING_VECTOR &list);\r
 \r
 protected:\r
        /**\r

diff --git a/src/Utils/Utils.vcproj b/src/Utils/Utils.vcproj
index 74ced49..441895a 100644 (file)
--- a/src/Utils/Utils.vcproj
+++ b/src/Utils/Utils.vcproj
@@ -18,8 +18,8 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)"\r
-                       IntermediateDirectory="..\..\obj\$(ConfigurationName)"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)\"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
                        UseOfATL="1"\r
@@ -82,8 +82,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)\"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
                        CharacterSet="1"\r