summaryrefslogtreecommitdiff
path: root/plugins/Dbx_mmap_SA/Import_SA
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Dbx_mmap_SA/Import_SA')
-rw-r--r--plugins/Dbx_mmap_SA/Import_SA/import_sa_10.vcxproj52
-rw-r--r--plugins/Dbx_mmap_SA/Import_SA/import_sa_10.vcxproj.filters53
-rw-r--r--plugins/Dbx_mmap_SA/Import_SA/res/Version.rc (renamed from plugins/Dbx_mmap_SA/Import_SA/Version.rc)2
-rw-r--r--plugins/Dbx_mmap_SA/Import_SA/res/resource.rc (renamed from plugins/Dbx_mmap_SA/Import_SA/resource.rc)8
-rw-r--r--plugins/Dbx_mmap_SA/Import_SA/src/ICQserver.cpp (renamed from plugins/Dbx_mmap_SA/Import_SA/ICQserver.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Import_SA/src/ICQserver.h (renamed from plugins/Dbx_mmap_SA/Import_SA/ICQserver.h)0
-rw-r--r--plugins/Dbx_mmap_SA/Import_SA/src/encryption.cpp (renamed from plugins/Dbx_mmap_SA/Import_SA/encryption.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Import_SA/src/import.h (renamed from plugins/Dbx_mmap_SA/Import_SA/import.h)3
-rw-r--r--plugins/Dbx_mmap_SA/Import_SA/src/main.cpp (renamed from plugins/Dbx_mmap_SA/Import_SA/main.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Import_SA/src/mirabilis.cpp (renamed from plugins/Dbx_mmap_SA/Import_SA/mirabilis.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Import_SA/src/mirabilis.h (renamed from plugins/Dbx_mmap_SA/Import_SA/mirabilis.h)0
-rw-r--r--plugins/Dbx_mmap_SA/Import_SA/src/miranda.cpp (renamed from plugins/Dbx_mmap_SA/Import_SA/miranda.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Import_SA/src/mirandadb0700.h (renamed from plugins/Dbx_mmap_SA/Import_SA/mirandadb0700.h)0
-rw-r--r--plugins/Dbx_mmap_SA/Import_SA/src/mirandahistory.cpp (renamed from plugins/Dbx_mmap_SA/Import_SA/mirandahistory.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Import_SA/src/progress.cpp (renamed from plugins/Dbx_mmap_SA/Import_SA/progress.cpp)0
-rw-r--r--plugins/Dbx_mmap_SA/Import_SA/src/resource.h (renamed from plugins/Dbx_mmap_SA/Import_SA/resource.h)0
-rw-r--r--plugins/Dbx_mmap_SA/Import_SA/src/version.h (renamed from plugins/Dbx_mmap_SA/Import_SA/version.h)0
-rw-r--r--plugins/Dbx_mmap_SA/Import_SA/src/wizard.cpp (renamed from plugins/Dbx_mmap_SA/Import_SA/wizard.cpp)0
18 files changed, 42 insertions, 76 deletions
diff --git a/plugins/Dbx_mmap_SA/Import_SA/import_sa_10.vcxproj b/plugins/Dbx_mmap_SA/Import_SA/import_sa_10.vcxproj
index f2143c95e4..a7eec29388 100644
--- a/plugins/Dbx_mmap_SA/Import_SA/import_sa_10.vcxproj
+++ b/plugins/Dbx_mmap_SA/Import_SA/import_sa_10.vcxproj
@@ -73,7 +73,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;%(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>
@@ -81,7 +81,6 @@
<PrecompiledHeaderFile>import.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -105,14 +104,13 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;%(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>
@@ -138,7 +136,7 @@
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;IMPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -146,14 +144,12 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>import.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\..\include;..\..\..\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>
@@ -175,7 +171,7 @@
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;IMPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -183,14 +179,12 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>import.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\..\include;..\..\..\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>
@@ -207,35 +201,27 @@
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="encryption.cpp" />
- <ClCompile Include="ICQserver.cpp" />
- <ClCompile Include="main.cpp">
+ <ClCompile Include="src\encryption.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="version.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" />
+ <ClInclude Include="src\version.h" />
</ItemGroup>
<ItemGroup>
- <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" />
- <None Include="res\import.ico" />
- <None Include="res\pass.ico" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="resource.rc" />
- <ResourceCompile Include="Version.rc" />
+ <ResourceCompile Include="res\resource.rc" />
+ <ResourceCompile Include="res\Version.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Dbx_mmap_SA/Import_SA/import_sa_10.vcxproj.filters b/plugins/Dbx_mmap_SA/Import_SA/import_sa_10.vcxproj.filters
index f1fec2b705..f5f6f3b161 100644
--- a/plugins/Dbx_mmap_SA/Import_SA/import_sa_10.vcxproj.filters
+++ b/plugins/Dbx_mmap_SA/Import_SA/import_sa_10.vcxproj.filters
@@ -13,78 +13,55 @@
<UniqueIdentifier>{e10cb216-83c1-4eb2-95ec-09f1e42a2c96}</UniqueIdentifier>
<Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
</Filter>
- <Filter Include="Documentation">
- <UniqueIdentifier>{8ad8cb39-e207-46f6-8fbf-1f5871148568}</UniqueIdentifier>
- </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>
- <ClCompile Include="encryption.cpp">
+ <ClCompile Include="src\encryption.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>
- <ClInclude Include="version.h">
+ <ClInclude Include="src\version.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="docs\import-ICQ_Db_Specs.txt">
- <Filter>Documentation</Filter>
- </None>
- <None Include="docs\import-license.txt">
- <Filter>Documentation</Filter>
- </None>
- <None Include="docs\import-readme.txt">
- <Filter>Documentation</Filter>
- </None>
- <None Include="docs\import-translation.txt">
- <Filter>Documentation</Filter>
- </None>
- <None Include="res\import.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="res\pass.ico">
- <Filter>Resource Files</Filter>
- </None>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="resource.rc">
+ <ResourceCompile Include="res\resource.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
- <ResourceCompile Include="Version.rc">
+ <ResourceCompile Include="res\Version.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
diff --git a/plugins/Dbx_mmap_SA/Import_SA/Version.rc b/plugins/Dbx_mmap_SA/Import_SA/res/Version.rc
index 9ef5fda998..a2005a9fdd 100644
--- a/plugins/Dbx_mmap_SA/Import_SA/Version.rc
+++ b/plugins/Dbx_mmap_SA/Import_SA/res/Version.rc
@@ -5,7 +5,7 @@
#endif //APSTUDIO_INVOKED
#include "afxres.h"
-#include "version.h"
+#include "..\src\version.h"
#ifdef _WIN32
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
diff --git a/plugins/Dbx_mmap_SA/Import_SA/resource.rc b/plugins/Dbx_mmap_SA/Import_SA/res/resource.rc
index c37ea1cccf..b5e7e066e7 100644
--- a/plugins/Dbx_mmap_SA/Import_SA/resource.rc
+++ b/plugins/Dbx_mmap_SA/Import_SA/res/resource.rc
@@ -1,6 +1,6 @@
// Microsoft Visual C++ generated resource script.
//
-#include "resource.h"
+#include "..\src\resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -26,8 +26,8 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_IMPORT ICON "res/import.ico"
-IDI_PASS ICON "res/pass.ico"
+IDI_IMPORT ICON "import.ico"
+IDI_PASS ICON "pass.ico"
/////////////////////////////////////////////////////////////////////////////
//
@@ -183,7 +183,7 @@ END
1 TEXTINCLUDE
BEGIN
- "resource.h\0"
+ "..\\src\\resource.h\0"
END
2 TEXTINCLUDE
diff --git a/plugins/Dbx_mmap_SA/Import_SA/ICQserver.cpp b/plugins/Dbx_mmap_SA/Import_SA/src/ICQserver.cpp
index 62666c7531..62666c7531 100644
--- a/plugins/Dbx_mmap_SA/Import_SA/ICQserver.cpp
+++ b/plugins/Dbx_mmap_SA/Import_SA/src/ICQserver.cpp
diff --git a/plugins/Dbx_mmap_SA/Import_SA/ICQserver.h b/plugins/Dbx_mmap_SA/Import_SA/src/ICQserver.h
index 864890a978..864890a978 100644
--- a/plugins/Dbx_mmap_SA/Import_SA/ICQserver.h
+++ b/plugins/Dbx_mmap_SA/Import_SA/src/ICQserver.h
diff --git a/plugins/Dbx_mmap_SA/Import_SA/encryption.cpp b/plugins/Dbx_mmap_SA/Import_SA/src/encryption.cpp
index ede73c006a..ede73c006a 100644
--- a/plugins/Dbx_mmap_SA/Import_SA/encryption.cpp
+++ b/plugins/Dbx_mmap_SA/Import_SA/src/encryption.cpp
diff --git a/plugins/Dbx_mmap_SA/Import_SA/import.h b/plugins/Dbx_mmap_SA/Import_SA/src/import.h
index 1c50146a15..0bba4a0d91 100644
--- a/plugins/Dbx_mmap_SA/Import_SA/import.h
+++ b/plugins/Dbx_mmap_SA/Import_SA/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/Dbx_mmap_SA/Import_SA/main.cpp b/plugins/Dbx_mmap_SA/Import_SA/src/main.cpp
index d464f8bb55..d464f8bb55 100644
--- a/plugins/Dbx_mmap_SA/Import_SA/main.cpp
+++ b/plugins/Dbx_mmap_SA/Import_SA/src/main.cpp
diff --git a/plugins/Dbx_mmap_SA/Import_SA/mirabilis.cpp b/plugins/Dbx_mmap_SA/Import_SA/src/mirabilis.cpp
index 15b58f4e0a..15b58f4e0a 100644
--- a/plugins/Dbx_mmap_SA/Import_SA/mirabilis.cpp
+++ b/plugins/Dbx_mmap_SA/Import_SA/src/mirabilis.cpp
diff --git a/plugins/Dbx_mmap_SA/Import_SA/mirabilis.h b/plugins/Dbx_mmap_SA/Import_SA/src/mirabilis.h
index 47f10141e1..47f10141e1 100644
--- a/plugins/Dbx_mmap_SA/Import_SA/mirabilis.h
+++ b/plugins/Dbx_mmap_SA/Import_SA/src/mirabilis.h
diff --git a/plugins/Dbx_mmap_SA/Import_SA/miranda.cpp b/plugins/Dbx_mmap_SA/Import_SA/src/miranda.cpp
index 8b6a9496f4..8b6a9496f4 100644
--- a/plugins/Dbx_mmap_SA/Import_SA/miranda.cpp
+++ b/plugins/Dbx_mmap_SA/Import_SA/src/miranda.cpp
diff --git a/plugins/Dbx_mmap_SA/Import_SA/mirandadb0700.h b/plugins/Dbx_mmap_SA/Import_SA/src/mirandadb0700.h
index 07216ddbcf..07216ddbcf 100644
--- a/plugins/Dbx_mmap_SA/Import_SA/mirandadb0700.h
+++ b/plugins/Dbx_mmap_SA/Import_SA/src/mirandadb0700.h
diff --git a/plugins/Dbx_mmap_SA/Import_SA/mirandahistory.cpp b/plugins/Dbx_mmap_SA/Import_SA/src/mirandahistory.cpp
index ba7a923df7..ba7a923df7 100644
--- a/plugins/Dbx_mmap_SA/Import_SA/mirandahistory.cpp
+++ b/plugins/Dbx_mmap_SA/Import_SA/src/mirandahistory.cpp
diff --git a/plugins/Dbx_mmap_SA/Import_SA/progress.cpp b/plugins/Dbx_mmap_SA/Import_SA/src/progress.cpp
index f3f4e9f08a..f3f4e9f08a 100644
--- a/plugins/Dbx_mmap_SA/Import_SA/progress.cpp
+++ b/plugins/Dbx_mmap_SA/Import_SA/src/progress.cpp
diff --git a/plugins/Dbx_mmap_SA/Import_SA/resource.h b/plugins/Dbx_mmap_SA/Import_SA/src/resource.h
index 915ee8097b..915ee8097b 100644
--- a/plugins/Dbx_mmap_SA/Import_SA/resource.h
+++ b/plugins/Dbx_mmap_SA/Import_SA/src/resource.h
diff --git a/plugins/Dbx_mmap_SA/Import_SA/version.h b/plugins/Dbx_mmap_SA/Import_SA/src/version.h
index 8c2338d9f4..8c2338d9f4 100644
--- a/plugins/Dbx_mmap_SA/Import_SA/version.h
+++ b/plugins/Dbx_mmap_SA/Import_SA/src/version.h
diff --git a/plugins/Dbx_mmap_SA/Import_SA/wizard.cpp b/plugins/Dbx_mmap_SA/Import_SA/src/wizard.cpp
index 0584cba073..0584cba073 100644
--- a/plugins/Dbx_mmap_SA/Import_SA/wizard.cpp
+++ b/plugins/Dbx_mmap_SA/Import_SA/src/wizard.cpp