unified ftpfile project

git-svn-id: http://svn.miranda-ng.org/main/trunk@14685 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

26 files changed, 25 insertions, 27 deletions

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 <http://www.gnu.org/licenses/>.

 */

 

-#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 <http://www.gnu.org/licenses/>.
 

 #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 <http://www.gnu.org/licenses/>.

 */

 

-#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 <http://www.gnu.org/licenses/>.
 

 #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 <http://www.gnu.org/licenses/>.

 */

 

-#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 <http://www.gnu.org/licenses/>.
 

 #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 <http://www.gnu.org/licenses/>.

 */

 

-#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 <http://www.gnu.org/licenses/>.

 */

 

-#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 <http://www.gnu.org/licenses/>.

 */

 

-#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 <http://www.gnu.org/licenses/>.
 

 #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 <http://www.gnu.org/licenses/>.

 */

 

-#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 <http://www.gnu.org/licenses/>.
 

 #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 <http://www.gnu.org/licenses/>.

 */

 

-#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 <http://www.gnu.org/licenses/>.
 

 #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 <http://www.gnu.org/licenses/>.

 */

 

-#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 <http://www.gnu.org/licenses/>.
 

 #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 <http://www.gnu.org/licenses/>.

 */

 

-#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 <http://www.gnu.org/licenses/>.
 

 #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 <http://www.gnu.org/licenses/>.

 */

 

-#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 <http://www.gnu.org/licenses/>.
 

 #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 <http://www.gnu.org/licenses/>.

 */

 

-#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 <http://www.gnu.org/licenses/>.
 

 #pragma once

 

-#include "common.h"

+#include "stdafx.h"

 

 class ServerList

 {

diff --git a/plugins/FTPFileYM/src/stdafx.cpp b/plugins/FTPFileYM/src/stdafx.cxx
index c5fe5abaad..0c766ea07f 100644
--- a/plugins/FTPFileYM/src/stdafx.cpp
+++ b/plugins/FTPFileYM/src/stdafx.cxx
@@ -15,4 +15,4 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.

 */

 

-#include "common.h"
\ No newline at end of file
+#include "stdafx.h"

diff --git a/plugins/FTPFileYM/src/common.h b/plugins/FTPFileYM/src/stdafx.h
index aca753f605..59c1f29874 100644
--- a/plugins/FTPFileYM/src/common.h
+++ b/plugins/FTPFileYM/src/stdafx.h
@@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 

 #pragma once

 

-#define WIN32_LEAN_AND_MEAN	

-#define _CRT_SECURE_NO_WARNINGS

 #include <windows.h>

 #include <commdlg.h>

 #include <shellapi.h>

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 <http://www.gnu.org/licenses/>.

 */

 

-#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 <http://www.gnu.org/licenses/>.
 

 #pragma once

 

-#include "common.h"

+#include "stdafx.h"

 #include "serverlist.h"

 

 class Utils