diff --git a/Version Control.accda.src/modules/clsDbForm.cls b/Version Control.accda.src/modules/clsDbForm.cls index 4e54ff3e..f3ca77c8 100644 --- a/Version Control.accda.src/modules/clsDbForm.cls +++ b/Version Control.accda.src/modules/clsDbForm.cls @@ -70,7 +70,7 @@ Private Sub IDbComponent_Import(strFile As String) End If ' Load the form from the source file - LoadComponentFromText acForm, strName, strFile, Me + LoadComponentFromText acForm, strName, strFile Set m_Form = CurrentProject.AllForms(strName) VCSIndex.Update Me, eatImport, GetCodeModuleHash(IDbComponent_ComponentType, strName) diff --git a/Version Control.accda.src/modules/clsDbModule.cls b/Version Control.accda.src/modules/clsDbModule.cls index 79c13336..e342a840 100644 --- a/Version Control.accda.src/modules/clsDbModule.cls +++ b/Version Control.accda.src/modules/clsDbModule.cls @@ -145,7 +145,7 @@ Private Function ParseSourceFile(strFile As String, strName As String) As udtVba blnIsClass = True Exit For End If - ' Exit after 10 lines + ' Exit after 9 lines If lngLine > 8 Then Exit For Next lngLine diff --git a/Version Control.accda.src/modules/clsDbReport.cls b/Version Control.accda.src/modules/clsDbReport.cls index 203ac99f..755c5539 100644 --- a/Version Control.accda.src/modules/clsDbReport.cls +++ b/Version Control.accda.src/modules/clsDbReport.cls @@ -58,7 +58,7 @@ Private Sub IDbComponent_Import(strFile As String) If Not strFile Like "*.bas" Then Exit Sub strName = GetObjectNameFromFileName(strFile) - LoadComponentFromText acReport, strName, strFile, Me + LoadComponentFromText acReport, strName, strFile Set m_Report = CurrentProject.AllReports(strName) VCSIndex.Update Me, eatImport, GetFileHash(strFile), GetCodeModuleHash(IDbComponent_ComponentType, strName) diff --git a/Version Control.accda.src/modules/clsDevMode.cls b/Version Control.accda.src/modules/clsDevMode.cls index c8b1f821..f51e763a 100644 --- a/Version Control.accda.src/modules/clsDevMode.cls +++ b/Version Control.accda.src/modules/clsDevMode.cls @@ -1012,10 +1012,8 @@ End Sub ' Public Function AddToExportFile(strFileContent As String) As String - Dim strTempFile As String Dim strLine As String Dim varLines As Variant - Dim strData As String Dim lngLine As Long Dim blnFound As Boolean Dim blnInBlock As Boolean diff --git a/Version Control.accda.src/modules/clsGitIntegration.cls b/Version Control.accda.src/modules/clsGitIntegration.cls index ace9583d..8b71d0cf 100644 --- a/Version Control.accda.src/modules/clsGitIntegration.cls +++ b/Version Control.accda.src/modules/clsGitIntegration.cls @@ -272,7 +272,6 @@ End Function '--------------------------------------------------------------------------------------- ' Public Function IsInsideRepository() As Boolean - Dim strResult As String If Me.GitInstalled Then IsInsideRepository = (RunGitCommand(egcIsInsideTree) = "true") End If diff --git a/Version Control.accda.src/modules/clsOptions.cls b/Version Control.accda.src/modules/clsOptions.cls index 3368b3e5..1247615e 100644 --- a/Version Control.accda.src/modules/clsOptions.cls +++ b/Version Control.accda.src/modules/clsOptions.cls @@ -275,9 +275,6 @@ End Sub ' Private Sub Upgrade(ByRef dOptions As Dictionary) - Dim dFiles As Dictionary - Dim strPath As String - ' 6/16/2021 ' Aggressive sanitize to sanitize levels If dOptions.Exists("AggressiveSanitize") Then @@ -327,7 +324,6 @@ End Sub Private Function HasUnifiedLayoutFilesInGit(strExportPath As String) As Boolean Dim blnHasFiles As Boolean - Dim strFolder As String ' See if we have any ".bas" files, but no corresponding ".cls" files in the ' forms and reports export folders. diff --git a/Version Control.accda.src/modules/clsSourceParser.cls b/Version Control.accda.src/modules/clsSourceParser.cls index c418160b..b1cfd187 100644 --- a/Version Control.accda.src/modules/clsSourceParser.cls +++ b/Version Control.accda.src/modules/clsSourceParser.cls @@ -222,8 +222,8 @@ End Function ' Purpose : Return a hash of the sanitized content '--------------------------------------------------------------------------------------- ' -Public Function Hash(Optional blnWithBOM As Boolean = True) As String - Hash = GetStringHash(this.strOutput, blnWithBOM) +Public Function Hash(Optional blnWithBom As Boolean = True) As String + Hash = GetStringHash(this.strOutput, blnWithBom) End Function @@ -246,8 +246,6 @@ Private Function SanitizeObject() As String 'strPath As String, blnReturnHash As Dim blnIsReport As Boolean Dim blnIsPassThroughQuery As Boolean Dim curStart As Currency - Dim strTempFile As String - Dim strContent As String Dim cVBA As clsConcat If DebugMode(True) Then On Error GoTo 0 Else On Error Resume Next diff --git a/Version Control.accda.src/modules/clsSqlFormatter.cls b/Version Control.accda.src/modules/clsSqlFormatter.cls index bdbe7866..ea683dba 100644 --- a/Version Control.accda.src/modules/clsSqlFormatter.cls +++ b/Version Control.accda.src/modules/clsSqlFormatter.cls @@ -1628,6 +1628,7 @@ End Function ' Author : Adam Waller ' Date : 8/18/2023 ' Purpose : Print out AscW indexes of each character in the string. +' : (Use this when building case statements) '--------------------------------------------------------------------------------------- ' Private Function GetAscWFromString(strText As String) As String diff --git a/Version Control.accda.src/modules/modFunctions.bas b/Version Control.accda.src/modules/modFunctions.bas index 2f20d2b6..a19e3e4a 100644 --- a/Version Control.accda.src/modules/modFunctions.bas +++ b/Version Control.accda.src/modules/modFunctions.bas @@ -910,10 +910,10 @@ End Function ' : I.e. c:\test.bas > c:\test.cls '--------------------------------------------------------------------------------------- ' -Public Function SwapExtension(strFilePath As String, strNewExtension As String) As String +Public Function SwapExtension(strFilePath As String, strNewExtensionWithoutDelimiter As String) As String Dim strCurrentExt As String strCurrentExt = FSO.GetExtensionName(strFilePath) - SwapExtension = Left(strFilePath, Len(strFilePath) - Len(strCurrentExt)) & strNewExtension + SwapExtension = Left(strFilePath, Len(strFilePath) - Len(strCurrentExt)) & strNewExtensionWithoutDelimiter End Function diff --git a/Version Control.accda.src/modules/modInstall.bas b/Version Control.accda.src/modules/modInstall.bas index f2a331bc..8945635f 100644 --- a/Version Control.accda.src/modules/modInstall.bas +++ b/Version Control.accda.src/modules/modInstall.bas @@ -113,7 +113,7 @@ Public Sub InstallVCSAddin(blnTrustFolder As Boolean, blnUseRibbon As Boolean, b .blnTrustAddInFolder = blnTrustFolder If .strInstallFolder <> strInstallFolder Then ' Attempt to migrate any saved user settings files - MigrateUserFiles .strInstallFolder, strInstallFolder, GetFilePathsInFolder(.strInstallFolder) + MigrateUserFiles strInstallFolder, GetFilePathsInFolder(.strInstallFolder) ' Update install folder to new path .strInstallFolder = strInstallFolder End If @@ -305,7 +305,7 @@ End Function ' : the source file. '--------------------------------------------------------------------------------------- ' -Private Sub MigrateUserFiles(strFromFolder As String, strToFolder As String, colNames As Dictionary) +Private Sub MigrateUserFiles(strToFolder As String, colNames As Dictionary) Dim varKey As Variant Dim strFile As String diff --git a/Version Control.accda.src/modules/modVCSUtility.bas b/Version Control.accda.src/modules/modVCSUtility.bas index 179f19b6..cc09512f 100644 --- a/Version Control.accda.src/modules/modVCSUtility.bas +++ b/Version Control.accda.src/modules/modVCSUtility.bas @@ -411,7 +411,6 @@ Public Function SaveComponentAsText(intType As AcObjectType, _ Dim strTempFile As String Dim strAltFile As String Dim strContent As String - Dim strPrefix As String Dim strPrintSettingsFile As String Dim strHash As String Dim cParser As clsSourceParser @@ -533,10 +532,7 @@ End Function ' Purpose : Load the object into the database from the saved source file. '--------------------------------------------------------------------------------------- ' -Public Sub LoadComponentFromText(intType As AcObjectType, _ - strName As String, _ - strFile As String, _ - Optional cDbObjectClass As IDbComponent = Nothing) +Public Sub LoadComponentFromText(intType As AcObjectType, strName As String, strFile As String) Dim strTempFile As String Dim strSourceFile As String @@ -544,8 +540,6 @@ Public Sub LoadComponentFromText(intType As AcObjectType, _ Dim strContent As String Dim blnVbaOverlay As Boolean Dim blnConvert As Boolean - Dim dFile As Dictionary - Dim cParser As clsSourceParser ' In most cases we are importing/converting the actual source file. strSourceFile = strFile