diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-10-12 09:56:01 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-10-12 09:56:01 +0000 |
| commit | 69fe21d6e2262d6fb2b14278b7a20364468cbdcf (patch) | |
| tree | d7a5c3805ba838e98e1c5288fe06962a3201c694 | |
| parent | bcc2cdbf65af07f2593577a4c59f93d25c2e3de9 (diff) | |
Dbx_tree: folders restructurization
git-svn-id: http://svn.miranda-ng.org/main/trunk@1883 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | bin10/mir_full.sln | 60 | ||||
| -rw-r--r-- | bin10/mir_full_pro.sln | 62 | ||||
| -rw-r--r-- | plugins/Dbx_tree/dbx_tree_10.vcxproj | 109 | ||||
| -rw-r--r-- | plugins/Dbx_tree/dbx_tree_10.vcxproj.filters | 104 | ||||
| -rw-r--r-- | plugins/Dbx_tree/docs/Filestructure.txt (renamed from plugins/Dbx_tree/Filestructure.txt) | bin | 25894 -> 25894 bytes | |||
| -rw-r--r-- | plugins/Dbx_tree/docs/dbx_tree-translation.txt (renamed from plugins/Dbx_tree/dbx_tree-translation.txt) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/ARC4/ARC4.vcxproj (renamed from plugins/Dbx_tree/encryption/ARC4.vcxproj) | 14 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/ARC4/ARC4.vcxproj.filters (renamed from plugins/Dbx_tree/encryption/ARC4.vcxproj.filters) | 6 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/ARC4/src/ARC4.cpp (renamed from plugins/Dbx_tree/encryption/ARC4.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/ARC4/src/ARC4.h (renamed from plugins/Dbx_tree/encryption/ARC4.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/CAST128/Cast128.vcxproj (renamed from plugins/Dbx_tree/encryption/Cast128.vcxproj) | 16 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/CAST128/Cast128.vcxproj.filters (renamed from plugins/Dbx_tree/encryption/Cast128.vcxproj.filters) | 8 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/CAST128/src/CAST128.cpp (renamed from plugins/Dbx_tree/encryption/CAST128.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/CAST128/src/CAST128.h (renamed from plugins/Dbx_tree/encryption/CAST128.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/CAST128/src/CAST128.inc (renamed from plugins/Dbx_tree/encryption/CAST128.inc) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/Common/Cipher.h (renamed from plugins/Dbx_tree/encryption/Cipher.h) | 2 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/HC256/HC256.vcxproj (renamed from plugins/Dbx_tree/encryption/HC256.vcxproj) | 14 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/HC256/HC256.vcxproj.filters (renamed from plugins/Dbx_tree/encryption/HC256.vcxproj.filters) | 6 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/HC256/src/HC256.cpp (renamed from plugins/Dbx_tree/encryption/HC256.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/HC256/src/HC256.h (renamed from plugins/Dbx_tree/encryption/HC256.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/res/dbConfig.rc (renamed from plugins/Dbx_tree/dbConfig.rc) | 4 | ||||
| -rw-r--r-- | plugins/Dbx_tree/res/dbVersion.rc (renamed from plugins/Dbx_tree/dbVersion.rc) | 6 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/BTree.h (renamed from plugins/Dbx_tree/BTree.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/BlockManager.cpp (renamed from plugins/Dbx_tree/BlockManager.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/BlockManager.h (renamed from plugins/Dbx_tree/BlockManager.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/Compatibility.cpp (renamed from plugins/Dbx_tree/Compatibility.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/Compatibility.h (renamed from plugins/Dbx_tree/Compatibility.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/DataBase.cpp (renamed from plugins/Dbx_tree/DataBase.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/DataBase.h (renamed from plugins/Dbx_tree/DataBase.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/DatabaseLink.cpp (renamed from plugins/Dbx_tree/DatabaseLink.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/DatabaseLink.h (renamed from plugins/Dbx_tree/DatabaseLink.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/DirectAccess.cpp (renamed from plugins/Dbx_tree/DirectAccess.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/DirectAccess.h (renamed from plugins/Dbx_tree/DirectAccess.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/EncryptionManager.cpp (renamed from plugins/Dbx_tree/EncryptionManager.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/EncryptionManager.h (renamed from plugins/Dbx_tree/EncryptionManager.h) | 2 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/Entities.cpp (renamed from plugins/Dbx_tree/Entities.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/Entities.h (renamed from plugins/Dbx_tree/Entities.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/Events.cpp (renamed from plugins/Dbx_tree/Events.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/Events.h (renamed from plugins/Dbx_tree/Events.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/FileAccess.cpp (renamed from plugins/Dbx_tree/FileAccess.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/FileAccess.h (renamed from plugins/Dbx_tree/FileAccess.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/FileBTree.h (renamed from plugins/Dbx_tree/FileBTree.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/Hash.cpp (renamed from plugins/Dbx_tree/Hash.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/Hash.h (renamed from plugins/Dbx_tree/Hash.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/Interface.h (renamed from plugins/Dbx_tree/Interface.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/IterationHeap.h (renamed from plugins/Dbx_tree/IterationHeap.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/Logger.cpp (renamed from plugins/Dbx_tree/Logger.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/Logger.h (renamed from plugins/Dbx_tree/Logger.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/MREWSync.cpp (renamed from plugins/Dbx_tree/MREWSync.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/MREWSync.h (renamed from plugins/Dbx_tree/MREWSync.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/MappedMemory.cpp (renamed from plugins/Dbx_tree/MappedMemory.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/MappedMemory.h (renamed from plugins/Dbx_tree/MappedMemory.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/SHA256.cpp (renamed from plugins/Dbx_tree/SHA256.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/SHA256.h (renamed from plugins/Dbx_tree/SHA256.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/Services.cpp (renamed from plugins/Dbx_tree/Services.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/Services.h (renamed from plugins/Dbx_tree/Services.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/Settings.cpp (renamed from plugins/Dbx_tree/Settings.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/Settings.h (renamed from plugins/Dbx_tree/Settings.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/TLS.h (renamed from plugins/Dbx_tree/TLS.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/Thread.cpp (renamed from plugins/Dbx_tree/Thread.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/Thread.h (renamed from plugins/Dbx_tree/Thread.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/dbConfig_rc.h (renamed from plugins/Dbx_tree/dbConfig_rc.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/dbVersion_rc.h (renamed from plugins/Dbx_tree/dbVersion_rc.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/init.cpp (renamed from plugins/Dbx_tree/init.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/intrinsics.h (renamed from plugins/Dbx_tree/intrinsics.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/inttypes.h (renamed from plugins/Dbx_tree/inttypes.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/lockfree_hashmap.h (renamed from plugins/Dbx_tree/lockfree_hashmap.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/lockfree_hashmultimap.h (renamed from plugins/Dbx_tree/lockfree_hashmultimap.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/savestrings_gcc.h (renamed from plugins/Dbx_tree/savestrings_gcc.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/sigslot.h (renamed from plugins/Dbx_tree/sigslot.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/src/stdint.h (renamed from plugins/Dbx_tree/stdint.h) | 0 |
71 files changed, 216 insertions, 197 deletions
diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln index a1d3679aec..b5c34e9783 100644 --- a/bin10/mir_full.sln +++ b/bin10/mir_full.sln @@ -182,12 +182,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Omegle", "..\protocols\Omeg EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RC4", "..\plugins\Dbx_mmap_SA\Cryptors\RC4\rc4_10.vcxproj", "{E38B4212-53BC-49A7-B821-9A99DB4774C6}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_tree_ARC4", "..\plugins\Dbx_tree\encryption\ARC4.vcxproj", "{F60935E3-8F27-46E2-8598-013E7D4C90E7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_tree_Cast128", "..\plugins\Dbx_tree\encryption\Cast128.vcxproj", "{7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_tree_HC256", "..\plugins\Dbx_tree\encryption\HC256.vcxproj", "{541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RecentContacts", "..\plugins\RecentContacts\RecentContacts.vcxproj", "{07137F45-8B5F-4561-BEC8-B883E9123785}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewsAggregator", "..\protocols\NewsAggregator\NewsAggregator_10.vcxproj", "{6DE11A47-2268-4B08-8DE5-15A1705FCE28}"
@@ -349,6 +343,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PackUpdater", "..\plugins\P EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QuickContacts", "..\plugins\QuickContacts\quickcontacts.vcxproj", "{7FC00D59-03D3-4A6C-AEFE-67349C9C9E10}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_tree_ARC4", "..\plugins\Dbx_tree\encryption\ARC4\ARC4.vcxproj", "{F60935E3-8F27-46E2-8598-013E7D4C90E7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_tree_Cast128", "..\plugins\Dbx_tree\encryption\CAST128\Cast128.vcxproj", "{7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_tree_HC256", "..\plugins\Dbx_tree\encryption\HC256\HC256.vcxproj", "{541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -1059,30 +1059,6 @@ Global {E38B4212-53BC-49A7-B821-9A99DB4774C6}.Release|Win32.Build.0 = Release|Win32
{E38B4212-53BC-49A7-B821-9A99DB4774C6}.Release|x64.ActiveCfg = Release|x64
{E38B4212-53BC-49A7-B821-9A99DB4774C6}.Release|x64.Build.0 = Release|x64
- {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Debug|Win32.ActiveCfg = Debug|Win32
- {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Debug|Win32.Build.0 = Debug|Win32
- {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Debug|x64.ActiveCfg = Debug|x64
- {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Debug|x64.Build.0 = Debug|x64
- {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Release|Win32.ActiveCfg = Release|Win32
- {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Release|Win32.Build.0 = Release|Win32
- {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Release|x64.ActiveCfg = Release|x64
- {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Release|x64.Build.0 = Release|x64
- {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Debug|Win32.ActiveCfg = Debug|Win32
- {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Debug|Win32.Build.0 = Debug|Win32
- {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Debug|x64.ActiveCfg = Debug|x64
- {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Debug|x64.Build.0 = Debug|x64
- {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Release|Win32.ActiveCfg = Release|Win32
- {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Release|Win32.Build.0 = Release|Win32
- {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Release|x64.ActiveCfg = Release|x64
- {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Release|x64.Build.0 = Release|x64
- {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Debug|Win32.ActiveCfg = Debug|Win32
- {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Debug|Win32.Build.0 = Debug|Win32
- {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Debug|x64.ActiveCfg = Debug|x64
- {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Debug|x64.Build.0 = Debug|x64
- {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Release|Win32.ActiveCfg = Release|Win32
- {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Release|Win32.Build.0 = Release|Win32
- {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Release|x64.ActiveCfg = Release|x64
- {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Release|x64.Build.0 = Release|x64
{07137F45-8B5F-4561-BEC8-B883E9123785}.Debug|Win32.ActiveCfg = Debug|Win32
{07137F45-8B5F-4561-BEC8-B883E9123785}.Debug|Win32.Build.0 = Debug|Win32
{07137F45-8B5F-4561-BEC8-B883E9123785}.Debug|x64.ActiveCfg = Debug|x64
@@ -1541,6 +1517,30 @@ Global {7FC00D59-03D3-4A6C-AEFE-67349C9C9E10}.Release|Win32.Build.0 = Release|Win32
{7FC00D59-03D3-4A6C-AEFE-67349C9C9E10}.Release|x64.ActiveCfg = Release|x64
{7FC00D59-03D3-4A6C-AEFE-67349C9C9E10}.Release|x64.Build.0 = Release|x64
+ {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Debug|Win32.ActiveCfg = Debug|Win32
+ {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Debug|Win32.Build.0 = Debug|Win32
+ {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Debug|x64.ActiveCfg = Debug|x64
+ {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Debug|x64.Build.0 = Debug|x64
+ {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Release|Win32.ActiveCfg = Release|Win32
+ {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Release|Win32.Build.0 = Release|Win32
+ {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Release|x64.ActiveCfg = Release|x64
+ {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Release|x64.Build.0 = Release|x64
+ {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Debug|Win32.Build.0 = Debug|Win32
+ {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Debug|x64.ActiveCfg = Debug|x64
+ {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Debug|x64.Build.0 = Debug|x64
+ {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Release|Win32.ActiveCfg = Release|Win32
+ {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Release|Win32.Build.0 = Release|Win32
+ {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Release|x64.ActiveCfg = Release|x64
+ {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Release|x64.Build.0 = Release|x64
+ {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Debug|Win32.Build.0 = Debug|Win32
+ {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Debug|x64.ActiveCfg = Debug|x64
+ {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Debug|x64.Build.0 = Debug|x64
+ {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Release|Win32.ActiveCfg = Release|Win32
+ {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Release|Win32.Build.0 = Release|Win32
+ {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Release|x64.ActiveCfg = Release|x64
+ {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln index c16e13a02b..376afd1ec6 100644 --- a/bin10/mir_full_pro.sln +++ b/bin10/mir_full_pro.sln @@ -182,12 +182,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Omegle", "..\protocols\Omeg EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RC4", "..\plugins\Dbx_mmap_SA\Cryptors\RC4\rc4_10.vcxproj", "{E38B4212-53BC-49A7-B821-9A99DB4774C6}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_tree_ARC4", "..\plugins\Dbx_tree\encryption\ARC4.vcxproj", "{F60935E3-8F27-46E2-8598-013E7D4C90E7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_tree_Cast128", "..\plugins\Dbx_tree\encryption\Cast128.vcxproj", "{7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_tree_HC256", "..\plugins\Dbx_tree\encryption\HC256.vcxproj", "{541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RecentContacts", "..\plugins\RecentContacts\RecentContacts.vcxproj", "{07137F45-8B5F-4561-BEC8-B883E9123785}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewsAggregator", "..\protocols\NewsAggregator\NewsAggregator_10.vcxproj", "{6DE11A47-2268-4B08-8DE5-15A1705FCE28}"
@@ -385,6 +379,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PackUpdater", "..\plugins\P EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QuickContacts", "..\plugins\QuickContacts\quickcontacts.vcxproj", "{7FC00D59-03D3-4A6C-AEFE-67349C9C9E10}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_tree_ARC4", "..\plugins\Dbx_tree\encryption\ARC4\ARC4.vcxproj", "{F60935E3-8F27-46E2-8598-013E7D4C90E7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_tree_Cast128", "..\plugins\Dbx_tree\encryption\CAST128\Cast128.vcxproj", "{7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_tree_HC256", "..\plugins\Dbx_tree\encryption\HC256\HC256.vcxproj", "{541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -1095,30 +1095,6 @@ Global {E38B4212-53BC-49A7-B821-9A99DB4774C6}.Release|Win32.Build.0 = Release|Win32
{E38B4212-53BC-49A7-B821-9A99DB4774C6}.Release|x64.ActiveCfg = Release|x64
{E38B4212-53BC-49A7-B821-9A99DB4774C6}.Release|x64.Build.0 = Release|x64
- {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Debug|Win32.ActiveCfg = Debug|Win32
- {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Debug|Win32.Build.0 = Debug|Win32
- {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Debug|x64.ActiveCfg = Debug|x64
- {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Debug|x64.Build.0 = Debug|x64
- {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Release|Win32.ActiveCfg = Release|Win32
- {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Release|Win32.Build.0 = Release|Win32
- {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Release|x64.ActiveCfg = Release|x64
- {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Release|x64.Build.0 = Release|x64
- {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Debug|Win32.ActiveCfg = Debug|Win32
- {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Debug|Win32.Build.0 = Debug|Win32
- {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Debug|x64.ActiveCfg = Debug|x64
- {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Debug|x64.Build.0 = Debug|x64
- {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Release|Win32.ActiveCfg = Release|Win32
- {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Release|Win32.Build.0 = Release|Win32
- {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Release|x64.ActiveCfg = Release|x64
- {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Release|x64.Build.0 = Release|x64
- {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Debug|Win32.ActiveCfg = Debug|Win32
- {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Debug|Win32.Build.0 = Debug|Win32
- {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Debug|x64.ActiveCfg = Debug|x64
- {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Debug|x64.Build.0 = Debug|x64
- {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Release|Win32.ActiveCfg = Release|Win32
- {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Release|Win32.Build.0 = Release|Win32
- {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Release|x64.ActiveCfg = Release|x64
- {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Release|x64.Build.0 = Release|x64
{07137F45-8B5F-4561-BEC8-B883E9123785}.Debug|Win32.ActiveCfg = Debug|Win32
{07137F45-8B5F-4561-BEC8-B883E9123785}.Debug|Win32.Build.0 = Debug|Win32
{07137F45-8B5F-4561-BEC8-B883E9123785}.Debug|x64.ActiveCfg = Debug|x64
@@ -1577,6 +1553,30 @@ Global {7FC00D59-03D3-4A6C-AEFE-67349C9C9E10}.Release|Win32.Build.0 = Release|Win32
{7FC00D59-03D3-4A6C-AEFE-67349C9C9E10}.Release|x64.ActiveCfg = Release|x64
{7FC00D59-03D3-4A6C-AEFE-67349C9C9E10}.Release|x64.Build.0 = Release|x64
+ {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Debug|Win32.ActiveCfg = Debug|Win32
+ {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Debug|Win32.Build.0 = Debug|Win32
+ {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Debug|x64.ActiveCfg = Debug|x64
+ {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Debug|x64.Build.0 = Debug|x64
+ {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Release|Win32.ActiveCfg = Release|Win32
+ {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Release|Win32.Build.0 = Release|Win32
+ {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Release|x64.ActiveCfg = Release|x64
+ {F60935E3-8F27-46E2-8598-013E7D4C90E7}.Release|x64.Build.0 = Release|x64
+ {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Debug|Win32.Build.0 = Debug|Win32
+ {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Debug|x64.ActiveCfg = Debug|x64
+ {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Debug|x64.Build.0 = Debug|x64
+ {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Release|Win32.ActiveCfg = Release|Win32
+ {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Release|Win32.Build.0 = Release|Win32
+ {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Release|x64.ActiveCfg = Release|x64
+ {7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D}.Release|x64.Build.0 = Release|x64
+ {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Debug|Win32.Build.0 = Debug|Win32
+ {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Debug|x64.ActiveCfg = Debug|x64
+ {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Debug|x64.Build.0 = Debug|x64
+ {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Release|Win32.ActiveCfg = Release|Win32
+ {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Release|Win32.Build.0 = Release|Win32
+ {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Release|x64.ActiveCfg = Release|x64
+ {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -1725,10 +1725,10 @@ Global {4AC1E062-0236-4E49-AA04-F732043D2DCF} = {803DA965-4B1C-4BF3-A35E-A3A12D4121D3}
{290C5ED4-71A7-4040-AD26-4820CF7A9E60} = {803DA965-4B1C-4BF3-A35E-A3A12D4121D3}
{4ADADECA-99D7-410D-8127-CB27210DCC6A} = {803DA965-4B1C-4BF3-A35E-A3A12D4121D3}
+ {E38B4212-53BC-49A7-B821-9A99DB4774C6} = {EAEA72C2-11FB-433D-8D79-8F88CDEE52A7}
{F60935E3-8F27-46E2-8598-013E7D4C90E7} = {EAEA72C2-11FB-433D-8D79-8F88CDEE52A7}
{7E88D7F5-8B0A-4B79-84CD-D7982D4E0D4D} = {EAEA72C2-11FB-433D-8D79-8F88CDEE52A7}
{541BE2B3-4320-47B8-AB64-C7F7ED0EFABA} = {EAEA72C2-11FB-433D-8D79-8F88CDEE52A7}
- {E38B4212-53BC-49A7-B821-9A99DB4774C6} = {EAEA72C2-11FB-433D-8D79-8F88CDEE52A7}
{40FE7861-E54E-4DA9-BE4D-A5178014E477} = {3E727941-2854-4F64-ADA5-BF3BF104A4A3}
{1423FC8F-AA52-4562-8275-4BF0838CA378} = {3E727941-2854-4F64-ADA5-BF3BF104A4A3}
{53F841E8-284F-4545-9176-B131896E43F8} = {3E727941-2854-4F64-ADA5-BF3BF104A4A3}
diff --git a/plugins/Dbx_tree/dbx_tree_10.vcxproj b/plugins/Dbx_tree/dbx_tree_10.vcxproj index 7265c5a2b2..c7c88820e3 100644 --- a/plugins/Dbx_tree/dbx_tree_10.vcxproj +++ b/plugins/Dbx_tree/dbx_tree_10.vcxproj @@ -176,69 +176,64 @@ </Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ResourceCompile Include="dbConfig.rc" />
- <ResourceCompile Include="dbVersion.rc" />
+ <ResourceCompile Include="res\dbConfig.rc" />
+ <ResourceCompile Include="res\dbVersion.rc" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="dbConfig_rc.h" />
- <ClInclude Include="dbVersion_rc.h" />
- <ClInclude Include="BTree.h" />
- <ClInclude Include="DataBase.h" />
- <ClInclude Include="Entities.h" />
- <ClInclude Include="Events.h" />
- <ClInclude Include="FileBTree.h" />
- <ClInclude Include="intrinsics.h" />
- <ClInclude Include="Settings.h" />
- <ClInclude Include="encryption\Cipher.h" />
- <ClInclude Include="EncryptionManager.h" />
- <ClInclude Include="SHA256.h" />
- <ClInclude Include="BlockManager.h" />
- <ClInclude Include="DirectAccess.h" />
- <ClInclude Include="FileAccess.h" />
- <ClInclude Include="MappedMemory.h" />
- <ClInclude Include="Compatibility.h" />
- <ClInclude Include="DatabaseLink.h" />
- <ClInclude Include="Interface.h" />
- <ClInclude Include="Services.h" />
- <ClInclude Include="Hash.h" />
- <ClInclude Include="inttypes.h" />
- <ClInclude Include="IterationHeap.h" />
- <ClInclude Include="lockfree_hashmap.h" />
- <ClInclude Include="lockfree_hashmultimap.h" />
- <ClInclude Include="Logger.h" />
- <ClInclude Include="MREWSync.h" />
- <ClInclude Include="savestrings_gcc.h" />
- <ClInclude Include="sigslot.h" />
- <ClInclude Include="stdint.h" />
- <ClInclude Include="Thread.h" />
- <ClInclude Include="TLS.h" />
+ <ClInclude Include="src\dbConfig_rc.h" />
+ <ClInclude Include="src\dbVersion_rc.h" />
+ <ClInclude Include="src\BTree.h" />
+ <ClInclude Include="src\DataBase.h" />
+ <ClInclude Include="src\Entities.h" />
+ <ClInclude Include="src\Events.h" />
+ <ClInclude Include="src\FileBTree.h" />
+ <ClInclude Include="src\intrinsics.h" />
+ <ClInclude Include="src\Settings.h" />
+ <ClInclude Include="src\encryption\Cipher.h" />
+ <ClInclude Include="src\EncryptionManager.h" />
+ <ClInclude Include="src\SHA256.h" />
+ <ClInclude Include="src\BlockManager.h" />
+ <ClInclude Include="src\DirectAccess.h" />
+ <ClInclude Include="src\FileAccess.h" />
+ <ClInclude Include="src\MappedMemory.h" />
+ <ClInclude Include="src\Compatibility.h" />
+ <ClInclude Include="src\DatabaseLink.h" />
+ <ClInclude Include="src\Interface.h" />
+ <ClInclude Include="src\Services.h" />
+ <ClInclude Include="src\Hash.h" />
+ <ClInclude Include="src\inttypes.h" />
+ <ClInclude Include="src\IterationHeap.h" />
+ <ClInclude Include="src\lockfree_hashmap.h" />
+ <ClInclude Include="src\lockfree_hashmultimap.h" />
+ <ClInclude Include="src\Logger.h" />
+ <ClInclude Include="src\MREWSync.h" />
+ <ClInclude Include="src\savestrings_gcc.h" />
+ <ClInclude Include="src\sigslot.h" />
+ <ClInclude Include="src\stdint.h" />
+ <ClInclude Include="src\Thread.h" />
+ <ClInclude Include="src\TLS.h" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="DataBase.cpp" />
- <ClCompile Include="Entities.cpp" />
- <ClCompile Include="Events.cpp" />
- <ClCompile Include="Settings.cpp" />
- <ClCompile Include="BlockManager.cpp" />
- <ClCompile Include="DirectAccess.cpp" />
- <ClCompile Include="FileAccess.cpp" />
- <ClCompile Include="MappedMemory.cpp" />
- <ClCompile Include="EncryptionManager.cpp" />
- <ClCompile Include="SHA256.cpp" />
- <ClCompile Include="Compatibility.cpp" />
- <ClCompile Include="DatabaseLink.cpp" />
- <ClCompile Include="init.cpp" />
- <ClCompile Include="Services.cpp" />
- <ClCompile Include="Hash.cpp" />
- <ClCompile Include="Logger.cpp" />
- <ClCompile Include="MREWSync.cpp" />
- <ClCompile Include="Thread.cpp" />
+ <ClCompile Include="src\DataBase.cpp" />
+ <ClCompile Include="src\Entities.cpp" />
+ <ClCompile Include="src\Events.cpp" />
+ <ClCompile Include="src\Settings.cpp" />
+ <ClCompile Include="src\BlockManager.cpp" />
+ <ClCompile Include="src\DirectAccess.cpp" />
+ <ClCompile Include="src\FileAccess.cpp" />
+ <ClCompile Include="src\MappedMemory.cpp" />
+ <ClCompile Include="src\EncryptionManager.cpp" />
+ <ClCompile Include="src\SHA256.cpp" />
+ <ClCompile Include="src\Compatibility.cpp" />
+ <ClCompile Include="src\DatabaseLink.cpp" />
+ <ClCompile Include="src\init.cpp" />
+ <ClCompile Include="src\Services.cpp" />
+ <ClCompile Include="src\Hash.cpp" />
+ <ClCompile Include="src\Logger.cpp" />
+ <ClCompile Include="src\MREWSync.cpp" />
+ <ClCompile Include="src\Thread.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
- <ProjectExtensions>
- <VisualStudio>
- <UserProperties RESOURCE_FILE="dbx_tree.rc" />
- </VisualStudio>
- </ProjectExtensions>
</Project>
\ No newline at end of file diff --git a/plugins/Dbx_tree/dbx_tree_10.vcxproj.filters b/plugins/Dbx_tree/dbx_tree_10.vcxproj.filters index 606b567ede..1c51fc77e6 100644 --- a/plugins/Dbx_tree/dbx_tree_10.vcxproj.filters +++ b/plugins/Dbx_tree/dbx_tree_10.vcxproj.filters @@ -37,164 +37,164 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="dbConfig.rc">
+ <ResourceCompile Include="res\dbConfig.rc">
<Filter>Resource</Filter>
</ResourceCompile>
- <ResourceCompile Include="dbVersion.rc">
+ <ResourceCompile Include="res\dbVersion.rc">
<Filter>Resource</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="dbConfig_rc.h">
+ <ClInclude Include="src\dbConfig_rc.h">
<Filter>Resource</Filter>
</ClInclude>
- <ClInclude Include="dbVersion_rc.h">
+ <ClInclude Include="src\dbVersion_rc.h">
<Filter>Resource</Filter>
</ClInclude>
- <ClInclude Include="BTree.h">
+ <ClInclude Include="src\BTree.h">
<Filter>Database\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="DataBase.h">
+ <ClInclude Include="src\DataBase.h">
<Filter>Database\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="Entities.h">
+ <ClInclude Include="src\Entities.h">
<Filter>Database\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="Events.h">
+ <ClInclude Include="src\Events.h">
<Filter>Database\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="FileBTree.h">
+ <ClInclude Include="src\FileBTree.h">
<Filter>Database\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="Settings.h">
+ <ClInclude Include="src\Settings.h">
<Filter>Database\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="encryption\Cipher.h">
+ <ClInclude Include="src\encryption\Cipher.h">
<Filter>Database\FileAccess\Encryption</Filter>
</ClInclude>
- <ClInclude Include="EncryptionManager.h">
+ <ClInclude Include="src\EncryptionManager.h">
<Filter>Database\FileAccess\Encryption</Filter>
</ClInclude>
- <ClInclude Include="SHA256.h">
+ <ClInclude Include="src\SHA256.h">
<Filter>Database\FileAccess\Encryption\SHA256</Filter>
</ClInclude>
- <ClInclude Include="BlockManager.h">
+ <ClInclude Include="src\BlockManager.h">
<Filter>Database\FileAccess\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="DirectAccess.h">
+ <ClInclude Include="src\DirectAccess.h">
<Filter>Database\FileAccess\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="FileAccess.h">
+ <ClInclude Include="src\FileAccess.h">
<Filter>Database\FileAccess\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="MappedMemory.h">
+ <ClInclude Include="src\MappedMemory.h">
<Filter>Database\FileAccess\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="Compatibility.h">
+ <ClInclude Include="src\Compatibility.h">
<Filter>Interface\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="DatabaseLink.h">
+ <ClInclude Include="src\DatabaseLink.h">
<Filter>Interface\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="Interface.h">
+ <ClInclude Include="src\Interface.h">
<Filter>Interface\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="Services.h">
+ <ClInclude Include="src\Services.h">
<Filter>Interface\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="Hash.h">
+ <ClInclude Include="src\Hash.h">
<Filter>Utils\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="inttypes.h">
+ <ClInclude Include="src\inttypes.h">
<Filter>Utils\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="IterationHeap.h">
+ <ClInclude Include="src\IterationHeap.h">
<Filter>Utils\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="lockfree_hashmap.h">
+ <ClInclude Include="src\lockfree_hashmap.h">
<Filter>Utils\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="lockfree_hashmultimap.h">
+ <ClInclude Include="src\lockfree_hashmultimap.h">
<Filter>Utils\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="Logger.h">
+ <ClInclude Include="src\Logger.h">
<Filter>Utils\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="MREWSync.h">
+ <ClInclude Include="src\MREWSync.h">
<Filter>Utils\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="savestrings_gcc.h">
+ <ClInclude Include="src\savestrings_gcc.h">
<Filter>Utils\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="sigslot.h">
+ <ClInclude Include="src\sigslot.h">
<Filter>Utils\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="stdint.h">
+ <ClInclude Include="src\stdint.h">
<Filter>Utils\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="Thread.h">
+ <ClInclude Include="src\Thread.h">
<Filter>Utils\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="TLS.h">
+ <ClInclude Include="src\TLS.h">
<Filter>Utils\HeaderFiles</Filter>
</ClInclude>
- <ClInclude Include="intrinsics.h">
+ <ClInclude Include="src\intrinsics.h">
<Filter>Utils\HeaderFiles</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="DataBase.cpp">
+ <ClCompile Include="src\DataBase.cpp">
<Filter>Database</Filter>
</ClCompile>
- <ClCompile Include="Entities.cpp">
+ <ClCompile Include="src\Entities.cpp">
<Filter>Database</Filter>
</ClCompile>
- <ClCompile Include="Events.cpp">
+ <ClCompile Include="src\Events.cpp">
<Filter>Database</Filter>
</ClCompile>
- <ClCompile Include="Settings.cpp">
+ <ClCompile Include="src\Settings.cpp">
<Filter>Database</Filter>
</ClCompile>
- <ClCompile Include="BlockManager.cpp">
+ <ClCompile Include="src\BlockManager.cpp">
<Filter>Database\FileAccess</Filter>
</ClCompile>
- <ClCompile Include="DirectAccess.cpp">
+ <ClCompile Include="src\DirectAccess.cpp">
<Filter>Database\FileAccess</Filter>
</ClCompile>
- <ClCompile Include="FileAccess.cpp">
+ <ClCompile Include="src\FileAccess.cpp">
<Filter>Database\FileAccess</Filter>
</ClCompile>
- <ClCompile Include="MappedMemory.cpp">
+ <ClCompile Include="src\MappedMemory.cpp">
<Filter>Database\FileAccess</Filter>
</ClCompile>
- <ClCompile Include="EncryptionManager.cpp">
+ <ClCompile Include="src\EncryptionManager.cpp">
<Filter>Database\FileAccess\Encryption</Filter>
</ClCompile>
- <ClCompile Include="SHA256.cpp">
+ <ClCompile Include="src\SHA256.cpp">
<Filter>Database\FileAccess\Encryption\SHA256</Filter>
</ClCompile>
- <ClCompile Include="Compatibility.cpp">
+ <ClCompile Include="src\Compatibility.cpp">
<Filter>Interface</Filter>
</ClCompile>
- <ClCompile Include="DatabaseLink.cpp">
+ <ClCompile Include="src\DatabaseLink.cpp">
<Filter>Interface</Filter>
</ClCompile>
- <ClCompile Include="init.cpp">
+ <ClCompile Include="src\init.cpp">
<Filter>Interface</Filter>
</ClCompile>
- <ClCompile Include="Services.cpp">
+ <ClCompile Include="src\Services.cpp">
<Filter>Interface</Filter>
</ClCompile>
- <ClCompile Include="Hash.cpp">
+ <ClCompile Include="src\Hash.cpp">
<Filter>Utils</Filter>
</ClCompile>
- <ClCompile Include="Logger.cpp">
+ <ClCompile Include="src\Logger.cpp">
<Filter>Utils</Filter>
</ClCompile>
- <ClCompile Include="MREWSync.cpp">
+ <ClCompile Include="src\MREWSync.cpp">
<Filter>Utils</Filter>
</ClCompile>
- <ClCompile Include="Thread.cpp">
+ <ClCompile Include="src\Thread.cpp">
<Filter>Utils</Filter>
</ClCompile>
</ItemGroup>
diff --git a/plugins/Dbx_tree/Filestructure.txt b/plugins/Dbx_tree/docs/Filestructure.txt Binary files differindex 6128b5f993..6128b5f993 100644 --- a/plugins/Dbx_tree/Filestructure.txt +++ b/plugins/Dbx_tree/docs/Filestructure.txt diff --git a/plugins/Dbx_tree/dbx_tree-translation.txt b/plugins/Dbx_tree/docs/dbx_tree-translation.txt index 1da8e58342..1da8e58342 100644 --- a/plugins/Dbx_tree/dbx_tree-translation.txt +++ b/plugins/Dbx_tree/docs/dbx_tree-translation.txt diff --git a/plugins/Dbx_tree/encryption/ARC4.vcxproj b/plugins/Dbx_tree/encryption/ARC4/ARC4.vcxproj index e8692710a2..3fcc596e3a 100644 --- a/plugins/Dbx_tree/encryption/ARC4.vcxproj +++ b/plugins/Dbx_tree/encryption/ARC4/ARC4.vcxproj @@ -59,6 +59,10 @@ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
<IgnoreImportLibrary>true</IgnoreImportLibrary>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ARC4</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ARC4</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ARC4</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ARC4</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -68,6 +72,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
+ <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -88,6 +93,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
+ <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -109,6 +115,7 @@ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DBX_TREE_ENCRYPTION_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
+ <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<FloatingPointModel>Fast</FloatingPointModel>
@@ -132,6 +139,7 @@ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;DBX_TREE_ENCRYPTION_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
+ <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<FloatingPointModel>Fast</FloatingPointModel>
@@ -148,11 +156,11 @@ </Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClInclude Include="ARC4.h" />
- <ClInclude Include="Cipher.h" />
+ <ClInclude Include="src\ARC4.h" />
+ <ClInclude Include="..\Common\Cipher.h" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="ARC4.cpp" />
+ <ClCompile Include="src\ARC4.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Dbx_tree/encryption/ARC4.vcxproj.filters b/plugins/Dbx_tree/encryption/ARC4/ARC4.vcxproj.filters index 513c5124c8..125c2ecc43 100644 --- a/plugins/Dbx_tree/encryption/ARC4.vcxproj.filters +++ b/plugins/Dbx_tree/encryption/ARC4/ARC4.vcxproj.filters @@ -15,15 +15,15 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="ARC4.h">
+ <ClInclude Include="src\ARC4.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="Cipher.h">
+ <ClInclude Include="..\Common\Cipher.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="ARC4.cpp">
+ <ClCompile Include="src\ARC4.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
diff --git a/plugins/Dbx_tree/encryption/ARC4.cpp b/plugins/Dbx_tree/encryption/ARC4/src/ARC4.cpp index 7f3780e6a2..7f3780e6a2 100644 --- a/plugins/Dbx_tree/encryption/ARC4.cpp +++ b/plugins/Dbx_tree/encryption/ARC4/src/ARC4.cpp diff --git a/plugins/Dbx_tree/encryption/ARC4.h b/plugins/Dbx_tree/encryption/ARC4/src/ARC4.h index 48fdc35312..48fdc35312 100644 --- a/plugins/Dbx_tree/encryption/ARC4.h +++ b/plugins/Dbx_tree/encryption/ARC4/src/ARC4.h diff --git a/plugins/Dbx_tree/encryption/Cast128.vcxproj b/plugins/Dbx_tree/encryption/CAST128/Cast128.vcxproj index e9fbe2cd25..76acf68f31 100644 --- a/plugins/Dbx_tree/encryption/Cast128.vcxproj +++ b/plugins/Dbx_tree/encryption/CAST128/Cast128.vcxproj @@ -59,6 +59,10 @@ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
<IgnoreImportLibrary>true</IgnoreImportLibrary>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Cast128</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Cast128</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Cast128</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Cast128</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -68,6 +72,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
+ <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -88,6 +93,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
+ <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -109,6 +115,7 @@ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CAST128_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
+ <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<FloatingPointModel>Fast</FloatingPointModel>
@@ -132,6 +139,7 @@ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;CAST128_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
+ <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<FloatingPointModel>Fast</FloatingPointModel>
@@ -148,14 +156,14 @@ </Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="CAST128.cpp" />
+ <ClCompile Include="src\CAST128.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="CAST128.h" />
- <ClInclude Include="Cipher.h" />
+ <ClInclude Include="src\CAST128.h" />
+ <ClInclude Include="..\Common\Cipher.h" />
</ItemGroup>
<ItemGroup>
- <None Include="CAST128.inc" />
+ <None Include="src\CAST128.inc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Dbx_tree/encryption/Cast128.vcxproj.filters b/plugins/Dbx_tree/encryption/CAST128/Cast128.vcxproj.filters index 5c3548e7f6..f23057e4ba 100644 --- a/plugins/Dbx_tree/encryption/Cast128.vcxproj.filters +++ b/plugins/Dbx_tree/encryption/CAST128/Cast128.vcxproj.filters @@ -15,20 +15,20 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="CAST128.cpp">
+ <ClCompile Include="src\CAST128.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="CAST128.h">
+ <ClInclude Include="src\CAST128.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="Cipher.h">
+ <ClInclude Include="..\Common\Cipher.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="CAST128.inc">
+ <None Include="src\CAST128.inc">
<Filter>Header Files</Filter>
</None>
</ItemGroup>
diff --git a/plugins/Dbx_tree/encryption/CAST128.cpp b/plugins/Dbx_tree/encryption/CAST128/src/CAST128.cpp index 2814a4142b..2814a4142b 100644 --- a/plugins/Dbx_tree/encryption/CAST128.cpp +++ b/plugins/Dbx_tree/encryption/CAST128/src/CAST128.cpp diff --git a/plugins/Dbx_tree/encryption/CAST128.h b/plugins/Dbx_tree/encryption/CAST128/src/CAST128.h index 9477254986..9477254986 100644 --- a/plugins/Dbx_tree/encryption/CAST128.h +++ b/plugins/Dbx_tree/encryption/CAST128/src/CAST128.h diff --git a/plugins/Dbx_tree/encryption/CAST128.inc b/plugins/Dbx_tree/encryption/CAST128/src/CAST128.inc index 8389acc92c..8389acc92c 100644 --- a/plugins/Dbx_tree/encryption/CAST128.inc +++ b/plugins/Dbx_tree/encryption/CAST128/src/CAST128.inc diff --git a/plugins/Dbx_tree/encryption/Cipher.h b/plugins/Dbx_tree/encryption/Common/Cipher.h index 76d07e61a0..abdcbf06be 100644 --- a/plugins/Dbx_tree/encryption/Cipher.h +++ b/plugins/Dbx_tree/encryption/Common/Cipher.h @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #pragma once
#ifdef _MSC_VER
-#include "../stdint.h"
+#include "../../src/stdint.h"
#else
#include <stdint.h>
#endif
diff --git a/plugins/Dbx_tree/encryption/HC256.vcxproj b/plugins/Dbx_tree/encryption/HC256/HC256.vcxproj index f006b55725..2369cea095 100644 --- a/plugins/Dbx_tree/encryption/HC256.vcxproj +++ b/plugins/Dbx_tree/encryption/HC256/HC256.vcxproj @@ -59,6 +59,10 @@ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
<IgnoreImportLibrary>true</IgnoreImportLibrary>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">HC256</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">HC256</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">HC256</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">HC256</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -68,6 +72,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
+ <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -88,6 +93,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
+ <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -109,6 +115,7 @@ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;HC256_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
+ <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<FloatingPointModel>Fast</FloatingPointModel>
@@ -132,6 +139,7 @@ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;HC256_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
+ <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<FloatingPointModel>Fast</FloatingPointModel>
@@ -148,11 +156,11 @@ </Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClInclude Include="Cipher.h" />
- <ClInclude Include="HC256.h" />
+ <ClInclude Include="..\Common\Cipher.h" />
+ <ClInclude Include="src\HC256.h" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="HC256.cpp" />
+ <ClCompile Include="src\HC256.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Dbx_tree/encryption/HC256.vcxproj.filters b/plugins/Dbx_tree/encryption/HC256/HC256.vcxproj.filters index 5d1e3ec0dd..abb4df92d0 100644 --- a/plugins/Dbx_tree/encryption/HC256.vcxproj.filters +++ b/plugins/Dbx_tree/encryption/HC256/HC256.vcxproj.filters @@ -15,15 +15,15 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="Cipher.h">
+ <ClInclude Include="..\Common\Cipher.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="HC256.h">
+ <ClInclude Include="src\HC256.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="HC256.cpp">
+ <ClCompile Include="src\HC256.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
diff --git a/plugins/Dbx_tree/encryption/HC256.cpp b/plugins/Dbx_tree/encryption/HC256/src/HC256.cpp index 056b4e4dae..056b4e4dae 100644 --- a/plugins/Dbx_tree/encryption/HC256.cpp +++ b/plugins/Dbx_tree/encryption/HC256/src/HC256.cpp diff --git a/plugins/Dbx_tree/encryption/HC256.h b/plugins/Dbx_tree/encryption/HC256/src/HC256.h index d4acb3195f..d4acb3195f 100644 --- a/plugins/Dbx_tree/encryption/HC256.h +++ b/plugins/Dbx_tree/encryption/HC256/src/HC256.h diff --git a/plugins/Dbx_tree/dbConfig.rc b/plugins/Dbx_tree/res/dbConfig.rc index 1dff63b228..0e5745acc9 100644 --- a/plugins/Dbx_tree/dbConfig.rc +++ b/plugins/Dbx_tree/res/dbConfig.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script.
//
-#include "dbConfig_rc.h"
+#include "..\src\dbConfig_rc.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -79,7 +79,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN 1 TEXTINCLUDE
BEGIN
- "dbConfig_rc.h\0"
+ "..\\src\\dbConfig_rc.h\0"
END
2 TEXTINCLUDE
diff --git a/plugins/Dbx_tree/dbVersion.rc b/plugins/Dbx_tree/res/dbVersion.rc index 170da6f794..5717940ed4 100644 --- a/plugins/Dbx_tree/dbVersion.rc +++ b/plugins/Dbx_tree/res/dbVersion.rc @@ -1,8 +1,8 @@ // Microsoft Visual C++ generated resource script.
//
-#include "dbVersion_rc.h"
+#include "..\src\dbVersion_rc.h"
#define INTERFACE_VERSION_ONLY
-#include "Interface.h"
+#include "..\src\Interface.h"
#undef INTERFACE_VERSION_ONLY
#define APSTUDIO_READONLY_SYMBOLS
@@ -32,7 +32,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN 1 TEXTINCLUDE
BEGIN
- "dbVersion_rc.h\0"
+ "..\\src\\dbVersion_rc.h\0"
END
2 TEXTINCLUDE
diff --git a/plugins/Dbx_tree/BTree.h b/plugins/Dbx_tree/src/BTree.h index 20c2abfd71..20c2abfd71 100644 --- a/plugins/Dbx_tree/BTree.h +++ b/plugins/Dbx_tree/src/BTree.h diff --git a/plugins/Dbx_tree/BlockManager.cpp b/plugins/Dbx_tree/src/BlockManager.cpp index b52298602f..b52298602f 100644 --- a/plugins/Dbx_tree/BlockManager.cpp +++ b/plugins/Dbx_tree/src/BlockManager.cpp diff --git a/plugins/Dbx_tree/BlockManager.h b/plugins/Dbx_tree/src/BlockManager.h index dcccd4f0b9..dcccd4f0b9 100644 --- a/plugins/Dbx_tree/BlockManager.h +++ b/plugins/Dbx_tree/src/BlockManager.h diff --git a/plugins/Dbx_tree/Compatibility.cpp b/plugins/Dbx_tree/src/Compatibility.cpp index 759e44012c..759e44012c 100644 --- a/plugins/Dbx_tree/Compatibility.cpp +++ b/plugins/Dbx_tree/src/Compatibility.cpp diff --git a/plugins/Dbx_tree/Compatibility.h b/plugins/Dbx_tree/src/Compatibility.h index a23fa9284b..a23fa9284b 100644 --- a/plugins/Dbx_tree/Compatibility.h +++ b/plugins/Dbx_tree/src/Compatibility.h diff --git a/plugins/Dbx_tree/DataBase.cpp b/plugins/Dbx_tree/src/DataBase.cpp index 50fe494b3c..50fe494b3c 100644 --- a/plugins/Dbx_tree/DataBase.cpp +++ b/plugins/Dbx_tree/src/DataBase.cpp diff --git a/plugins/Dbx_tree/DataBase.h b/plugins/Dbx_tree/src/DataBase.h index 124fee4f9d..124fee4f9d 100644 --- a/plugins/Dbx_tree/DataBase.h +++ b/plugins/Dbx_tree/src/DataBase.h diff --git a/plugins/Dbx_tree/DatabaseLink.cpp b/plugins/Dbx_tree/src/DatabaseLink.cpp index cc944cc305..cc944cc305 100644 --- a/plugins/Dbx_tree/DatabaseLink.cpp +++ b/plugins/Dbx_tree/src/DatabaseLink.cpp diff --git a/plugins/Dbx_tree/DatabaseLink.h b/plugins/Dbx_tree/src/DatabaseLink.h index c0c20b7fa0..c0c20b7fa0 100644 --- a/plugins/Dbx_tree/DatabaseLink.h +++ b/plugins/Dbx_tree/src/DatabaseLink.h diff --git a/plugins/Dbx_tree/DirectAccess.cpp b/plugins/Dbx_tree/src/DirectAccess.cpp index 33785af7c4..33785af7c4 100644 --- a/plugins/Dbx_tree/DirectAccess.cpp +++ b/plugins/Dbx_tree/src/DirectAccess.cpp diff --git a/plugins/Dbx_tree/DirectAccess.h b/plugins/Dbx_tree/src/DirectAccess.h index cc4241c235..cc4241c235 100644 --- a/plugins/Dbx_tree/DirectAccess.h +++ b/plugins/Dbx_tree/src/DirectAccess.h diff --git a/plugins/Dbx_tree/EncryptionManager.cpp b/plugins/Dbx_tree/src/EncryptionManager.cpp index 7afdcb248f..7afdcb248f 100644 --- a/plugins/Dbx_tree/EncryptionManager.cpp +++ b/plugins/Dbx_tree/src/EncryptionManager.cpp diff --git a/plugins/Dbx_tree/EncryptionManager.h b/plugins/Dbx_tree/src/EncryptionManager.h index 763df26595..768ea19efa 100644 --- a/plugins/Dbx_tree/EncryptionManager.h +++ b/plugins/Dbx_tree/src/EncryptionManager.h @@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "sigslot.h"
#define __INTERFACE_ONLY__
-#include "encryption/Cipher.h"
+#include "../encryption/Common/Cipher.h"
#undef __INTERFACE_ONLY__
#include "SHA256.h"
diff --git a/plugins/Dbx_tree/Entities.cpp b/plugins/Dbx_tree/src/Entities.cpp index 73e9487ac6..73e9487ac6 100644 --- a/plugins/Dbx_tree/Entities.cpp +++ b/plugins/Dbx_tree/src/Entities.cpp diff --git a/plugins/Dbx_tree/Entities.h b/plugins/Dbx_tree/src/Entities.h index 579383d15f..579383d15f 100644 --- a/plugins/Dbx_tree/Entities.h +++ b/plugins/Dbx_tree/src/Entities.h diff --git a/plugins/Dbx_tree/Events.cpp b/plugins/Dbx_tree/src/Events.cpp index 732f6241c2..732f6241c2 100644 --- a/plugins/Dbx_tree/Events.cpp +++ b/plugins/Dbx_tree/src/Events.cpp diff --git a/plugins/Dbx_tree/Events.h b/plugins/Dbx_tree/src/Events.h index 7a3d50ff19..7a3d50ff19 100644 --- a/plugins/Dbx_tree/Events.h +++ b/plugins/Dbx_tree/src/Events.h diff --git a/plugins/Dbx_tree/FileAccess.cpp b/plugins/Dbx_tree/src/FileAccess.cpp index a0aa85aecb..a0aa85aecb 100644 --- a/plugins/Dbx_tree/FileAccess.cpp +++ b/plugins/Dbx_tree/src/FileAccess.cpp diff --git a/plugins/Dbx_tree/FileAccess.h b/plugins/Dbx_tree/src/FileAccess.h index f49643e2a3..f49643e2a3 100644 --- a/plugins/Dbx_tree/FileAccess.h +++ b/plugins/Dbx_tree/src/FileAccess.h diff --git a/plugins/Dbx_tree/FileBTree.h b/plugins/Dbx_tree/src/FileBTree.h index 3a9e58a43e..3a9e58a43e 100644 --- a/plugins/Dbx_tree/FileBTree.h +++ b/plugins/Dbx_tree/src/FileBTree.h diff --git a/plugins/Dbx_tree/Hash.cpp b/plugins/Dbx_tree/src/Hash.cpp index f0541c2da0..f0541c2da0 100644 --- a/plugins/Dbx_tree/Hash.cpp +++ b/plugins/Dbx_tree/src/Hash.cpp diff --git a/plugins/Dbx_tree/Hash.h b/plugins/Dbx_tree/src/Hash.h index 886e8b1485..886e8b1485 100644 --- a/plugins/Dbx_tree/Hash.h +++ b/plugins/Dbx_tree/src/Hash.h diff --git a/plugins/Dbx_tree/Interface.h b/plugins/Dbx_tree/src/Interface.h index bde0a74511..bde0a74511 100644 --- a/plugins/Dbx_tree/Interface.h +++ b/plugins/Dbx_tree/src/Interface.h diff --git a/plugins/Dbx_tree/IterationHeap.h b/plugins/Dbx_tree/src/IterationHeap.h index db06f7e695..db06f7e695 100644 --- a/plugins/Dbx_tree/IterationHeap.h +++ b/plugins/Dbx_tree/src/IterationHeap.h diff --git a/plugins/Dbx_tree/Logger.cpp b/plugins/Dbx_tree/src/Logger.cpp index 551824d905..551824d905 100644 --- a/plugins/Dbx_tree/Logger.cpp +++ b/plugins/Dbx_tree/src/Logger.cpp diff --git a/plugins/Dbx_tree/Logger.h b/plugins/Dbx_tree/src/Logger.h index a97b928555..a97b928555 100644 --- a/plugins/Dbx_tree/Logger.h +++ b/plugins/Dbx_tree/src/Logger.h diff --git a/plugins/Dbx_tree/MREWSync.cpp b/plugins/Dbx_tree/src/MREWSync.cpp index 6e08be6475..6e08be6475 100644 --- a/plugins/Dbx_tree/MREWSync.cpp +++ b/plugins/Dbx_tree/src/MREWSync.cpp diff --git a/plugins/Dbx_tree/MREWSync.h b/plugins/Dbx_tree/src/MREWSync.h index 2ffcbc08d7..2ffcbc08d7 100644 --- a/plugins/Dbx_tree/MREWSync.h +++ b/plugins/Dbx_tree/src/MREWSync.h diff --git a/plugins/Dbx_tree/MappedMemory.cpp b/plugins/Dbx_tree/src/MappedMemory.cpp index 09a1471a90..09a1471a90 100644 --- a/plugins/Dbx_tree/MappedMemory.cpp +++ b/plugins/Dbx_tree/src/MappedMemory.cpp diff --git a/plugins/Dbx_tree/MappedMemory.h b/plugins/Dbx_tree/src/MappedMemory.h index e66862836e..e66862836e 100644 --- a/plugins/Dbx_tree/MappedMemory.h +++ b/plugins/Dbx_tree/src/MappedMemory.h diff --git a/plugins/Dbx_tree/SHA256.cpp b/plugins/Dbx_tree/src/SHA256.cpp index 9ca7df329c..9ca7df329c 100644 --- a/plugins/Dbx_tree/SHA256.cpp +++ b/plugins/Dbx_tree/src/SHA256.cpp diff --git a/plugins/Dbx_tree/SHA256.h b/plugins/Dbx_tree/src/SHA256.h index a9629e6a2a..a9629e6a2a 100644 --- a/plugins/Dbx_tree/SHA256.h +++ b/plugins/Dbx_tree/src/SHA256.h diff --git a/plugins/Dbx_tree/Services.cpp b/plugins/Dbx_tree/src/Services.cpp index d8b734795d..d8b734795d 100644 --- a/plugins/Dbx_tree/Services.cpp +++ b/plugins/Dbx_tree/src/Services.cpp diff --git a/plugins/Dbx_tree/Services.h b/plugins/Dbx_tree/src/Services.h index 0d75552fd4..0d75552fd4 100644 --- a/plugins/Dbx_tree/Services.h +++ b/plugins/Dbx_tree/src/Services.h diff --git a/plugins/Dbx_tree/Settings.cpp b/plugins/Dbx_tree/src/Settings.cpp index b4ba799c55..b4ba799c55 100644 --- a/plugins/Dbx_tree/Settings.cpp +++ b/plugins/Dbx_tree/src/Settings.cpp diff --git a/plugins/Dbx_tree/Settings.h b/plugins/Dbx_tree/src/Settings.h index 28be10603e..28be10603e 100644 --- a/plugins/Dbx_tree/Settings.h +++ b/plugins/Dbx_tree/src/Settings.h diff --git a/plugins/Dbx_tree/TLS.h b/plugins/Dbx_tree/src/TLS.h index d309090a34..d309090a34 100644 --- a/plugins/Dbx_tree/TLS.h +++ b/plugins/Dbx_tree/src/TLS.h diff --git a/plugins/Dbx_tree/Thread.cpp b/plugins/Dbx_tree/src/Thread.cpp index bdb01f18aa..bdb01f18aa 100644 --- a/plugins/Dbx_tree/Thread.cpp +++ b/plugins/Dbx_tree/src/Thread.cpp diff --git a/plugins/Dbx_tree/Thread.h b/plugins/Dbx_tree/src/Thread.h index 09b0b6c016..09b0b6c016 100644 --- a/plugins/Dbx_tree/Thread.h +++ b/plugins/Dbx_tree/src/Thread.h diff --git a/plugins/Dbx_tree/dbConfig_rc.h b/plugins/Dbx_tree/src/dbConfig_rc.h index 099067d3ec..099067d3ec 100644 --- a/plugins/Dbx_tree/dbConfig_rc.h +++ b/plugins/Dbx_tree/src/dbConfig_rc.h diff --git a/plugins/Dbx_tree/dbVersion_rc.h b/plugins/Dbx_tree/src/dbVersion_rc.h index 24a3ae4cf4..24a3ae4cf4 100644 --- a/plugins/Dbx_tree/dbVersion_rc.h +++ b/plugins/Dbx_tree/src/dbVersion_rc.h diff --git a/plugins/Dbx_tree/init.cpp b/plugins/Dbx_tree/src/init.cpp index 3e1f4cc6a6..3e1f4cc6a6 100644 --- a/plugins/Dbx_tree/init.cpp +++ b/plugins/Dbx_tree/src/init.cpp diff --git a/plugins/Dbx_tree/intrinsics.h b/plugins/Dbx_tree/src/intrinsics.h index 7cb8af18f3..7cb8af18f3 100644 --- a/plugins/Dbx_tree/intrinsics.h +++ b/plugins/Dbx_tree/src/intrinsics.h diff --git a/plugins/Dbx_tree/inttypes.h b/plugins/Dbx_tree/src/inttypes.h index 25542771f5..25542771f5 100644 --- a/plugins/Dbx_tree/inttypes.h +++ b/plugins/Dbx_tree/src/inttypes.h diff --git a/plugins/Dbx_tree/lockfree_hashmap.h b/plugins/Dbx_tree/src/lockfree_hashmap.h index 7ec2df3ce4..7ec2df3ce4 100644 --- a/plugins/Dbx_tree/lockfree_hashmap.h +++ b/plugins/Dbx_tree/src/lockfree_hashmap.h diff --git a/plugins/Dbx_tree/lockfree_hashmultimap.h b/plugins/Dbx_tree/src/lockfree_hashmultimap.h index 79981e5447..79981e5447 100644 --- a/plugins/Dbx_tree/lockfree_hashmultimap.h +++ b/plugins/Dbx_tree/src/lockfree_hashmultimap.h diff --git a/plugins/Dbx_tree/savestrings_gcc.h b/plugins/Dbx_tree/src/savestrings_gcc.h index 9da680874d..9da680874d 100644 --- a/plugins/Dbx_tree/savestrings_gcc.h +++ b/plugins/Dbx_tree/src/savestrings_gcc.h diff --git a/plugins/Dbx_tree/sigslot.h b/plugins/Dbx_tree/src/sigslot.h index 1e67a152bf..1e67a152bf 100644 --- a/plugins/Dbx_tree/sigslot.h +++ b/plugins/Dbx_tree/src/sigslot.h diff --git a/plugins/Dbx_tree/stdint.h b/plugins/Dbx_tree/src/stdint.h index 59d067302f..59d067302f 100644 --- a/plugins/Dbx_tree/stdint.h +++ b/plugins/Dbx_tree/src/stdint.h |