完成转换

2018-06-02 17:47:28 +08:00
parent 1e383920be
commit 054ef9e65a
24 changed files with 167 additions and 169 deletions
--- a/代码/telsale_aux_kit/proj/vs2017/telsale_aux_kit.sln
+++ b/代码/telsale_aux_kit/proj/vs2017/telsale_aux_kit.sln
@@ -20,6 +20,7 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
+		Qt5Version = 5.10.1_msvc2017_x64
 		SolutionGuid = {A4A9332B-14DA-4126-B98B-613DCABA7F66}
 	EndGlobalSection
 EndGlobal
--- a/代码/telsale_aux_kit/proj/vs2017/telsale_aux_kit/telsale_aux_kit.vcxproj
+++ b/代码/telsale_aux_kit/proj/vs2017/telsale_aux_kit/telsale_aux_kit.vcxproj
@@ -11,7 +11,6 @@
    </ProjectConfiguration>
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="..\..\..\source\check.cpp" />
    <ClCompile Include="..\..\..\source\DataManipulation.cpp" />
    <ClCompile Include="..\..\..\source\main.cpp" />
    <ClCompile Include="..\..\..\source\Parameters.cpp" />
@@ -23,21 +22,17 @@
    <ClCompile Include="..\..\..\source\QRapidInputWidget.cpp" />
    <ClCompile Include="..\..\..\source\QTelSalePolicyInfoInputWidget.cpp" />
    <ClCompile Include="..\..\..\source\QTelSalePolicyInfoQuery.cpp" />
-    <ClCompile Include="..\..\..\source\sqlite\shell.c" />
    <ClCompile Include="..\..\..\source\sqlite\sqlite3.c" />
    <ClCompile Include="..\..\..\source\StringCodeConverter.cpp" />
    <ClCompile Include="..\..\..\source\SystemData.cpp" />
    <ClCompile Include="..\..\..\source\SystemDataQuery.cpp" />
-    <ClCompile Include="..\..\..\source\TelSalePolicyManager.cpp" />
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="..\..\..\source\check.h" />
    <ClInclude Include="..\..\..\source\DataManipulation.h" />
    <ClInclude Include="..\..\..\source\Parameters.h" />
    <ClInclude Include="..\..\..\source\StringCodeConverter.h" />
    <ClInclude Include="..\..\..\source\SystemData.h" />
    <ClInclude Include="..\..\..\source\SystemDataQuery.h" />
-    <ClInclude Include="..\..\..\source\TelSalePolicyManager.h" />
    <QtMoc Include="..\..\..\source\QTelSalePolicyInfoQuery.h" />
    <QtMoc Include="..\..\..\source\QTelSalePolicyInfoInputWidget.h" />
    <QtMoc Include="..\..\..\source\QRapidInputWidget.h" />
@@ -171,6 +166,7 @@
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <LibraryPath>D:\develop\sdk\cpp\Qt\qt_5.10.1\5.10.1\msvc2017_64\lib;$(LibraryPath)</LibraryPath>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
@@ -197,25 +193,26 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <ClCompile>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <Optimization>Disabled</Optimization>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <AdditionalOptions>/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
      <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
      <AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>qtmaind.lib;Qt5Widgetsd.lib;Qt5Cored.lib;Qt5Guid.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
    <QtMoc>
      <OutputFile>.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</OutputFile>
      <ExecutionDescription>Moc'ing %(Identity)...</ExecutionDescription>
-      <IncludePath>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName)\.;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets</IncludePath>
-      <Define>UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB</Define>
+      <IncludePath>.\GeneratedFiles;.;$(QTDIR)\include;$(QTDIR)\include\QtCore;.\GeneratedFiles\$(ConfigurationName);%(AdditionalIncludeDirectories)</IncludePath>
+      <Define>UNICODE;_UNICODE;WIN32;WIN64;%(PreprocessorDefinitions)</Define>
    </QtMoc>
    <QtUic>
      <ExecutionDescription>Uic'ing %(Identity)...</ExecutionDescription>
@@ -229,8 +226,8 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <DebugInformationFormat />
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -240,13 +237,13 @@
      <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
      <AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <AdditionalDependencies>qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>qtmain.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
    <QtMoc>
      <OutputFile>.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</OutputFile>
      <ExecutionDescription>Moc'ing %(Identity)...</ExecutionDescription>
-      <IncludePath>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName)\.;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets</IncludePath>
-      <Define>UNICODE;_UNICODE;WIN32;WIN64;QT_DLL;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB</Define>
+      <IncludePath>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);%(AdditionalIncludeDirectories)</IncludePath>
+      <Define>UNICODE;_UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;%(PreprocessorDefinitions)</Define>
    </QtMoc>
    <QtUic>
      <ExecutionDescription>Uic'ing %(Identity)...</ExecutionDescription>
@@ -265,7 +262,7 @@
  </ImportGroup>
  <ProjectExtensions>
    <VisualStudio>
-      <UserProperties MocDir=".\GeneratedFiles\$(ConfigurationName)" UicDir=".\GeneratedFiles" RccDir=".\GeneratedFiles" lupdateOptions="" lupdateOnBuild="0" lreleaseOptions="" Qt5Version_x0020_x64="5.10.1" MocOptions="" />
+      <UserProperties MocDir=".\GeneratedFiles\$(ConfigurationName)" UicDir=".\GeneratedFiles" RccDir=".\GeneratedFiles" lupdateOptions="" lupdateOnBuild="0" lreleaseOptions="" Qt5Version_x0020_x64="5.10.1_msvc2017_x64" MocOptions="" />
    </VisualStudio>
  </ProjectExtensions>
 </Project>
--- a/代码/telsale_aux_kit/proj/vs2017/telsale_aux_kit/telsale_aux_kit.vcxproj.filters
+++ b/代码/telsale_aux_kit/proj/vs2017/telsale_aux_kit/telsale_aux_kit.vcxproj.filters
@@ -75,9 +75,6 @@
    </Filter>
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="..\..\..\source\sqlite\shell.c">
-      <Filter>sqlite3</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\..\source\sqlite\sqlite3.c">
      <Filter>sqlite3</Filter>
    </ClCompile>
@@ -96,9 +93,6 @@
    <ClCompile Include="..\..\..\source\StringCodeConverter.cpp">
      <Filter>数据\工具</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\..\source\check.cpp">
-      <Filter>数据\数据库操作</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\..\source\SystemData.cpp">
      <Filter>数据\数据库操作</Filter>
    </ClCompile>
@@ -126,9 +120,6 @@
    <ClCompile Include="..\..\..\source\QMainWidget.cpp">
      <Filter>窗口\层叠窗口\层叠子窗口</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\..\source\TelSalePolicyManager.cpp">
-      <Filter>数据</Filter>
-    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\..\source\sqlite\sqlite3.h">
@@ -143,9 +134,6 @@
    <ClInclude Include="..\..\..\source\StringCodeConverter.h">
      <Filter>数据\工具</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\..\source\check.h">
-      <Filter>数据\数据库操作</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\..\source\SystemData.h">
      <Filter>数据\数据库操作</Filter>
    </ClInclude>
@@ -155,9 +143,6 @@
    <ClInclude Include="..\..\..\source\Parameters.h">
      <Filter>数据\参数管理</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\..\source\TelSalePolicyManager.h">
-      <Filter>数据</Filter>
-    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <Image Include="..\..\..\source\Resources\car.png">
--- a/代码/telsale_aux_kit/proj/vs2017/telsale_aux_kit/telsale_aux_kit.vcxproj.user
+++ b/代码/telsale_aux_kit/proj/vs2017/telsale_aux_kit/telsale_aux_kit.vcxproj.user
@@ -2,11 +2,11 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <QTDIR>D:\develop\sdk\cpp\qt\qt_5.10.1\5.10.1\msvc2017_64</QTDIR>
+    <QTDIR>D:\develop\sdk\cpp\Qt\qt_5.10.1\5.10.1\msvc2017_64</QTDIR>
    <LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3b$(PATH)</LocalDebuggerEnvironment>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <QTDIR>D:\develop\sdk\cpp\qt\qt_5.10.1\5.10.1\msvc2017_64</QTDIR>
+    <QTDIR>D:\develop\sdk\cpp\Qt\qt_5.10.1\5.10.1\msvc2017_64</QTDIR>
    <LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3b$(PATH)</LocalDebuggerEnvironment>
  </PropertyGroup>
 </Project>