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 --- 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 +- 28 files changed, 127 insertions(+), 129 deletions(-) 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 (limited to 'plugins/FTPFileYM/src') 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