From ba0fb1404b113a7ced189e5f38cd5a960d67badf Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 23 Feb 2013 15:32:51 +0000 Subject: removed not used headers git-svn-id: http://svn.miranda-ng.org/main/trunk@3732 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/DbEditorPP/dbeditorpp_10.vcxproj | 8 +-- plugins/DbEditorPP/dbeditorpp_11.vcxproj | 8 +-- plugins/DbEditorPP/res/Version.rc | 4 -- plugins/DbEditorPP/res/resource.rc | 109 +++++++++++-------------------- plugins/DbEditorPP/src/Version.h | 10 +-- plugins/DbEditorPP/src/main.cpp | 10 ++- 6 files changed, 51 insertions(+), 98 deletions(-) (limited to 'plugins/DbEditorPP') diff --git a/plugins/DbEditorPP/dbeditorpp_10.vcxproj b/plugins/DbEditorPP/dbeditorpp_10.vcxproj index 7244fe142d..5c471ada72 100644 --- a/plugins/DbEditorPP/dbeditorpp_10.vcxproj +++ b/plugins/DbEditorPP/dbeditorpp_10.vcxproj @@ -73,7 +73,7 @@ Disabled ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;DBEDITORPP_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -99,7 +99,7 @@ Disabled ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_WINDOWS;_USRDLL;DBEDITORPP_EXPORTS;%(PreprocessorDefinitions) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -126,7 +126,7 @@ OnlyExplicitInline Size ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;DBEDITORPP_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true true Use @@ -156,7 +156,7 @@ OnlyExplicitInline Size ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;_USRDLL;DBEDITORPP_EXPORTS;%(PreprocessorDefinitions) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true true Use diff --git a/plugins/DbEditorPP/dbeditorpp_11.vcxproj b/plugins/DbEditorPP/dbeditorpp_11.vcxproj index 63747657fe..9c170fb7ad 100644 --- a/plugins/DbEditorPP/dbeditorpp_11.vcxproj +++ b/plugins/DbEditorPP/dbeditorpp_11.vcxproj @@ -77,7 +77,7 @@ Disabled ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;DBEDITORPP_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -103,7 +103,7 @@ Disabled ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_WINDOWS;_USRDLL;DBEDITORPP_EXPORTS;%(PreprocessorDefinitions) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use @@ -130,7 +130,7 @@ OnlyExplicitInline Size ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;DBEDITORPP_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true true Use @@ -160,7 +160,7 @@ OnlyExplicitInline Size ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;_USRDLL;DBEDITORPP_EXPORTS;%(PreprocessorDefinitions) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true true Use diff --git a/plugins/DbEditorPP/res/Version.rc b/plugins/DbEditorPP/res/Version.rc index d741488c4f..5bfbab4754 100644 --- a/plugins/DbEditorPP/res/Version.rc +++ b/plugins/DbEditorPP/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/DbEditorPP/res/resource.rc b/plugins/DbEditorPP/res/resource.rc index bfd1ee5c4f..3485ae5861 100644 --- a/plugins/DbEditorPP/res/resource.rc +++ b/plugins/DbEditorPP/res/resource.rc @@ -78,74 +78,6 @@ BEGIN LTEXT "If the module name has a space in it, put a \\ before the space. eg ""aaa\\ bbb""",IDC_STATIC,12,127,286,8 END - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN - IDD_FIND, DIALOG - BEGIN - LEFTMARGIN, 3 - RIGHTMARGIN, 337 - VERTGUIDE, 10 - VERTGUIDE, 40 - VERTGUIDE, 115 - VERTGUIDE, 194 - VERTGUIDE, 277 - TOPMARGIN, 7 - HORZGUIDE, 18 - HORZGUIDE, 35 - HORZGUIDE, 48 - HORZGUIDE, 68 - HORZGUIDE, 95 - END - - IDD_OPTIONS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 307 - VERTGUIDE, 12 - TOPMARGIN, 7 - BOTTOMMARGIN, 232 - HORZGUIDE, 68 - END -END -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -ICO_KNOWN ICON "Yellow.ico" -ICO_KNOWNOPEN ICON "Yellow_open.ico" -ICO_UNKNOWNOPEN ICON "Red_open.ico" -ICO_UNKNOWN ICON "Red.ico" -ICO_SETTINGS ICON "Icon_4.ico" -ICO_ONLINE ICON "online2.ico" -#endif // Английский (США) resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// Английский (Австралия) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENA) -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS -#pragma code_page(1252) - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - IDD_ADD_MODULE DIALOGEX 0, 0, 186, 67 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Add a module to contact" @@ -236,6 +168,33 @@ END #ifdef APSTUDIO_INVOKED GUIDELINES DESIGNINFO BEGIN + IDD_FIND, DIALOG + BEGIN + LEFTMARGIN, 3 + RIGHTMARGIN, 337 + VERTGUIDE, 10 + VERTGUIDE, 40 + VERTGUIDE, 115 + VERTGUIDE, 194 + VERTGUIDE, 277 + TOPMARGIN, 7 + HORZGUIDE, 18 + HORZGUIDE, 35 + HORZGUIDE, 48 + HORZGUIDE, 68 + HORZGUIDE, 95 + END + + IDD_OPTIONS, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 307 + VERTGUIDE, 12 + TOPMARGIN, 7 + BOTTOMMARGIN, 232 + HORZGUIDE, 68 + END + IDD_ADD_MODULE, DIALOG BEGIN LEFTMARGIN, 7 @@ -292,6 +251,12 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. +ICO_KNOWN ICON "Yellow.ico" +ICO_KNOWNOPEN ICON "Yellow_open.ico" +ICO_UNKNOWNOPEN ICON "Red_open.ico" +ICO_UNKNOWN ICON "Red.ico" +ICO_SETTINGS ICON "Icon_4.ico" +ICO_ONLINE ICON "online2.ico" ICO_REGEDIT ICON "Icon_1.ico" ICO_DBE_BUTT ICON "dbepp.ico" ICO_REGUSER ICON "usermenu.ico" @@ -305,6 +270,10 @@ ICO_OFFLINE ICON "offline2.ico" ICO_UNICODE ICON "unicode.ico" ICO_HANDLE ICON "handle.ico" +#endif // Английский (США) resources +///////////////////////////////////////////////////////////////////////////// + + #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // @@ -499,10 +468,6 @@ BEGIN END END -#endif // Английский (Австралия) resources -///////////////////////////////////////////////////////////////////////////// - - #ifndef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/DbEditorPP/src/Version.h b/plugins/DbEditorPP/src/Version.h index 4f8b8fa1c3..3008fbae1b 100644 --- a/plugins/DbEditorPP/src/Version.h +++ b/plugins/DbEditorPP/src/Version.h @@ -4,15 +4,9 @@ #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 "Database Editor++" -#define __INTERNAL_NAME "DBEditor" -#define __FILENAME "Svc_dbepp.dll" +#define __PLUGIN_NAME "Database editor++" +#define __FILENAME "DbEditorPP.dll" #define __DESCRIPTION "Advanced Database Editor." #define __AUTHOR "Bio, Jonathan Gordon" #define __AUTHOREMAIL "bio@msx.ru, jdgordy@gmail.com" diff --git a/plugins/DbEditorPP/src/main.cpp b/plugins/DbEditorPP/src/main.cpp index cb79c9739f..df3505c2e5 100644 --- a/plugins/DbEditorPP/src/main.cpp +++ b/plugins/DbEditorPP/src/main.cpp @@ -1,8 +1,5 @@ #include "headers.h" - - - HINSTANCE hInst = NULL; HANDLE hTTBButt = NULL; @@ -30,7 +27,8 @@ PLUGININFOEX pluginInfoEx={ __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, - {0xa8a417ef, 0x7aa, 0x4f37, { 0x86, 0x9f, 0x7b, 0xfd, 0x74, 0x88, 0x65, 0x34}} // {A8A417EF-07AA-4f37-869F-7BFD74886534} + // {A8A417EF-07AA-4F37-869F-7BFD74886534} + {0xa8a417ef, 0x7aa, 0x4f37, {0x86, 0x9f, 0x7b, 0xfd, 0x74, 0x88, 0x65, 0x34}} }; extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) @@ -44,9 +42,9 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_SERVICE //======================== // WINAPI DllMain //======================== -BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - hInst=hinstDLL; + hInst = hinstDLL; return TRUE; } -- cgit v1.2.3