Declare index variables in for-loops outside the loops as needed.

diff --git a/xkeymacs/profile.cpp b/xkeymacs/profile.cpp
index 780f12a..fc8d930 100644 (file)
--- a/xkeymacs/profile.cpp
+++ b/xkeymacs/profile.cpp
@@ -420,7 +420,8 @@ BOOL CALLBACK CProfile::EnumWindowsProc(const HWND hWnd, const LPARAM lParam)
        // Get Process Name\r
        DWORD dwProcessId = 0;\r
        GetWindowThreadProcessId(hWnd, &dwProcessId);\r
-       for (DWORD i = 0; i < CProfile::m_dwTasks; ++i) {\r
+       DWORD i;\r
+       for (i = 0; i < CProfile::m_dwTasks; ++i) {\r
                if (pTask[i].dwProcessId == dwProcessId) {\r
 \r
                        // Get Application Name\r
@@ -818,7 +819,8 @@ void CProfile::SaveCommand(const CString szApplicationName, const int nCommandID
 \r
 void CProfile::AddKeyBind2C_(const CString szApplicationName, const BYTE bVk)\r
 {\r
-       for (int nCommandID = 0; nCommandID < MAX_COMMAND; ++nCommandID) {\r
+       int nCommandID;\r
+       for (nCommandID = 0; nCommandID < MAX_COMMAND; ++nCommandID) {\r
                if (Commands[nCommandID].fCommand == CCommands::C_) {\r
                        break;\r
                }\r
@@ -955,7 +957,8 @@ void CProfile::InitDllData()
 \r
 void CProfile::ClearData(const CString szCurrentApplication)\r
 {\r
-       for (int nApplicationID = 0; nApplicationID < MAX_APP; ++nApplicationID) {\r
+       int nApplicationID;\r
+       for (nApplicationID = 0; nApplicationID < MAX_APP; ++nApplicationID) {\r
                if (m_Data[nApplicationID].GetApplicationName() == szCurrentApplication) {\r
                        break;\r
                }\r

diff --git a/xkeymacs/xkeymacs-vc10.vcxproj b/xkeymacs/xkeymacs-vc10.vcxproj
index fc5486c..215c94d 100644 (file)
--- a/xkeymacs/xkeymacs-vc10.vcxproj
+++ b/xkeymacs/xkeymacs-vc10.vcxproj
@@ -137,7 +137,6 @@
       <WarningLevel>Level4</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <AdditionalIncludeDirectories>C:\WinDDK\7600.16385.1\inc\mfc42</AdditionalIncludeDirectories>\r
-      <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>\r
       <Optimization>MaxSpeed</Optimization>\r
       <OmitFramePointers>true</OmitFramePointers>\r
       <RuntimeTypeInfo>false</RuntimeTypeInfo>\r

diff --git a/xkeymacsdll/ClipboardFormatSnap.cpp b/xkeymacsdll/ClipboardFormatSnap.cpp
index b3b71ba..6d63307 100644 (file)
--- a/xkeymacsdll/ClipboardFormatSnap.cpp
+++ b/xkeymacsdll/ClipboardFormatSnap.cpp
@@ -421,8 +421,8 @@ const int CClipboardFormatSnap::GetTextLength( const int nSizeOfNullTerminator )
 const int CClipboardFormatSnap::GetRTFBodyHead() const\r
 {\r
        int nBra = 0;\r
-\r
-       for( int i = 0; i < m_oData.GetSize(); ++i )\r
+       int i;\r
+       for( i = 0; i < m_oData.GetSize(); ++i )\r
        {\r
                BOOL bBody = FALSE;\r
 \r
@@ -610,7 +610,8 @@ void CClipboardFormatSnap::Add( const char *const pAddedString, const BOOL bTop,
 \r
        if( bTop )\r
        {\r
-               for( int i = nOffset + nSizeOfNullTerminator - 1; 0 <= i ; --i )\r
+               int i;\r
+               for( i = nOffset + nSizeOfNullTerminator - 1; 0 <= i ; --i )\r
                {\r
                        m_oData[ nSizeOfNullTerminator * strlen(pAddedString) + i ] = m_oData[ i ];\r
                }\r
@@ -624,7 +625,8 @@ void CClipboardFormatSnap::Add( const char *const pAddedString, const BOOL bTop,
        }\r
        else\r
        {\r
-               for( unsigned int i = 0; i < strlen( pAddedString ); ++i )\r
+               unsigned int i;\r
+               for( i = 0; i < strlen( pAddedString ); ++i )\r
                {\r
                        for( int j = 0; j < nSizeOfNullTerminator; ++j )\r
                        {\r

diff --git a/xkeymacsdll/ClipboardSnap.cpp b/xkeymacsdll/ClipboardSnap.cpp
index b0ef73f..889c1e3 100644 (file)
--- a/xkeymacsdll/ClipboardSnap.cpp
+++ b/xkeymacsdll/ClipboardSnap.cpp
@@ -125,7 +125,8 @@ const CClipboardSnap& CClipboardSnap::operator+=( const CClipboardSnap& rhs )
                {\r
                        if( rhs.m_oFormatSnaps[ nRHS ]->IsMergeableFormat() )\r
                        {\r
-                               for( int i = 0; i < nMergeableClipboardFormatNumber; ++i )\r
+                               int i;\r
+                               for( i = 0; i < nMergeableClipboardFormatNumber; ++i )\r
                                {\r
                                        if( ( pMergeableClipboardFormatPosition + i )->m_nLHS < 0 ) continue;\r
                                        if( rhs.m_oFormatSnaps[ nRHS ]->IsSameFormat( lhs.m_oFormatSnaps[ ( pMergeableClipboardFormatPosition + i )->m_nLHS ] ) ) break;\r

diff --git a/xkeymacsdll/xkeymacsdll-vc10.vcxproj b/xkeymacsdll/xkeymacsdll-vc10.vcxproj
index b92c224..0804ce5 100644 (file)
--- a/xkeymacsdll/xkeymacsdll-vc10.vcxproj
+++ b/xkeymacsdll/xkeymacsdll-vc10.vcxproj
@@ -141,7 +141,6 @@
       <WarningLevel>Level4</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <AdditionalIncludeDirectories>C:\WinDDK\7600.16385.1\inc\mfc42</AdditionalIncludeDirectories>\r
-      <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>\r
       <Optimization>MaxSpeed</Optimization>\r
       <RuntimeTypeInfo>false</RuntimeTypeInfo>\r
       <OmitFramePointers>true</OmitFramePointers>\r

diff --git a/xkeymacsdll/xkeymacsdll.cpp b/xkeymacsdll/xkeymacsdll.cpp
index b320d74..25cae77 100644 (file)
--- a/xkeymacsdll/xkeymacsdll.cpp
+++ b/xkeymacsdll/xkeymacsdll.cpp
@@ -917,7 +917,8 @@ LRESULT CALLBACK CXkeymacsDll::KeyboardProc(int nCode, WPARAM wParam, LPARAM lPa
                Kdu(nKey);\r
                goto HOOK;\r
        } else {\r
-               for (int i = 0; i < MAX_KEY; ++i) {\r
+               int i;\r
+               for (i = 0; i < MAX_KEY; ++i) {\r
                        if (nOneShotModifier[i] == nKey) {\r
                                break;\r
                        }\r
@@ -1155,7 +1156,8 @@ void CXkeymacsDll::AddKillRing(BOOL bNewData)
                        if (m_oKillRing.IsEmpty()) {\r
                                m_oKillRing.AddHead(pSnap);\r
                        } else {\r
-                               for (CClipboardSnap *pParent = m_oKillRing.GetHead(); pParent->GetNext(); pParent = pParent->GetNext()) {\r
+                               CClipboardSnap *pParent;\r
+                               for (pParent = m_oKillRing.GetHead(); pParent->GetNext(); pParent = pParent->GetNext()) {\r
                                        ;\r
                                }\r
                                pParent->SetNext(pSnap);\r