reverted unwanted changes

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

5 files changed, 30 insertions, 35 deletions

diff --git a/plugins/PasteIt/res/PasteIt.rc b/plugins/PasteIt/res/PasteIt.rc
index a5847147df..1b70850227 100644
--- a/plugins/PasteIt/res/PasteIt.rc
+++ b/plugins/PasteIt/res/PasteIt.rc
@@ -5,7 +5,7 @@
 //

 // Generated from the TEXTINCLUDE 2 resource.

 //

-#include "winres.h"

+#include "afxres.h"

 

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

 #undef APSTUDIO_READONLY_SYMBOLS

@@ -148,7 +148,7 @@ END
 

 2 TEXTINCLUDE 

 BEGIN

-    "#include ""winres.h""\r\n"

+    "#include ""afxres.h""\r\n"

     "\0"

 END

 

diff --git a/plugins/PasteIt/src/Options.cpp b/plugins/PasteIt/src/Options.cpp
index 9534e3be51..65781ac2f0 100644
--- a/plugins/PasteIt/src/Options.cpp
+++ b/plugins/PasteIt/src/Options.cpp
@@ -1,6 +1,6 @@
 /*

+Paste It plugin

 Copyright (C) 2011 Krzysztof Kral

-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

@@ -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 "stdafx.h"

+#include "StdAfx.h"

 

 Options *Options::instance;

 

@@ -341,7 +341,7 @@ INT_PTR CALLBACK Options::DlgProcOptsPages(HWND hwndDlg, UINT msg, WPARAM wParam
 			OptsLoginData d;

 			if (DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_DLG_PASTEBIN_LOGIN), hwndDlg, DlgProcOptsLogin, (LPARAM)&d) == IDOK)

 			{

-				PastebinCom *web = (PastebinCom*)pasteToWebs[optsPagesData->lastPage];

+				PasteToWeb1 *web = (PasteToWeb1*)pasteToWebs[optsPagesData->lastPage];

 				Edit_SetText(GetDlgItem(hwndDlg, IDC_PASTEBIN_KEY), web->GetUserKey(d.user, d.password).c_str());

 			}

 		}

diff --git a/plugins/PasteIt/src/Options.h b/plugins/PasteIt/src/Options.h
index 2cc136c66d..9e58e44d7f 100644
--- a/plugins/PasteIt/src/Options.h
+++ b/plugins/PasteIt/src/Options.h
@@ -1,6 +1,6 @@
 /*

+Paste It plugin

 Copyright (C) 2011 Krzysztof Kral

-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

@@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.

 */

 

-#ifndef _OPTIONS_H_

-#define _OPTIONS_H_

+#pragma once

+#include "PasteToWeb.h"

 

 class WebOptions

 {

@@ -70,4 +70,3 @@ public:
 	WebOptions* webOptions[PasteToWeb::pages];

 };

 

-#endif //_OPTIONS_H_
\ No newline at end of file
diff --git a/plugins/PasteIt/src/stdafx.h b/plugins/PasteIt/src/stdafx.h
index 9c0ac4aceb..959524e03e 100644
--- a/plugins/PasteIt/src/stdafx.h
+++ b/plugins/PasteIt/src/stdafx.h
@@ -1,6 +1,13 @@
-#ifndef _COMMON_H_

-#define _COMMON_H_

+// stdafx.h : include file for standard system include files,

+// or project specific include files that are used frequently, but

+// are changed infrequently

+//

 

+#pragma once

+

+#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers

+

+// Windows Header Files:

 #include <windows.h>

 #include <winsock.h>

 #include <Shlobj.h>

@@ -21,28 +28,17 @@
 #include <m_options.h>

 #include <m_utils.h>

 #include <m_chat.h>

-#include <m_http.h>

-#include <m_string.h>

 

 #include <m_msg_buttonsbar.h>

 

+#include "PasteToWeb.h"

+#include "PasteToWeb1.h"

+#include "PasteToWeb2.h"

 #include "version.h"

 #include "resource.h"

-

-#include "http_request.h"

-#include "paste_to_web.h"

-#include "pastebin_com.h"

-#include "wklej_to.h"

-#include "privnote_com.h"

-

-#include "options.h"

+#include "Options.h"

 

 extern HINSTANCE hInst;

-extern HANDLE g_hNetlibUser;

 extern PasteToWeb* pasteToWebs[PasteToWeb::pages];

 

 #define MODULE				"PasteIt"

-

-#include "..\..\..\miranda-private-keys\PasteIt\pastebin.h"

-

-#endif //_COMMON_H_
\ No newline at end of file
diff --git a/plugins/PasteIt/src/version.h b/plugins/PasteIt/src/version.h
index 0dcac19bb7..782bf851a2 100644
--- a/plugins/PasteIt/src/version.h
+++ b/plugins/PasteIt/src/version.h
@@ -1,14 +1,14 @@
 #define __MAJOR_VERSION            1

 #define __MINOR_VERSION            0

-#define __RELEASE_NUM              0

-#define __BUILD_NUM                3

+#define __RELEASE_NUM            0

+#define __BUILD_NUM               3

 

 #include <stdver.h>

 

-#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, Miranda NG team"

-#define __AUTHOREMAIL              "programista@poczta.of.pl"

-#define __AUTHORWEB                "http://miranda-ng.org/p/PasteIt/"

-#define __COPYRIGHT                "© 2011 KrzysztofKral, © 2012-15 Miranda NG project"

+#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/p/PasteIt/"

+#define __COPYRIGHT               "© 2011 KrzysztofKral"