summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/PasteIt/PasteIt_10.vcxproj1
-rw-r--r--plugins/PasteIt/PasteIt_10.vcxproj.filters3
-rw-r--r--plugins/PasteIt/PasteIt_11.vcxproj1
-rw-r--r--plugins/PasteIt/PasteIt_11.vcxproj.filters3
-rw-r--r--plugins/PasteIt/res/PasteIt.rc31
-rw-r--r--plugins/PasteIt/res/version.rc22
-rw-r--r--plugins/PasteIt/src/Options.cpp9
-rw-r--r--plugins/PasteIt/src/PasteIt.cpp10
-rw-r--r--plugins/PasteIt/src/PasteToWeb.cpp5
-rw-r--r--plugins/PasteIt/src/PasteToWeb1.cpp2
-rw-r--r--plugins/PasteIt/src/PasteToWeb2.cpp1
-rw-r--r--plugins/PasteIt/src/stdafx.h26
-rw-r--r--plugins/PasteIt/src/targetver.h8
-rw-r--r--plugins/PasteIt/src/version.h10
14 files changed, 55 insertions, 77 deletions
diff --git a/plugins/PasteIt/PasteIt_10.vcxproj b/plugins/PasteIt/PasteIt_10.vcxproj
index 41f2b93730..d35f4df5fc 100644
--- a/plugins/PasteIt/PasteIt_10.vcxproj
+++ b/plugins/PasteIt/PasteIt_10.vcxproj
@@ -172,7 +172,6 @@
<ClInclude Include="src\PasteToWeb2.h" />
<ClInclude Include="src\resource.h" />
<ClInclude Include="src\stdafx.h" />
- <ClInclude Include="src\targetver.h" />
<ClInclude Include="src\version.h" />
</ItemGroup>
<ItemGroup>
diff --git a/plugins/PasteIt/PasteIt_10.vcxproj.filters b/plugins/PasteIt/PasteIt_10.vcxproj.filters
index a830818136..e3bf67e946 100644
--- a/plugins/PasteIt/PasteIt_10.vcxproj.filters
+++ b/plugins/PasteIt/PasteIt_10.vcxproj.filters
@@ -18,9 +18,6 @@
<ClInclude Include="src\stdafx.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="src\targetver.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="src\PasteToWeb.h">
<Filter>Header Files</Filter>
</ClInclude>
diff --git a/plugins/PasteIt/PasteIt_11.vcxproj b/plugins/PasteIt/PasteIt_11.vcxproj
index 25c94dbf6f..608ef66298 100644
--- a/plugins/PasteIt/PasteIt_11.vcxproj
+++ b/plugins/PasteIt/PasteIt_11.vcxproj
@@ -176,7 +176,6 @@
<ClInclude Include="src\PasteToWeb2.h" />
<ClInclude Include="src\resource.h" />
<ClInclude Include="src\stdafx.h" />
- <ClInclude Include="src\targetver.h" />
<ClInclude Include="src\version.h" />
</ItemGroup>
<ItemGroup>
diff --git a/plugins/PasteIt/PasteIt_11.vcxproj.filters b/plugins/PasteIt/PasteIt_11.vcxproj.filters
index a830818136..e3bf67e946 100644
--- a/plugins/PasteIt/PasteIt_11.vcxproj.filters
+++ b/plugins/PasteIt/PasteIt_11.vcxproj.filters
@@ -18,9 +18,6 @@
<ClInclude Include="src\stdafx.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="src\targetver.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="src\PasteToWeb.h">
<Filter>Header Files</Filter>
</ClInclude>
diff --git a/plugins/PasteIt/res/PasteIt.rc b/plugins/PasteIt/res/PasteIt.rc
index 69ec37137e..622f257799 100644
--- a/plugins/PasteIt/res/PasteIt.rc
+++ b/plugins/PasteIt/res/PasteIt.rc
@@ -5,13 +5,11 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-//#include "afxres.h"
+#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
-#include <winres.h>
-#include <windows.h>
/////////////////////////////////////////////////////////////////////////////
// Neutral resources
@@ -135,6 +133,33 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_MENU ICON "Paste.ico"
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "..\\src\\resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+
#endif // Neutral resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/PasteIt/res/version.rc b/plugins/PasteIt/res/version.rc
index afa2d43620..5bfbab4754 100644
--- a/plugins/PasteIt/res/version.rc
+++ b/plugins/PasteIt/res/version.rc
@@ -1,36 +1,34 @@
+// Microsoft Visual C++ generated resource script.
+//
#ifdef APSTUDIO_INVOKED
#error this file is not editable by Microsoft Visual C++
#endif //APSTUDIO_INVOKED
-#include <windows.h>
+#include "afxres.h"
#include "..\src\version.h"
VS_VERSION_INFO VERSIONINFO
FILEVERSION __FILEVERSION_STRING
PRODUCTVERSION __FILEVERSION_STRING
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+ FILEFLAGSMASK 0x17L
#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
+ FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
- FILEOS VOS_NT_WINDOWS32
- FILETYPE VFT_DLL
- FILESUBTYPE VFT2_UNKNOWN
+ FILEOS 0x4L
+ FILETYPE 0x0L
+ FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "000004b0"
BEGIN
- VALUE "Author", "Krzysztof Kral"
- VALUE "CompanyName", "Krzysztof Kral"
VALUE "FileDescription", __DESCRIPTION
- VALUE "FileVersion", __VERSION_STRING
- VALUE "InternalName", __INTERNAL_NAME
+ VALUE "InternalName", __PLUGIN_NAME
VALUE "LegalCopyright", __COPYRIGHT
- VALUE "OriginalFilename", __FILENAME
+ VALUE "OriginalFilename", __FILENAME
VALUE "ProductName", __PLUGIN_NAME
- VALUE "ProductVersion", __VERSION_STRING
END
END
BLOCK "VarFileInfo"
diff --git a/plugins/PasteIt/src/Options.cpp b/plugins/PasteIt/src/Options.cpp
index 5552ac0d6a..6fc6439e40 100644
--- a/plugins/PasteIt/src/Options.cpp
+++ b/plugins/PasteIt/src/Options.cpp
@@ -17,17 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "StdAfx.h"
-#include "Options.h"
-#include "resource.h"
-#include "PasteToWeb.h"
-#include "PasteToWeb1.h"
-
-extern HINSTANCE hInst;
-
-#define MODULE "PasteIt"
Options *Options::instance;
-extern PasteToWeb* pasteToWebs[PasteToWeb::pages];
struct TCpTable {
UINT cpId;
diff --git a/plugins/PasteIt/src/PasteIt.cpp b/plugins/PasteIt/src/PasteIt.cpp
index 2386c96302..37781aee6d 100644
--- a/plugins/PasteIt/src/PasteIt.cpp
+++ b/plugins/PasteIt/src/PasteIt.cpp
@@ -17,18 +17,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "stdafx.h"
-#include "PasteToWeb1.h"
-#include "PasteToWeb2.h"
-#include "version.h"
-#include "resource.h"
-#include "Options.h"
-
PasteToWeb* pasteToWebs[PasteToWeb::pages];
std::map<HANDLE, HWND>* contactWindows;
DWORD gMirandaVersion;
-extern HINSTANCE hInst;
HANDLE hModulesLoaded, hTabsrmmButtonPressed;
HANDLE g_hNetlibUser;
HANDLE hPrebuildContactMenu;
@@ -39,7 +32,6 @@ HANDLE hOptionsInit;
HANDLE hWindowEvent = NULL;
HINSTANCE hInst;
-#define MODULE "PasteIt"
#define FROM_CLIPBOARD 10
#define FROM_FILE 11
#define DEF_PAGES_START 20
@@ -56,7 +48,7 @@ PLUGININFOEX pluginInfo={
__AUTHORWEB,
UNICODE_AWARE,
// {1AAC15E8-DCEC-4050-B66F-2AA0E6120C22}
- { 0x1aac15e8, 0xdcec, 0x4050, { 0xb6, 0x6f, 0x2a, 0xa0, 0xe6, 0x12, 0xc, 0x22 } }
+ {0x1aac15e8, 0xdcec, 0x4050, {0xb6, 0x6f, 0x2a, 0xa0, 0xe6, 0x12, 0xc, 0x22}}
};
static IconItem icon = { LPGEN("Paste It"), "PasteIt_main", IDI_MENU };
diff --git a/plugins/PasteIt/src/PasteToWeb.cpp b/plugins/PasteIt/src/PasteToWeb.cpp
index a7cc9a3b5f..fa251a22f0 100644
--- a/plugins/PasteIt/src/PasteToWeb.cpp
+++ b/plugins/PasteIt/src/PasteToWeb.cpp
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "StdAfx.h"
-#include "PasteToWeb.h"
-#include "Options.h"
-#include "resource.h"
-
-extern HINSTANCE hInst;
PasteToWeb::PasteToWeb()
{
diff --git a/plugins/PasteIt/src/PasteToWeb1.cpp b/plugins/PasteIt/src/PasteToWeb1.cpp
index bbdc2e1ba5..b768a15b25 100644
--- a/plugins/PasteIt/src/PasteToWeb1.cpp
+++ b/plugins/PasteIt/src/PasteToWeb1.cpp
@@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "StdAfx.h"
-#include "PasteToWeb1.h"
-#include "Options.h"
PasteFormat PasteToWeb1::formats[] =
{
diff --git a/plugins/PasteIt/src/PasteToWeb2.cpp b/plugins/PasteIt/src/PasteToWeb2.cpp
index c2edbddeef..b8bc45e331 100644
--- a/plugins/PasteIt/src/PasteToWeb2.cpp
+++ b/plugins/PasteIt/src/PasteToWeb2.cpp
@@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "StdAfx.h"
-#include "PasteToWeb2.h"
PasteFormat PasteToWeb2::defFormats[] =
{
diff --git a/plugins/PasteIt/src/stdafx.h b/plugins/PasteIt/src/stdafx.h
index 2be1eff36d..75006155b0 100644
--- a/plugins/PasteIt/src/stdafx.h
+++ b/plugins/PasteIt/src/stdafx.h
@@ -5,9 +5,8 @@
#pragma once
-#include "targetver.h"
-
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
+
// Windows Header Files:
#include <windows.h>
#include <winsock.h>
@@ -15,28 +14,31 @@
#include <commdlg.h>
#include <windowsx.h>
#include <time.h>
-
-#include <tchar.h>
#include <string>
#include <map>
#include <list>
-#define MIRANDA_VER 0x0A00
-
#include <newpluginapi.h>
#include <m_clist.h>
-#include <m_skin.h>
#include <m_langpack.h>
-#include <m_system.h>
-#include <m_utils.h>
#include <m_netlib.h>
#include <m_xml.h>
#include <m_message.h>
#include <m_protosvc.h>
-#include <m_icolib.h>
#include <m_options.h>
#include <m_database.h>
#include <m_chat.h>
-#include <m_protoint.h>
-#include "m_msg_buttonsbar.h"
+#include <m_msg_buttonsbar.h>
+
+#include "PasteToWeb.h"
+#include "PasteToWeb1.h"
+#include "PasteToWeb2.h"
+#include "version.h"
+#include "resource.h"
+#include "Options.h"
+
+extern HINSTANCE hInst;
+extern PasteToWeb* pasteToWebs[PasteToWeb::pages];
+
+#define MODULE "PasteIt"
diff --git a/plugins/PasteIt/src/targetver.h b/plugins/PasteIt/src/targetver.h
deleted file mode 100644
index 90e767bfce..0000000000
--- a/plugins/PasteIt/src/targetver.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-// Including SDKDDKVer.h defines the highest available Windows platform.
-
-// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
-// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
-
-#include <SDKDDKVer.h>
diff --git a/plugins/PasteIt/src/version.h b/plugins/PasteIt/src/version.h
index 8a06c8b4c7..d449664f18 100644
--- a/plugins/PasteIt/src/version.h
+++ b/plugins/PasteIt/src/version.h
@@ -4,17 +4,11 @@
#define __BUILD_NUM 3
#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 "Paste It"
-#define __INTERNAL_NAME "PasteIt"
+#define __PLUGIN_NAME "Paste it"
#define __FILENAME "PasteIt.dll"
#define __DESCRIPTION "Uploads the text to web page and sends the URL to your friends."
#define __AUTHOR "Krzysztof Kral"
#define __AUTHOREMAIL "programista@poczta.of.pl"
#define __AUTHORWEB "http://miranda-ng.org/"
-#define __COPYRIGHT "Copyright (c) 2011 KrzysztofKral"
+#define __COPYRIGHT "© 2011 KrzysztofKral"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 10:09:02 +0000