removed not used headers

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

5 files changed, 6 insertions, 91 deletions

diff --git a/plugins/FTPFileYM/res/Version.rc b/plugins/FTPFileYM/res/Version.rc
index d741488c4f..5bfbab4754 100644
--- a/plugins/FTPFileYM/res/Version.rc
+++ b/plugins/FTPFileYM/res/Version.rc
@@ -7,10 +7,6 @@
 #include "afxres.h"

 #include "..\src\version.h"

 

-#ifdef _WIN32

-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

-#endif //_WIN32

-

 VS_VERSION_INFO VERSIONINFO

  FILEVERSION __FILEVERSION_STRING

  PRODUCTVERSION __FILEVERSION_STRING

diff --git a/plugins/FTPFileYM/res/ftpfile.rc b/plugins/FTPFileYM/res/ftpfile.rc
index 408ec670cd..ec58a2659c 100644
--- a/plugins/FTPFileYM/res/ftpfile.rc
+++ b/plugins/FTPFileYM/res/ftpfile.rc
@@ -254,18 +254,10 @@ IDI_CLIPBOARD           ICON                    "clipboard.ico"
 IDI_RESUME              ICON                    "resume.ico"

 IDI_CLEAR               ICON                    "clear.ico"

 IDI_DELETE              ICON                    "delete.ico"

-#endif    // Neutral resources

-/////////////////////////////////////////////////////////////////////////////

-

 

+#endif    // Neutral resources

 /////////////////////////////////////////////////////////////////////////////

-// Czech resources

 

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CSY)

-#ifdef _WIN32

-LANGUAGE LANG_CZECH, SUBLANG_DEFAULT

-#pragma code_page(1250)

-#endif //_WIN32

 

 #ifdef APSTUDIO_INVOKED

 /////////////////////////////////////////////////////////////////////////////

@@ -292,10 +284,6 @@ END
 

 #endif    // APSTUDIO_INVOKED

 

-#endif    // Czech resources

-/////////////////////////////////////////////////////////////////////////////

-

-

 

 #ifndef APSTUDIO_INVOKED

 /////////////////////////////////////////////////////////////////////////////

diff --git a/plugins/FTPFileYM/res/version1.rc b/plugins/FTPFileYM/res/version1.rc
deleted file mode 100644
index 6384d03f71..0000000000
--- a/plugins/FTPFileYM/res/version1.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifdef APSTUDIO_INVOKED

-#error this file is not editable by Microsoft Visual C++

-#endif //APSTUDIO_INVOKED

-

-#include <windows.h>

-#include "version.h"

-

-VS_VERSION_INFO VERSIONINFO

- FILEVERSION __FILEVERSION_STRING

- PRODUCTVERSION __FILEVERSION_STRING

- FILEFLAGSMASK 0x3fL

-#ifdef _DEBUG

- FILEFLAGS 0x1L

-#else

- FILEFLAGS 0x0L

-#endif

- FILEOS 0x40004L

- FILETYPE 0x1L

- FILESUBTYPE 0x0L

-BEGIN

-    BLOCK "StringFileInfo"

-    BEGIN

-        BLOCK "000004b0"

-        BEGIN

-            VALUE "Author", "Jan Holub"

-			VALUE "CompanyName", "yaho"

-            VALUE "FileDescription", "FTP a file to a server and send the URL to your friend"

-            VALUE "FileVersion", __VERSION_STRING

-            VALUE "InternalName", "FTP File YM"

-            VALUE "LegalCopyright", "Copyright (c) 2007-2010 Jan Holub"

-			VALUE "OriginalFilename", "ftpfile.dll"

-            VALUE "ProductName", "FTP File YM"

-            VALUE "ProductVersion", __VERSION_STRING

-        END

-    END

-    BLOCK "VarFileInfo"

-    BEGIN

-        VALUE "Translation", 0x0, 1200

-    END

-END

diff --git a/plugins/FTPFileYM/src/common.h b/plugins/FTPFileYM/src/common.h
index 116c8ea9d3..d7a60e7566 100644
--- a/plugins/FTPFileYM/src/common.h
+++ b/plugins/FTPFileYM/src/common.h
@@ -38,50 +38,32 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 

 #define WIN32_LEAN_AND_MEAN	

 #define _CRT_SECURE_NO_WARNINGS

-#include <stdlib.h>

 #include <windows.h>

 #include <commdlg.h>

-#include <commctrl.h>

 #include <shellapi.h>

-#include <stdio.h>

-#include <stdlib.h>

-#include <time.h>

 #include <uxtheme.h>

-#include <wininet.h>

 #include <windowsx.h>

 #include <shlobj.h>

-

-#ifdef _DEBUG

-#define _CRTDBG_MAP_ALLOC

-#include <crtdbg.h>

-#endif

-

 #include <vector>

-#include <iostream>

 using namespace std;

 

-#define MIRANDA_VER		0x0A00

 #include <newpluginapi.h>

 #include <m_button.h>

 #include <m_clist.h>

-#include <m_clui.h>

 #include <m_database.h>

-#include <m_fontservice.h>

 #include <m_hotkeys.h>

 #include <m_icolib.h>

 #include <m_message.h>

 #include <m_langpack.h>

 #include <m_options.h>

-#include <m_popup.h>

 #include <m_protosvc.h>

 #include <m_skin.h>

-#include <m_system.h>

-#include <m_system_cpp.h>

-#include <m_utils.h>

 #include <win2k.h>

 

+#include <m_ftpfile.h>

+#include <m_msg_buttonsbar.h>

+

 #include "curl.h"

-#include "sys/stat.h"

 

 #include "mir_db.h"

 #include "utils.h"

@@ -96,25 +78,20 @@ using namespace std;
 #include "job_upload.h"

 #include "version.h"

 #include "job_generic.h"

-

 #include "resource.h"

-#include "m_ftpfile.h"

-#include "m_msg_buttonsbar.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

 

-#ifdef _DEBUG

-#define new DEBUG_CLIENTBLOCK

-#endif

-

 #define MS_FTPFILE_SHAREFILE	"FTPFile/ShareFiles"

 #define MS_FTPFILE_CONTACTMENU	"FTPFile/ContactMenu"

 #define MS_FTPFILE_MAINMENU		"FTPFile/MainMenu"

diff --git a/plugins/FTPFileYM/src/version.h b/plugins/FTPFileYM/src/version.h
index 8186e44083..1b24ffddbf 100644
--- a/plugins/FTPFileYM/src/version.h
+++ b/plugins/FTPFileYM/src/version.h
@@ -4,14 +4,8 @@
 #define __BUILD_NUM					0

 

 #define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

-#define __FILEVERSION_DOTS			__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM

-

-#define __STRINGIFY_IMPL(x)			#x

-#define __STRINGIFY(x)				__STRINGIFY_IMPL(x)

-#define __VERSION_STRING			__STRINGIFY(__FILEVERSION_DOTS)

 

 #define __PLUGIN_NAME				"FTP File YM"

-#define __INTERNAL_NAME				"FTPFile"

 #define __FILENAME					"FTPFile.dll"

 #define __DESCRIPTION 				"FTP a file to a server and send the URL to your friend. Supported automatic zipping before upload and encryption via SFTP and FTPS."

 #define __AUTHOR					"yaho"