summaryrefslogtreecommitdiff
path: root/plugins/Import
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Import')
-rw-r--r--plugins/Import/docs/import-translation.txt (renamed from plugins/Import/import-translation.txt)0
-rw-r--r--plugins/Import/import_10.vcxproj39
-rw-r--r--plugins/Import/import_10.vcxproj.filters27
-rw-r--r--plugins/Import/res/import.ico (renamed from plugins/Import/import.ico)bin5430 -> 5430 bytes
-rw-r--r--plugins/Import/res/resource.rc (renamed from plugins/Import/resource.rc)4
-rw-r--r--plugins/Import/src/ICQserver.cpp (renamed from plugins/Import/ICQserver.cpp)0
-rw-r--r--plugins/Import/src/ICQserver.h (renamed from plugins/Import/ICQserver.h)0
-rw-r--r--plugins/Import/src/import.h (renamed from plugins/Import/import.h)3
-rw-r--r--plugins/Import/src/main.cpp (renamed from plugins/Import/main.cpp)0
-rw-r--r--plugins/Import/src/mirabilis.cpp (renamed from plugins/Import/mirabilis.cpp)0
-rw-r--r--plugins/Import/src/mirabilis.h (renamed from plugins/Import/mirabilis.h)0
-rw-r--r--plugins/Import/src/miranda.cpp (renamed from plugins/Import/miranda.cpp)0
-rw-r--r--plugins/Import/src/mirandadb0700.h (renamed from plugins/Import/mirandadb0700.h)0
-rw-r--r--plugins/Import/src/mirandahistory.cpp (renamed from plugins/Import/mirandahistory.cpp)0
-rw-r--r--plugins/Import/src/progress.cpp (renamed from plugins/Import/progress.cpp)0
-rw-r--r--plugins/Import/src/resource.h (renamed from plugins/Import/resource.h)0
-rw-r--r--plugins/Import/src/version.h (renamed from plugins/Import/version.h)0
-rw-r--r--plugins/Import/src/wizard.cpp (renamed from plugins/Import/wizard.cpp)0
18 files changed, 33 insertions, 40 deletions
diff --git a/plugins/Import/import-translation.txt b/plugins/Import/docs/import-translation.txt
index 18838c6ad9..18838c6ad9 100644
--- a/plugins/Import/import-translation.txt
+++ b/plugins/Import/docs/import-translation.txt
diff --git a/plugins/Import/import_10.vcxproj b/plugins/Import/import_10.vcxproj
index 59b817462f..55f52a577a 100644
--- a/plugins/Import/import_10.vcxproj
+++ b/plugins/Import/import_10.vcxproj
@@ -73,7 +73,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;IMPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -82,7 +82,6 @@
<PrecompiledHeaderFile>import.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -106,14 +105,13 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;IMPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>import.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -139,7 +137,7 @@
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;IMPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>false</ExceptionHandling>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -148,14 +146,12 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>import.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalOptions>/ALIGN:4096 /ignore:4108 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalManifestDependencies>type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -177,7 +173,7 @@
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;IMPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>false</ExceptionHandling>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -186,14 +182,12 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>import.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalOptions>/ALIGN:4096 /ignore:4108 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalManifestDependencies>type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -210,31 +204,30 @@
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="ICQserver.cpp" />
- <ClCompile Include="main.cpp">
+ <ClCompile Include="src\ICQserver.cpp" />
+ <ClCompile Include="src\main.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="mirabilis.cpp" />
- <ClCompile Include="miranda.cpp" />
- <ClCompile Include="progress.cpp" />
- <ClCompile Include="wizard.cpp" />
+ <ClCompile Include="src\mirabilis.cpp" />
+ <ClCompile Include="src\miranda.cpp" />
+ <ClCompile Include="src\progress.cpp" />
+ <ClCompile Include="src\wizard.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="ICQserver.h" />
- <ClInclude Include="import.h" />
- <ClInclude Include="mirabilis.h" />
- <ClInclude Include="mirandadb0700.h" />
- <ClInclude Include="resource.h" />
+ <ClInclude Include="src\ICQserver.h" />
+ <ClInclude Include="src\import.h" />
+ <ClInclude Include="src\mirabilis.h" />
+ <ClInclude Include="src\mirandadb0700.h" />
+ <ClInclude Include="src\resource.h" />
</ItemGroup>
<ItemGroup>
- <None Include="import.ico" />
<None Include="docs\import-ICQ_Db_Specs.txt" />
<None Include="docs\import-license.txt" />
<None Include="docs\import-readme.txt" />
<None Include="docs\import-translation.txt" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="resource.rc" />
+ <ResourceCompile Include="res\resource.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Import/import_10.vcxproj.filters b/plugins/Import/import_10.vcxproj.filters
index 48118ce444..33a708cb33 100644
--- a/plugins/Import/import_10.vcxproj.filters
+++ b/plugins/Import/import_10.vcxproj.filters
@@ -18,46 +18,43 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="ICQserver.cpp">
+ <ClCompile Include="src\ICQserver.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="main.cpp">
+ <ClCompile Include="src\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="mirabilis.cpp">
+ <ClCompile Include="src\mirabilis.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="miranda.cpp">
+ <ClCompile Include="src\miranda.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="progress.cpp">
+ <ClCompile Include="src\progress.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="wizard.cpp">
+ <ClCompile Include="src\wizard.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="ICQserver.h">
+ <ClInclude Include="src\ICQserver.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="import.h">
+ <ClInclude Include="src\import.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="mirabilis.h">
+ <ClInclude Include="src\mirabilis.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="mirandadb0700.h">
+ <ClInclude Include="src\mirandadb0700.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="resource.h">
+ <ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="import.ico">
- <Filter>Resource Files</Filter>
- </None>
<None Include="docs\import-ICQ_Db_Specs.txt">
<Filter>Documentation</Filter>
</None>
@@ -72,7 +69,7 @@
</None>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="resource.rc">
+ <ResourceCompile Include="res\resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
diff --git a/plugins/Import/import.ico b/plugins/Import/res/import.ico
index bf7417ae50..bf7417ae50 100644
--- a/plugins/Import/import.ico
+++ b/plugins/Import/res/import.ico
Binary files differ
diff --git a/plugins/Import/resource.rc b/plugins/Import/res/resource.rc
index 4ca038ce47..103ad9c908 100644
--- a/plugins/Import/resource.rc
+++ b/plugins/Import/res/resource.rc
@@ -1,6 +1,6 @@
// Microsoft Visual C++ generated resource script.
//
-#include "resource.h"
+#include "..\src\resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -29,7 +29,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
1 TEXTINCLUDE
BEGIN
- "resource.h\0"
+ "..\\src\\resource.h\0"
END
2 TEXTINCLUDE
diff --git a/plugins/Import/ICQserver.cpp b/plugins/Import/src/ICQserver.cpp
index 372c0cb92c..372c0cb92c 100644
--- a/plugins/Import/ICQserver.cpp
+++ b/plugins/Import/src/ICQserver.cpp
diff --git a/plugins/Import/ICQserver.h b/plugins/Import/src/ICQserver.h
index 864890a978..864890a978 100644
--- a/plugins/Import/ICQserver.h
+++ b/plugins/Import/src/ICQserver.h
diff --git a/plugins/Import/import.h b/plugins/Import/src/import.h
index cbb6111a35..d0cb865c02 100644
--- a/plugins/Import/import.h
+++ b/plugins/Import/src/import.h
@@ -23,6 +23,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//#define _LOGGING 1
+#define _CRT_SECURE_NO_WARNINGS
+#define _CRT_NONSTDC_NO_DEPRECATE
+
#define MIRANDA_VER 0x0A00
#define WINVER 0x0501
diff --git a/plugins/Import/main.cpp b/plugins/Import/src/main.cpp
index 8b7524c040..8b7524c040 100644
--- a/plugins/Import/main.cpp
+++ b/plugins/Import/src/main.cpp
diff --git a/plugins/Import/mirabilis.cpp b/plugins/Import/src/mirabilis.cpp
index 1f032827af..1f032827af 100644
--- a/plugins/Import/mirabilis.cpp
+++ b/plugins/Import/src/mirabilis.cpp
diff --git a/plugins/Import/mirabilis.h b/plugins/Import/src/mirabilis.h
index 47f10141e1..47f10141e1 100644
--- a/plugins/Import/mirabilis.h
+++ b/plugins/Import/src/mirabilis.h
diff --git a/plugins/Import/miranda.cpp b/plugins/Import/src/miranda.cpp
index 4f616fb714..4f616fb714 100644
--- a/plugins/Import/miranda.cpp
+++ b/plugins/Import/src/miranda.cpp
diff --git a/plugins/Import/mirandadb0700.h b/plugins/Import/src/mirandadb0700.h
index 2c77588951..2c77588951 100644
--- a/plugins/Import/mirandadb0700.h
+++ b/plugins/Import/src/mirandadb0700.h
diff --git a/plugins/Import/mirandahistory.cpp b/plugins/Import/src/mirandahistory.cpp
index ba7a923df7..ba7a923df7 100644
--- a/plugins/Import/mirandahistory.cpp
+++ b/plugins/Import/src/mirandahistory.cpp
diff --git a/plugins/Import/progress.cpp b/plugins/Import/src/progress.cpp
index 99412f647a..99412f647a 100644
--- a/plugins/Import/progress.cpp
+++ b/plugins/Import/src/progress.cpp
diff --git a/plugins/Import/resource.h b/plugins/Import/src/resource.h
index 7bf769f14d..7bf769f14d 100644
--- a/plugins/Import/resource.h
+++ b/plugins/Import/src/resource.h
diff --git a/plugins/Import/version.h b/plugins/Import/src/version.h
index 58f9cf348c..58f9cf348c 100644
--- a/plugins/Import/version.h
+++ b/plugins/Import/src/version.h
diff --git a/plugins/Import/wizard.cpp b/plugins/Import/src/wizard.cpp
index 780501a10a..780501a10a 100644
--- a/plugins/Import/wizard.cpp
+++ b/plugins/Import/src/wizard.cpp
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 18:44:26 +0000