- fixed issue with saving database path on first run

- removed ability to convert old access db to sqlite, if needed they can first run an older version then this version.

AccessToSqlite.cpp

@@ -1,50 +0,0 @@
-#include "stdafx.h"
-#include "AccessToSqlite.h"
-#include "Options.h"
-#include "Misc.h"
-#include "shared/TextConvert.h"
-
-
-BOOL CAccessToSqlite::ConvertDatabase(const TCHAR *pNewDatabase, const TCHAR *pOldDatabase)
-{
-	BOOL bRet = FALSE;
-
-	CString csFile = CGetSetOptions::GetExeFileName();
-	csFile = GetFilePath(csFile);
-	csFile += "AccessToSqlite.dll";
-
- 	HMODULE hModule = LoadLibrary(csFile);
- 	PLUGIN_CONVERT_DATABASE Function;
- 	if(hModule)
- 	{
- 		Function = (PLUGIN_CONVERT_DATABASE)GetProcAddress(hModule, "ConvertDatabase");
- 
- 		if(Function)
- 		{
-			CStringA csNew = CTextConvert::ConvertToChar(pNewDatabase);
-			CStringA csOld = CTextConvert::ConvertToChar(pOldDatabase);
-
- 			bRet = Function(csNew, csOld);
- 		}
-		else
-		{
-			MessageBox(NULL, _T("Error loading function from conversion DLL"), _T("Ditto Error"), MB_OK);
-		}
-
-		FreeLibrary(hModule);
- 	}
-	else
-	{
-		MessageBox(NULL, _T("Error loading conversion DLL"), _T("Ditto Error"), MB_OK);
-	}
-
-	return bRet;
-}
-
-CAccessToSqlite::CAccessToSqlite(void)
-{
-}
-
-CAccessToSqlite::~CAccessToSqlite(void)
-{
-}

AccessToSqlite.h

@@ -1,13 +0,0 @@
-#pragma once
-
-typedef BOOL (*PLUGIN_CONVERT_DATABASE)(const char *, const char *);
-
-class CAccessToSqlite
-{
-public:
-	CAccessToSqlite(void);
-
-	BOOL ConvertDatabase(const TCHAR *pNewDatabase, const TCHAR *pOldDatabase);
-public:
-	~CAccessToSqlite(void);
-};

CP_Main.cpp

@@ -289,7 +289,7 @@ BOOL CCP_MainApp::InitInstance()
 
 		m_Language.LoadLanguageFile(_T("English.xml"));
 	}
-
+	
 	int nRet = CheckDBExists(CGetSetOptions::GetDBPath());
 	if(nRet == FALSE)
 	{

CP_Main.vcxproj

@@ -363,29 +363,6 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="Accels.cpp" />
-    <ClCompile Include="AccessToSqlite.cpp">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
     <ClCompile Include="ActionEnums.cpp" />
     <ClCompile Include="AddType.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
@@ -1960,7 +1937,6 @@
     <ClInclude Include="SendSocket.h" />
     <ClInclude Include="Server.h" />
     <ClInclude Include="About.h" />
-    <ClInclude Include="AccessToSqlite.h" />
     <ClInclude Include="AddType.h" />
     <ClInclude Include="BitmapHelper.h" />
     <ClInclude Include="CF_HDropAggregator.h" />

CP_Main.vcxproj.filters

@@ -40,9 +40,6 @@
     <ClCompile Include="AlphaBlend.cpp">
       <Filter>source</Filter>
     </ClCompile>
-    <ClCompile Include="AccessToSqlite.cpp">
-      <Filter>source</Filter>
-    </ClCompile>
     <ClCompile Include="AddType.cpp">
       <Filter>source</Filter>
     </ClCompile>
@@ -467,9 +464,6 @@
     <ClInclude Include="Accels.h">
       <Filter>header</Filter>
     </ClInclude>
-    <ClInclude Include="AccessToSqlite.h">
-      <Filter>header</Filter>
-    </ClInclude>
     <ClInclude Include="AddType.h">
       <Filter>header</Filter>
     </ClInclude>

DatabaseUtilities.cpp

@@ -7,7 +7,6 @@
 #include "DatabaseUtilities.h"
 #include "ProcessPaste.h"
 #include <io.h>
-#include "AccessToSqlite.h"
 #include "Path.h"
 #include "InternetUpdate.h"
 
@@ -98,26 +97,7 @@ BOOL CheckDBExists(CString csDBPath)
 	if(csDBPath.IsEmpty())
 	{
 		csDBPath = GetDefaultDBName();
-
-		if(FileExists(csDBPath) == FALSE && 
-			CGetSetOptions::GetIsPortableDitto() == FALSE &&
-			CGetSetOptions::GetIsWindowsApp() == FALSE)
-		{
-			CString csOldDB = CGetSetOptions::GetDBPathOld();
-			if(csOldDB.IsEmpty())
-			{
-				csOldDB = GetOLDDefaultDBName();
-			}
-
-			if(FileExists(csOldDB))
-			{
-				//create the new sqlite db
-				CreateDB(csDBPath);
-
-				CAccessToSqlite Convert;
-				Convert.ConvertDatabase(csDBPath, csOldDB);
-			}
-		}
+		CGetSetOptions::SetDBPath(csDBPath);		
 	}
 
 	BOOL bRet = FALSE;

OptionsGeneral.cpp

@@ -8,7 +8,6 @@
 #include <io.h>
 #include <Mmsystem.h> //play sound
 #include "Path.h"
-#include "AccessToSqlite.h"
 #include "AdvGeneral.h"
 #include "DimWnd.h"
 #include "HyperLink.h"
@@ -384,44 +383,6 @@ void COptionsGeneral::OnGetPath()
 		return;
 
 	CString csPath(FileName.lpstrFile);
-	CPath path(FileName.lpstrFile);
-
-	if(path.GetExtension() == _T("mdb"))
-	{
-		CString cs;
-
-		cs.Format(_T("The database '%s' must be converted to a Sqlite Database (Version 3 format).\n\nConvert database?"), FileName.lpstrFile);
-		if(MessageBox(cs, _T("Ditto"), MB_YESNO) == IDNO)
-			return;
-
-		CString csNewDBPath = path.RemoveExtension();
-
-		//Make sure the db name is unique
-		CString csTempName;
-		csTempName.Format(_T("%s.db"), csNewDBPath);
-		int i = 1;
-		while(FileExists(csTempName))
-		{
-			csTempName.Format(_T("%s_%d.db"), csNewDBPath, i);
-			i++;
-		}
-		csNewDBPath = csTempName;
-		
-		CreateDB(csNewDBPath);
-
-		CAccessToSqlite Convert;
-		if(Convert.ConvertDatabase(csNewDBPath, FileName.lpstrFile))
-		{
-			csPath = csNewDBPath;
-		}
-		else
-		{
-			MessageBox(_T("Error converting database."), _T("Ditto"), MB_OK);
-			DeleteFile(csNewDBPath);
-			return;
-		}
-	}
-
 	if(FileExists(csPath))
 	{
 		if(ValidDB(csPath) == FALSE)