From a4888d0a3d58a13ade8d9c496a228570e2b2adb6 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 25 Jul 2015 13:39:32 +0000 Subject: unified ftpfile project git-svn-id: http://svn.miranda-ng.org/main/trunk@14685 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- bin10/mir_dev.sln | 4 +- bin10/mir_full.sln | 4 +- bin10/mir_full_pro.sln | 4 +- bin12/mir_dev.sln | 4 +- bin12/mir_full.sln | 4 +- bin14/mir_dev.sln | 40 ++--- bin14/mir_full.sln | 4 +- plugins/FTPFileYM/ftpfile.vcxproj | 46 ++++++ plugins/FTPFileYM/ftpfile.vcxproj.filters | 4 + plugins/FTPFileYM/ftpfile_10.vcxproj | 229 -------------------------- plugins/FTPFileYM/ftpfile_10.vcxproj.filters | 116 -------------- plugins/FTPFileYM/ftpfile_12.vcxproj | 232 --------------------------- plugins/FTPFileYM/ftpfile_12.vcxproj.filters | 116 -------------- plugins/FTPFileYM/ftpfile_14.vcxproj | 232 --------------------------- plugins/FTPFileYM/ftpfile_14.vcxproj.filters | 116 -------------- plugins/FTPFileYM/src/common.h | 87 ---------- plugins/FTPFileYM/src/dbentry.cpp | 2 +- plugins/FTPFileYM/src/dbentry.h | 2 +- plugins/FTPFileYM/src/deletetimer.cpp | 2 +- plugins/FTPFileYM/src/deletetimer.h | 2 +- plugins/FTPFileYM/src/dialog.cpp | 2 +- plugins/FTPFileYM/src/dialog.h | 2 +- plugins/FTPFileYM/src/ftpfile.cpp | 2 +- plugins/FTPFileYM/src/job_delete.cpp | 2 +- plugins/FTPFileYM/src/job_generic.cpp | 2 +- plugins/FTPFileYM/src/job_generic.h | 2 +- plugins/FTPFileYM/src/job_packer.cpp | 2 +- plugins/FTPFileYM/src/job_packer.h | 2 +- plugins/FTPFileYM/src/job_upload.cpp | 2 +- plugins/FTPFileYM/src/job_upload.h | 2 +- plugins/FTPFileYM/src/manager.cpp | 2 +- plugins/FTPFileYM/src/manager.h | 2 +- plugins/FTPFileYM/src/mir_db.cpp | 2 +- plugins/FTPFileYM/src/mir_db.h | 2 +- plugins/FTPFileYM/src/options.cpp | 2 +- plugins/FTPFileYM/src/options.h | 2 +- plugins/FTPFileYM/src/serverlist.cpp | 2 +- plugins/FTPFileYM/src/serverlist.h | 2 +- plugins/FTPFileYM/src/stdafx.cpp | 18 --- plugins/FTPFileYM/src/stdafx.cxx | 18 +++ plugins/FTPFileYM/src/stdafx.h | 85 ++++++++++ plugins/FTPFileYM/src/utils.cpp | 2 +- plugins/FTPFileYM/src/utils.h | 2 +- 43 files changed, 211 insertions(+), 1200 deletions(-) create mode 100644 plugins/FTPFileYM/ftpfile.vcxproj create mode 100644 plugins/FTPFileYM/ftpfile.vcxproj.filters delete mode 100644 plugins/FTPFileYM/ftpfile_10.vcxproj delete mode 100644 plugins/FTPFileYM/ftpfile_10.vcxproj.filters delete mode 100644 plugins/FTPFileYM/ftpfile_12.vcxproj delete mode 100644 plugins/FTPFileYM/ftpfile_12.vcxproj.filters delete mode 100644 plugins/FTPFileYM/ftpfile_14.vcxproj delete mode 100644 plugins/FTPFileYM/ftpfile_14.vcxproj.filters delete mode 100644 plugins/FTPFileYM/src/common.h delete mode 100644 plugins/FTPFileYM/src/stdafx.cpp create mode 100644 plugins/FTPFileYM/src/stdafx.cxx create mode 100644 plugins/FTPFileYM/src/stdafx.h diff --git a/bin10/mir_dev.sln b/bin10/mir_dev.sln index b658ee12d0..49dc5eaed7 100644 --- a/bin10/mir_dev.sln +++ b/bin10/mir_dev.sln @@ -343,7 +343,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pu_stub", "..\plugins\Plugi EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NotifyAnything", "..\plugins\NotifyAnything\NotifyAnything_10.vcxproj", "{F5E3FAFE-B650-4736-8D27-FA53866668C6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FTPFile", "..\plugins\FTPFileYM\ftpfile_10.vcxproj", "{73482497-9F57-4819-A9AB-5D841A9F072D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FTPFile", "..\plugins\FTPFileYM\ftpfile.vcxproj", "{73482497-9F57-4819-A9AB-5D841A9F072D}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StatusChange", "..\plugins\StatusChange\StatusChange_10.vcxproj", "{D09881C7-E189-49AD-919E-F64355F8EFD0}" EndProject @@ -387,7 +387,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartupSilence", "..\plugin EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirandaG15", "..\plugins\MirandaG15\MirandaG15_10.vcxproj", "{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\plugins\FTPFileYM\curl\lib\vc6libcurl_10.vcxproj", "{01F9E227-06F5-4BED-907F-402CA7DFAFE6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\libs\libcurl\libcurl.vcxproj", "{01F9E227-06F5-4BED-907F-402CA7DFAFE6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemovePersonalSettings", "..\plugins\RemovePersonalSettings\rps_10.vcxproj", "{0D3EF7C4-B99C-E87E-D0D8-C6E003B7EB65}" EndProject diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln index 5f272be9c0..8eb64e8675 100644 --- a/bin10/mir_full.sln +++ b/bin10/mir_full.sln @@ -348,9 +348,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pu_stub", "..\plugins\Plugi EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NotifyAnything", "..\plugins\NotifyAnything\NotifyAnything_10.vcxproj", "{F5E3FAFE-B650-4736-8D27-FA53866668C6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\plugins\FTPFileYM\curl\lib\vc6libcurl_10.vcxproj", "{01F9E227-06F5-4BED-907F-402CA7DFAFE6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\libs\libcurl\libcurl.vcxproj", "{01F9E227-06F5-4BED-907F-402CA7DFAFE6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FTPFile", "..\plugins\FTPFileYM\ftpfile_10.vcxproj", "{73482497-9F57-4819-A9AB-5D841A9F072D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FTPFile", "..\plugins\FTPFileYM\ftpfile.vcxproj", "{73482497-9F57-4819-A9AB-5D841A9F072D}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StatusChange", "..\plugins\StatusChange\StatusChange_10.vcxproj", "{D09881C7-E189-49AD-919E-F64355F8EFD0}" EndProject diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln index d6d7ef2db4..81c78922cf 100644 --- a/bin10/mir_full_pro.sln +++ b/bin10/mir_full_pro.sln @@ -382,9 +382,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pu_stub", "..\plugins\Plugi EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NotifyAnything", "..\plugins\NotifyAnything\NotifyAnything_10.vcxproj", "{F5E3FAFE-B650-4736-8D27-FA53866668C6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\plugins\FTPFileYM\curl\lib\vc6libcurl_10.vcxproj", "{01F9E227-06F5-4BED-907F-402CA7DFAFE6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\libs\libcurl\libcurl.vcxproj", "{01F9E227-06F5-4BED-907F-402CA7DFAFE6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FTPFile", "..\plugins\FTPFileYM\ftpfile_10.vcxproj", "{73482497-9F57-4819-A9AB-5D841A9F072D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FTPFile", "..\plugins\FTPFileYM\ftpfile.vcxproj", "{73482497-9F57-4819-A9AB-5D841A9F072D}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StatusChange", "..\plugins\StatusChange\StatusChange_10.vcxproj", "{D09881C7-E189-49AD-919E-F64355F8EFD0}" EndProject diff --git a/bin12/mir_dev.sln b/bin12/mir_dev.sln index 3f6ce6fbef..ff9c61caac 100644 --- a/bin12/mir_dev.sln +++ b/bin12/mir_dev.sln @@ -350,7 +350,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pu_stub", "..\plugins\Plugi EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NotifyAnything", "..\plugins\NotifyAnything\NotifyAnything_12.vcxproj", "{F5E3FAFE-B650-4736-8D27-FA53866668C6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FTPFile", "..\plugins\FTPFileYM\ftpfile_12.vcxproj", "{73482497-9F57-4819-A9AB-5D841A9F072D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FTPFile", "..\plugins\FTPFileYM\ftpfile.vcxproj", "{73482497-9F57-4819-A9AB-5D841A9F072D}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StatusChange", "..\plugins\StatusChange\StatusChange_12.vcxproj", "{D09881C7-E189-49AD-919E-F64355F8EFD0}" EndProject @@ -394,7 +394,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartupSilence", "..\plugin EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirandaG15", "..\plugins\MirandaG15\MirandaG15_12.vcxproj", "{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\plugins\FTPFileYM\curl\lib\vc6libcurl_12.vcxproj", "{01F9E227-06F5-4BED-907F-402CA7DFAFE6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\libs\libcurl\libcurl.vcxproj", "{01F9E227-06F5-4BED-907F-402CA7DFAFE6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemovePersonalSettings", "..\plugins\RemovePersonalSettings\rps_12.vcxproj", "{0D3EF7C4-B99C-E87E-D0D8-C6E003B7EB65}" EndProject diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln index 4a4db2ce25..2ce02e766e 100644 --- a/bin12/mir_full.sln +++ b/bin12/mir_full.sln @@ -268,7 +268,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmdLine", "..\plugins\CmdLi EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MimCmd", "..\plugins\MimCmd\MimCmd.vcxproj", "{1E3BB48A-FFBC-4A03-8C43-9124A484BE51}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FTPFile", "..\plugins\FTPFileYM\ftpfile_12.vcxproj", "{73482497-9F57-4819-A9AB-5D841A9F072D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FTPFile", "..\plugins\FTPFileYM\ftpfile.vcxproj", "{73482497-9F57-4819-A9AB-5D841A9F072D}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PasteIt", "..\plugins\PasteIt\PasteIt_12.vcxproj", "{BAEBC482-CDA9-4053-A7D0-08222E85118E}" EndProject @@ -352,7 +352,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pu_stub", "..\plugins\Plugi EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NotifyAnything", "..\plugins\NotifyAnything\NotifyAnything_12.vcxproj", "{F5E3FAFE-B650-4736-8D27-FA53866668C6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\plugins\FTPFileYM\curl\lib\vc6libcurl_12.vcxproj", "{01F9E227-06F5-4BED-907F-402CA7DFAFE6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\libs\libcurl\libcurl.vcxproj", "{01F9E227-06F5-4BED-907F-402CA7DFAFE6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StatusChange", "..\plugins\StatusChange\StatusChange_12.vcxproj", "{D09881C7-E189-49AD-919E-F64355F8EFD0}" EndProject diff --git a/bin14/mir_dev.sln b/bin14/mir_dev.sln index 2594a37235..c864895749 100644 --- a/bin14/mir_dev.sln +++ b/bin14/mir_dev.sln @@ -350,7 +350,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pu_stub", "..\plugins\Plugi EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NotifyAnything", "..\plugins\NotifyAnything\NotifyAnything_14.vcxproj", "{F5E3FAFE-B650-4736-8D27-FA53866668C6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FTPFile", "..\plugins\FTPFileYM\ftpfile_14.vcxproj", "{73482497-9F57-4819-A9AB-5D841A9F072D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FTPFile", "..\plugins\FTPFileYM\ftpfile.vcxproj", "{73482497-9F57-4819-A9AB-5D841A9F072D}" + ProjectSection(ProjectDependencies) = postProject + {01F9E227-06F5-4BED-907F-402CA7DFAFE6} = {01F9E227-06F5-4BED-907F-402CA7DFAFE6} + {E2A369CD-EDA3-414F-8AD0-E732CD7EE68C} = {E2A369CD-EDA3-414F-8AD0-E732CD7EE68C} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StatusChange", "..\plugins\StatusChange\StatusChange_14.vcxproj", "{D09881C7-E189-49AD-919E-F64355F8EFD0}" EndProject @@ -394,7 +398,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartupSilence", "..\plugin EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirandaG15", "..\plugins\MirandaG15\MirandaG15_14.vcxproj", "{8ACA3C8B-BDFA-47B2-8578-069555BA05B3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\plugins\FTPFileYM\curl\lib\vc6libcurl_14.vcxproj", "{01F9E227-06F5-4BED-907F-402CA7DFAFE6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\libs\libcurl\libcurl.vcxproj", "{01F9E227-06F5-4BED-907F-402CA7DFAFE6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemovePersonalSettings", "..\plugins\RemovePersonalSettings\rps_14.vcxproj", "{0D3EF7C4-B99C-E87E-D0D8-C6E003B7EB65}" EndProject @@ -446,6 +450,14 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F9916510-9055-4C9F-997A-3755DEC1511B}.Debug|Win32.ActiveCfg = Debug|Win32 + {F9916510-9055-4C9F-997A-3755DEC1511B}.Debug|Win32.Build.0 = Debug|Win32 + {F9916510-9055-4C9F-997A-3755DEC1511B}.Debug|x64.ActiveCfg = Debug|x64 + {F9916510-9055-4C9F-997A-3755DEC1511B}.Debug|x64.Build.0 = Debug|x64 + {F9916510-9055-4C9F-997A-3755DEC1511B}.Release|Win32.ActiveCfg = Release|Win32 + {F9916510-9055-4C9F-997A-3755DEC1511B}.Release|Win32.Build.0 = Release|Win32 + {F9916510-9055-4C9F-997A-3755DEC1511B}.Release|x64.ActiveCfg = Release|x64 + {F9916510-9055-4C9F-997A-3755DEC1511B}.Release|x64.Build.0 = Release|x64 {D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}.Debug|Win32.ActiveCfg = Debug|Win32 {D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}.Debug|Win32.Build.0 = Debug|Win32 {D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}.Debug|x64.ActiveCfg = Debug|x64 @@ -462,14 +474,14 @@ Global {538E451F-E667-4D07-BCE6-976ECC7BB8D1}.Release|Win32.Build.0 = Release|Win32 {538E451F-E667-4D07-BCE6-976ECC7BB8D1}.Release|x64.ActiveCfg = Release|x64 {538E451F-E667-4D07-BCE6-976ECC7BB8D1}.Release|x64.Build.0 = Release|x64 - {F9916510-9055-4C9F-997A-3755DEC1511B}.Debug|Win32.ActiveCfg = Debug|Win32 - {F9916510-9055-4C9F-997A-3755DEC1511B}.Debug|Win32.Build.0 = Debug|Win32 - {F9916510-9055-4C9F-997A-3755DEC1511B}.Debug|x64.ActiveCfg = Debug|x64 - {F9916510-9055-4C9F-997A-3755DEC1511B}.Debug|x64.Build.0 = Debug|x64 - {F9916510-9055-4C9F-997A-3755DEC1511B}.Release|Win32.ActiveCfg = Release|Win32 - {F9916510-9055-4C9F-997A-3755DEC1511B}.Release|Win32.Build.0 = Release|Win32 - {F9916510-9055-4C9F-997A-3755DEC1511B}.Release|x64.ActiveCfg = Release|x64 - {F9916510-9055-4C9F-997A-3755DEC1511B}.Release|x64.Build.0 = Release|x64 + {F6A9340E-B8D9-4C75-BE30-47DC66D0ABC7}.Debug|Win32.ActiveCfg = Debug|Win32 + {F6A9340E-B8D9-4C75-BE30-47DC66D0ABC7}.Debug|Win32.Build.0 = Debug|Win32 + {F6A9340E-B8D9-4C75-BE30-47DC66D0ABC7}.Debug|x64.ActiveCfg = Debug|x64 + {F6A9340E-B8D9-4C75-BE30-47DC66D0ABC7}.Debug|x64.Build.0 = Debug|x64 + {F6A9340E-B8D9-4C75-BE30-47DC66D0ABC7}.Release|Win32.ActiveCfg = Release|Win32 + {F6A9340E-B8D9-4C75-BE30-47DC66D0ABC7}.Release|Win32.Build.0 = Release|Win32 + {F6A9340E-B8D9-4C75-BE30-47DC66D0ABC7}.Release|x64.ActiveCfg = Release|x64 + {F6A9340E-B8D9-4C75-BE30-47DC66D0ABC7}.Release|x64.Build.0 = Release|x64 {7711F563-6473-4ABD-B5E3-477CE8384AD6}.Debug|Win32.ActiveCfg = Debug|Win32 {7711F563-6473-4ABD-B5E3-477CE8384AD6}.Debug|Win32.Build.0 = Debug|Win32 {7711F563-6473-4ABD-B5E3-477CE8384AD6}.Debug|x64.ActiveCfg = Debug|x64 @@ -1972,14 +1984,6 @@ Global {27D41D81-991F-4DC6-8749-B0321C87E694}.Release|Win32.Build.0 = Release|Win32 {27D41D81-991F-4DC6-8749-B0321C87E694}.Release|x64.ActiveCfg = Release|x64 {27D41D81-991F-4DC6-8749-B0321C87E694}.Release|x64.Build.0 = Release|x64 - {F6A9340E-B8D9-4C75-BE30-47DC66D0ABC7}.Debug|Win32.ActiveCfg = Debug|Win32 - {F6A9340E-B8D9-4C75-BE30-47DC66D0ABC7}.Debug|Win32.Build.0 = Debug|Win32 - {F6A9340E-B8D9-4C75-BE30-47DC66D0ABC7}.Debug|x64.ActiveCfg = Debug|x64 - {F6A9340E-B8D9-4C75-BE30-47DC66D0ABC7}.Debug|x64.Build.0 = Debug|x64 - {F6A9340E-B8D9-4C75-BE30-47DC66D0ABC7}.Release|Win32.ActiveCfg = Release|Win32 - {F6A9340E-B8D9-4C75-BE30-47DC66D0ABC7}.Release|Win32.Build.0 = Release|Win32 - {F6A9340E-B8D9-4C75-BE30-47DC66D0ABC7}.Release|x64.ActiveCfg = Release|x64 - {F6A9340E-B8D9-4C75-BE30-47DC66D0ABC7}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/bin14/mir_full.sln b/bin14/mir_full.sln index 456690eba2..75c40367fd 100644 --- a/bin14/mir_full.sln +++ b/bin14/mir_full.sln @@ -268,7 +268,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmdLine", "..\plugins\CmdLi EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MimCmd", "..\plugins\MimCmd\MimCmd.vcxproj", "{1E3BB48A-FFBC-4A03-8C43-9124A484BE51}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FTPFile", "..\plugins\FTPFileYM\ftpfile_14.vcxproj", "{73482497-9F57-4819-A9AB-5D841A9F072D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FTPFile", "..\plugins\FTPFileYM\ftpfile.vcxproj", "{73482497-9F57-4819-A9AB-5D841A9F072D}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PasteIt", "..\plugins\PasteIt\PasteIt_14.vcxproj", "{BAEBC482-CDA9-4053-A7D0-08222E85118E}" EndProject @@ -352,7 +352,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pu_stub", "..\plugins\Plugi EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NotifyAnything", "..\plugins\NotifyAnything\NotifyAnything_14.vcxproj", "{F5E3FAFE-B650-4736-8D27-FA53866668C6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\plugins\FTPFileYM\curl\lib\vc6libcurl_14.vcxproj", "{01F9E227-06F5-4BED-907F-402CA7DFAFE6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\libs\libcurl\libcurl.vcxproj", "{01F9E227-06F5-4BED-907F-402CA7DFAFE6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StatusChange", "..\plugins\StatusChange\StatusChange_14.vcxproj", "{D09881C7-E189-49AD-919E-F64355F8EFD0}" EndProject diff --git a/plugins/FTPFileYM/ftpfile.vcxproj b/plugins/FTPFileYM/ftpfile.vcxproj new file mode 100644 index 0000000000..d5b530b582 --- /dev/null +++ b/plugins/FTPFileYM/ftpfile.vcxproj @@ -0,0 +1,46 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + FTPFile + {73482497-9F57-4819-A9AB-5D841A9F072D} + + + + + + + {e2a369cd-eda3-414f-8ad0-e732cd7ee68c} + false + + + {01F9E227-06F5-4BED-907F-402CA7DFAFE6} + false + + + + + ..\..\libs\libcurl\include\curl\;%(AdditionalIncludeDirectories) + + + wldap32.lib;%(AdditionalDependencies) + + + \ No newline at end of file diff --git a/plugins/FTPFileYM/ftpfile.vcxproj.filters b/plugins/FTPFileYM/ftpfile.vcxproj.filters new file mode 100644 index 0000000000..de5ad9f66c --- /dev/null +++ b/plugins/FTPFileYM/ftpfile.vcxproj.filters @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/plugins/FTPFileYM/ftpfile_10.vcxproj b/plugins/FTPFileYM/ftpfile_10.vcxproj deleted file mode 100644 index 6260449eda..0000000000 --- a/plugins/FTPFileYM/ftpfile_10.vcxproj +++ /dev/null @@ -1,229 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - FTPFile - {73482497-9F57-4819-A9AB-5D841A9F072D} - - - - DynamicLibrary - Unicode - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - - - DynamicLibrary - Unicode - true - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Full - true - curl\include\curl\;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;CURL_STATICLIB;%(PreprocessorDefinitions) - true - Use - Level3 - common.h - Size - - - wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;comctl32.lib;%(AdditionalDependencies) - $(ProfileDir)..\..\bin10\lib - true - Windows - true - true - false - $(IntDir)$(TargetName).lib - /PDBALTPATH:%_PDB% - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Full - true - curl\include\curl\;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;CURL_STATICLIB;%(PreprocessorDefinitions) - true - Use - Level3 - common.h - Size - - - wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;comctl32.lib;%(AdditionalDependencies) - $(ProfileDir)..\..\bin10\lib - true - Windows - true - true - false - $(IntDir)$(TargetName).lib - /PDBALTPATH:%_PDB% - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Disabled - curl\include\curl\;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;CURL_STATICLIB;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - common.h - Level3 - EditAndContinue - - - wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;comctl32.lib;%(AdditionalDependencies) - $(ProfileDir)..\..\bin10\lib - true - Windows - false - $(IntDir)$(TargetName).lib - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Disabled - curl\include\curl\;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;CURL_STATICLIB;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - common.h - Level3 - - - wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;comctl32.lib;%(AdditionalDependencies) - $(ProfileDir)..\..\bin10\lib - true - Windows - $(IntDir)$(TargetName).lib - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {e2a369cd-eda3-414f-8ad0-e732cd7ee68c} - - - {01f9e227-06f5-4bed-907f-402ca7dfafe6} - - - - - - \ No newline at end of file diff --git a/plugins/FTPFileYM/ftpfile_10.vcxproj.filters b/plugins/FTPFileYM/ftpfile_10.vcxproj.filters deleted file mode 100644 index 84e1b58e6b..0000000000 --- a/plugins/FTPFileYM/ftpfile_10.vcxproj.filters +++ /dev/null @@ -1,116 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/FTPFileYM/ftpfile_12.vcxproj b/plugins/FTPFileYM/ftpfile_12.vcxproj deleted file mode 100644 index 86b734e9b4..0000000000 --- a/plugins/FTPFileYM/ftpfile_12.vcxproj +++ /dev/null @@ -1,232 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - FTPFile - {73482497-9F57-4819-A9AB-5D841A9F072D} - - - - DynamicLibrary - Unicode - v120_xp - - - DynamicLibrary - Unicode - true - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - DynamicLibrary - Unicode - true - v120_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Full - true - curl\include\curl\;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;CURL_STATICLIB;%(PreprocessorDefinitions) - true - Use - Level3 - common.h - Size - - - wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;comctl32.lib;%(AdditionalDependencies) - $(ProfileDir)..\..\bin12\lib - true - Windows - true - true - false - $(IntDir)$(TargetName).lib - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Full - true - curl\include\curl\;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;CURL_STATICLIB;%(PreprocessorDefinitions) - true - Use - Level3 - common.h - Size - - - wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;comctl32.lib;%(AdditionalDependencies) - $(ProfileDir)..\..\bin12\lib - true - Windows - true - true - false - $(IntDir)$(TargetName).lib - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Disabled - curl\include\curl\;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;CURL_STATICLIB;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - common.h - Level3 - EditAndContinue - - - wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;comctl32.lib;%(AdditionalDependencies) - $(ProfileDir)..\..\bin12\lib - true - Windows - false - $(IntDir)$(TargetName).lib - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Disabled - curl\include\curl\;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;CURL_STATICLIB;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - common.h - Level3 - - - wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;comctl32.lib;%(AdditionalDependencies) - $(ProfileDir)..\..\bin12\lib - true - Windows - $(IntDir)$(TargetName).lib - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {e2a369cd-eda3-414f-8ad0-e732cd7ee68c} - - - {01f9e227-06f5-4bed-907f-402ca7dfafe6} - - - - - - \ No newline at end of file diff --git a/plugins/FTPFileYM/ftpfile_12.vcxproj.filters b/plugins/FTPFileYM/ftpfile_12.vcxproj.filters deleted file mode 100644 index 84e1b58e6b..0000000000 --- a/plugins/FTPFileYM/ftpfile_12.vcxproj.filters +++ /dev/null @@ -1,116 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/FTPFileYM/ftpfile_14.vcxproj b/plugins/FTPFileYM/ftpfile_14.vcxproj deleted file mode 100644 index 34304c1ef1..0000000000 --- a/plugins/FTPFileYM/ftpfile_14.vcxproj +++ /dev/null @@ -1,232 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - FTPFile - {73482497-9F57-4819-A9AB-5D841A9F072D} - - - - DynamicLibrary - Unicode - v140_xp - - - DynamicLibrary - Unicode - true - v140_xp - - - DynamicLibrary - Unicode - v140_xp - - - DynamicLibrary - Unicode - true - v140_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Full - true - curl\include\curl\;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;CURL_STATICLIB;%(PreprocessorDefinitions) - true - Use - Level3 - common.h - Size - - - wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;comctl32.lib;%(AdditionalDependencies) - $(ProfileDir)..\..\bin14\lib - true - Windows - true - true - false - $(IntDir)$(TargetName).lib - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Full - true - curl\include\curl\;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;CURL_STATICLIB;%(PreprocessorDefinitions) - true - Use - Level3 - common.h - Size - - - wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;comctl32.lib;%(AdditionalDependencies) - $(ProfileDir)..\..\bin14\lib - true - Windows - true - true - false - $(IntDir)$(TargetName).lib - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Disabled - curl\include\curl\;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;CURL_STATICLIB;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - common.h - Level3 - EditAndContinue - - - wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;comctl32.lib;%(AdditionalDependencies) - $(ProfileDir)..\..\bin14\lib - true - Windows - false - $(IntDir)$(TargetName).lib - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Disabled - curl\include\curl\;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;CURL_STATICLIB;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - common.h - Level3 - - - wldap32.lib;ws2_32.lib;winmm.lib;UxTheme.lib;comctl32.lib;%(AdditionalDependencies) - $(ProfileDir)..\..\bin14\lib - true - Windows - $(IntDir)$(TargetName).lib - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {e2a369cd-eda3-414f-8ad0-e732cd7ee68c} - - - {01f9e227-06f5-4bed-907f-402ca7dfafe6} - - - - - - \ No newline at end of file diff --git a/plugins/FTPFileYM/ftpfile_14.vcxproj.filters b/plugins/FTPFileYM/ftpfile_14.vcxproj.filters deleted file mode 100644 index 84e1b58e6b..0000000000 --- a/plugins/FTPFileYM/ftpfile_14.vcxproj.filters +++ /dev/null @@ -1,116 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/FTPFileYM/src/common.h b/plugins/FTPFileYM/src/common.h deleted file mode 100644 index aca753f605..0000000000 --- a/plugins/FTPFileYM/src/common.h +++ /dev/null @@ -1,87 +0,0 @@ -/* -FTP File YM plugin -Copyright (C) 2007-2010 Jan Holub - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation version 2 -of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -#define WIN32_LEAN_AND_MEAN -#define _CRT_SECURE_NO_WARNINGS -#include -#include -#include -#include -#include -#include -#include -using namespace std; - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "curl.h" - -#include "mir_db.h" -#include "utils.h" -#include "dialog.h" -#include "options.h" -#include "serverlist.h" -#include "deletetimer.h" -#include "dbentry.h" -#include "manager.h" -#include "job_delete.h" -#include "job_packer.h" -#include "job_upload.h" -#include "version.h" -#include "job_generic.h" -#include "resource.h" - -#ifndef FREE -#define FREE(X) if (X) { mir_free(X); X = NULL; } -#endif - -#ifdef _DEBUG -#define _CRTDBG_MAP_ALLOC -#define new DEBUG_CLIENTBLOCK -#define DEBUG_CLIENTBLOCK new( _CLIENT_BLOCK, __FILE__, __LINE__) -#else -#define DEBUG_CLIENTBLOCK -#endif - -#define MS_FTPFILE_CONTACTMENU "FTPFile/ContactMenu" -#define MS_FTPFILE_MAINMENU "FTPFile/MainMenu" - -#define MODULE "FTPFile" -#define MODULE_FILES "FTPFile_Files" - -#define SOUND_UPCOMPLETE "ftpfile_upcomplete" -#define SOUND_CANCEL "ftpfile_cancel" - -extern HINSTANCE hInst; \ No newline at end of file diff --git a/plugins/FTPFileYM/src/dbentry.cpp b/plugins/FTPFileYM/src/dbentry.cpp index 82e21a2843..de808096ac 100644 --- a/plugins/FTPFileYM/src/dbentry.cpp +++ b/plugins/FTPFileYM/src/dbentry.cpp @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" int DBEntry::entryID; mir_cs DBEntry::mutexDB; diff --git a/plugins/FTPFileYM/src/dbentry.h b/plugins/FTPFileYM/src/dbentry.h index 2588dc2de9..56ffa15c9b 100644 --- a/plugins/FTPFileYM/src/dbentry.h +++ b/plugins/FTPFileYM/src/dbentry.h @@ -18,7 +18,7 @@ along with this program. If not, see . #pragma once -#include "common.h" +#include "stdafx.h" #include "job_upload.h" #include "utils.h" diff --git a/plugins/FTPFileYM/src/deletetimer.cpp b/plugins/FTPFileYM/src/deletetimer.cpp index 05aeaff64e..1ff72c620e 100644 --- a/plugins/FTPFileYM/src/deletetimer.cpp +++ b/plugins/FTPFileYM/src/deletetimer.cpp @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" DeleteTimer *DeleteTimer::instance = NULL; DeleteTimer &deleteTimer = DeleteTimer::getInstance(); diff --git a/plugins/FTPFileYM/src/deletetimer.h b/plugins/FTPFileYM/src/deletetimer.h index 9fbe478c9d..59159aa3da 100644 --- a/plugins/FTPFileYM/src/deletetimer.h +++ b/plugins/FTPFileYM/src/deletetimer.h @@ -18,7 +18,7 @@ along with this program. If not, see . #pragma once -#include "common.h" +#include "stdafx.h" #include "options.h" class DeleteTimer diff --git a/plugins/FTPFileYM/src/dialog.cpp b/plugins/FTPFileYM/src/dialog.cpp index 0649431ec4..61fec363ed 100644 --- a/plugins/FTPFileYM/src/dialog.cpp +++ b/plugins/FTPFileYM/src/dialog.cpp @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" UploadDialog *UploadDialog::instance = NULL; UploadDialog *uDlg = NULL; diff --git a/plugins/FTPFileYM/src/dialog.h b/plugins/FTPFileYM/src/dialog.h index 0b40c4ee2c..0f8db40f6f 100644 --- a/plugins/FTPFileYM/src/dialog.h +++ b/plugins/FTPFileYM/src/dialog.h @@ -18,7 +18,7 @@ along with this program. If not, see . #pragma once -#include "common.h" +#include "stdafx.h" #include "utils.h" #define WMU_DESTROY (WM_USER + 1) diff --git a/plugins/FTPFileYM/src/ftpfile.cpp b/plugins/FTPFileYM/src/ftpfile.cpp index 8b822de904..302a5750dc 100644 --- a/plugins/FTPFileYM/src/ftpfile.cpp +++ b/plugins/FTPFileYM/src/ftpfile.cpp @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" CLIST_INTERFACE *pcli; HINSTANCE hInst; diff --git a/plugins/FTPFileYM/src/job_delete.cpp b/plugins/FTPFileYM/src/job_delete.cpp index 9d57719211..7ba1f76b30 100644 --- a/plugins/FTPFileYM/src/job_delete.cpp +++ b/plugins/FTPFileYM/src/job_delete.cpp @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" #include "job_delete.h" Event DeleteJob::jobDone; diff --git a/plugins/FTPFileYM/src/job_generic.cpp b/plugins/FTPFileYM/src/job_generic.cpp index 71b5aac87c..e05561bfd8 100644 --- a/plugins/FTPFileYM/src/job_generic.cpp +++ b/plugins/FTPFileYM/src/job_generic.cpp @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" extern UploadDialog *uDlg; extern ServerList &ftpList; diff --git a/plugins/FTPFileYM/src/job_generic.h b/plugins/FTPFileYM/src/job_generic.h index 61045fb5a7..60487a1c48 100644 --- a/plugins/FTPFileYM/src/job_generic.h +++ b/plugins/FTPFileYM/src/job_generic.h @@ -18,7 +18,7 @@ along with this program. If not, see . #pragma once -#include "common.h" +#include "stdafx.h" #include "dialog.h" #include "serverlist.h" diff --git a/plugins/FTPFileYM/src/job_packer.cpp b/plugins/FTPFileYM/src/job_packer.cpp index 13b3b80844..47a74c6feb 100644 --- a/plugins/FTPFileYM/src/job_packer.cpp +++ b/plugins/FTPFileYM/src/job_packer.cpp @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" Event PackerJob::jobDone; mir_cs PackerJob::mutexJobCount; diff --git a/plugins/FTPFileYM/src/job_packer.h b/plugins/FTPFileYM/src/job_packer.h index 978d1181b1..a632c9e37f 100644 --- a/plugins/FTPFileYM/src/job_packer.h +++ b/plugins/FTPFileYM/src/job_packer.h @@ -18,7 +18,7 @@ along with this program. If not, see . #pragma once -#include "common.h" +#include "stdafx.h" #include "job_generic.h" #include "..\..\libs\zlib\src\zip.h" diff --git a/plugins/FTPFileYM/src/job_upload.cpp b/plugins/FTPFileYM/src/job_upload.cpp index 88fa9b34e0..40e35cdac0 100644 --- a/plugins/FTPFileYM/src/job_upload.cpp +++ b/plugins/FTPFileYM/src/job_upload.cpp @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" Event UploadJob::jobDone; mir_cs UploadJob::mutexJobCount; diff --git a/plugins/FTPFileYM/src/job_upload.h b/plugins/FTPFileYM/src/job_upload.h index 76432f3f92..f155453e7d 100644 --- a/plugins/FTPFileYM/src/job_upload.h +++ b/plugins/FTPFileYM/src/job_upload.h @@ -18,7 +18,7 @@ along with this program. If not, see . #pragma once -#include "common.h" +#include "stdafx.h" #include "job_generic.h" #include "utils.h" diff --git a/plugins/FTPFileYM/src/manager.cpp b/plugins/FTPFileYM/src/manager.cpp index b25ad7442b..5b5250169e 100644 --- a/plugins/FTPFileYM/src/manager.cpp +++ b/plugins/FTPFileYM/src/manager.cpp @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" #include "job_delete.h" #include "manager.h" #include "dbentry.h" diff --git a/plugins/FTPFileYM/src/manager.h b/plugins/FTPFileYM/src/manager.h index ef5ba0ddb3..67ca00bd6a 100644 --- a/plugins/FTPFileYM/src/manager.h +++ b/plugins/FTPFileYM/src/manager.h @@ -18,7 +18,7 @@ along with this program. If not, see . #pragma once -#include "common.h" +#include "stdafx.h" class Manager { diff --git a/plugins/FTPFileYM/src/mir_db.cpp b/plugins/FTPFileYM/src/mir_db.cpp index 6256b314aa..5f70e61d8e 100644 --- a/plugins/FTPFileYM/src/mir_db.cpp +++ b/plugins/FTPFileYM/src/mir_db.cpp @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" int DB::setByteF(MCONTACT hContact, char *szModule, char *szSetting, int id, int iValue) { diff --git a/plugins/FTPFileYM/src/mir_db.h b/plugins/FTPFileYM/src/mir_db.h index aeceb31576..f53e084667 100644 --- a/plugins/FTPFileYM/src/mir_db.h +++ b/plugins/FTPFileYM/src/mir_db.h @@ -18,7 +18,7 @@ along with this program. If not, see . #pragma once -#include "common.h" +#include "stdafx.h" class DB { diff --git a/plugins/FTPFileYM/src/options.cpp b/plugins/FTPFileYM/src/options.cpp index a68bcd1496..d14684ea02 100644 --- a/plugins/FTPFileYM/src/options.cpp +++ b/plugins/FTPFileYM/src/options.cpp @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" Options *Options::instance = NULL; Options &opt = Options::getInstance(); diff --git a/plugins/FTPFileYM/src/options.h b/plugins/FTPFileYM/src/options.h index 3f76853061..802f3c1e3c 100644 --- a/plugins/FTPFileYM/src/options.h +++ b/plugins/FTPFileYM/src/options.h @@ -18,7 +18,7 @@ along with this program. If not, see . #pragma once -#include "common.h" +#include "stdafx.h" #include "serverlist.h" class Options diff --git a/plugins/FTPFileYM/src/serverlist.cpp b/plugins/FTPFileYM/src/serverlist.cpp index bb20a4bb74..512aafa0a0 100644 --- a/plugins/FTPFileYM/src/serverlist.cpp +++ b/plugins/FTPFileYM/src/serverlist.cpp @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" ServerList *ServerList::instance = NULL; ServerList &ftpList = ServerList::getInstance(); diff --git a/plugins/FTPFileYM/src/serverlist.h b/plugins/FTPFileYM/src/serverlist.h index 8a1a540172..b701b77127 100644 --- a/plugins/FTPFileYM/src/serverlist.h +++ b/plugins/FTPFileYM/src/serverlist.h @@ -18,7 +18,7 @@ along with this program. If not, see . #pragma once -#include "common.h" +#include "stdafx.h" class ServerList { diff --git a/plugins/FTPFileYM/src/stdafx.cpp b/plugins/FTPFileYM/src/stdafx.cpp deleted file mode 100644 index c5fe5abaad..0000000000 --- a/plugins/FTPFileYM/src/stdafx.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright (C) 2012-15 Miranda NG project (http://miranda-ng.org) - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation version 2 -of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#include "common.h" \ No newline at end of file diff --git a/plugins/FTPFileYM/src/stdafx.cxx b/plugins/FTPFileYM/src/stdafx.cxx new file mode 100644 index 0000000000..0c766ea07f --- /dev/null +++ b/plugins/FTPFileYM/src/stdafx.cxx @@ -0,0 +1,18 @@ +/* +Copyright (C) 2012-15 Miranda NG project (http://miranda-ng.org) + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation version 2 +of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include "stdafx.h" diff --git a/plugins/FTPFileYM/src/stdafx.h b/plugins/FTPFileYM/src/stdafx.h new file mode 100644 index 0000000000..59c1f29874 --- /dev/null +++ b/plugins/FTPFileYM/src/stdafx.h @@ -0,0 +1,85 @@ +/* +FTP File YM plugin +Copyright (C) 2007-2010 Jan Holub + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation version 2 +of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#pragma once + +#include +#include +#include +#include +#include +#include +#include +using namespace std; + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "curl.h" + +#include "mir_db.h" +#include "utils.h" +#include "dialog.h" +#include "options.h" +#include "serverlist.h" +#include "deletetimer.h" +#include "dbentry.h" +#include "manager.h" +#include "job_delete.h" +#include "job_packer.h" +#include "job_upload.h" +#include "version.h" +#include "job_generic.h" +#include "resource.h" + +#ifndef FREE +#define FREE(X) if (X) { mir_free(X); X = NULL; } +#endif + +#ifdef _DEBUG +#define _CRTDBG_MAP_ALLOC +#define new DEBUG_CLIENTBLOCK +#define DEBUG_CLIENTBLOCK new( _CLIENT_BLOCK, __FILE__, __LINE__) +#else +#define DEBUG_CLIENTBLOCK +#endif + +#define MS_FTPFILE_CONTACTMENU "FTPFile/ContactMenu" +#define MS_FTPFILE_MAINMENU "FTPFile/MainMenu" + +#define MODULE "FTPFile" +#define MODULE_FILES "FTPFile_Files" + +#define SOUND_UPCOMPLETE "ftpfile_upcomplete" +#define SOUND_CANCEL "ftpfile_cancel" + +extern HINSTANCE hInst; \ No newline at end of file diff --git a/plugins/FTPFileYM/src/utils.cpp b/plugins/FTPFileYM/src/utils.cpp index 89ec7f8ae0..861f2238ea 100644 --- a/plugins/FTPFileYM/src/utils.cpp +++ b/plugins/FTPFileYM/src/utils.cpp @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "common.h" +#include "stdafx.h" extern Options &opt; extern UploadDialog *uDlg; diff --git a/plugins/FTPFileYM/src/utils.h b/plugins/FTPFileYM/src/utils.h index ef3904e592..10a0031a09 100644 --- a/plugins/FTPFileYM/src/utils.h +++ b/plugins/FTPFileYM/src/utils.h @@ -18,7 +18,7 @@ along with this program. If not, see . #pragma once -#include "common.h" +#include "stdafx.h" #include "serverlist.h" class Utils -- cgit v1.2.3