From e7c68ba44e35f115654f6f082565ee5ddf2b51c6 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Mon, 27 Apr 2015 20:56:43 +0000 Subject: CyrTranslit - unified project git-svn-id: http://svn.miranda-ng.org/main/trunk@13209 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/CyrTranslit/src/MirandaContact.cpp | 6 ++-- plugins/CyrTranslit/src/MirandaContact.h | 2 +- plugins/CyrTranslit/src/TransliterationMap.cpp | 2 +- plugins/CyrTranslit/src/TransliterationMap.h | 2 +- .../CyrTranslit/src/TransliterationProtocol.cpp | 8 ++--- plugins/CyrTranslit/src/TransliterationProtocol.h | 2 +- plugins/CyrTranslit/src/main.cpp | 6 ++-- plugins/CyrTranslit/src/plugin.h | 34 ---------------------- plugins/CyrTranslit/src/stdafx.cpp | 18 ------------ plugins/CyrTranslit/src/stdafx.cxx | 18 ++++++++++++ plugins/CyrTranslit/src/stdafx.h | 32 ++++++++++++++++++++ 11 files changed, 64 insertions(+), 66 deletions(-) delete mode 100644 plugins/CyrTranslit/src/plugin.h delete mode 100644 plugins/CyrTranslit/src/stdafx.cpp create mode 100644 plugins/CyrTranslit/src/stdafx.cxx create mode 100644 plugins/CyrTranslit/src/stdafx.h (limited to 'plugins/CyrTranslit/src') diff --git a/plugins/CyrTranslit/src/MirandaContact.cpp b/plugins/CyrTranslit/src/MirandaContact.cpp index 3114a0b4e2..80baac3387 100644 --- a/plugins/CyrTranslit/src/MirandaContact.cpp +++ b/plugins/CyrTranslit/src/MirandaContact.cpp @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "plugin.h" +#include "stdafx.h" namespace CyrTranslit { @@ -78,7 +78,7 @@ void MirandaContact::addMenuItem() //------------------------------------------------------------------------------ -INT_PTR MirandaContact::onMenuCommandTransliterate(WPARAM wParam, LPARAM lParam) +INT_PTR MirandaContact::onMenuCommandTransliterate(WPARAM wParam, LPARAM) { MCONTACT hContact = MCONTACT(wParam); if (!CallService(MS_DB_CONTACT_IS, wParam, 0)) @@ -90,7 +90,7 @@ INT_PTR MirandaContact::onMenuCommandTransliterate(WPARAM wParam, LPARAM lParam) //------------------------------------------------------------------------------ -int MirandaContact::onPreBuildContactMenu(WPARAM wParam, LPARAM lParam) +int MirandaContact::onPreBuildContactMenu(WPARAM wParam, LPARAM) { if (!hTransliterateCmdMenuItem) return 0; MCONTACT hContact = MCONTACT(wParam); diff --git a/plugins/CyrTranslit/src/MirandaContact.h b/plugins/CyrTranslit/src/MirandaContact.h index c963ae6c3a..4760d8f836 100644 --- a/plugins/CyrTranslit/src/MirandaContact.h +++ b/plugins/CyrTranslit/src/MirandaContact.h @@ -19,7 +19,7 @@ #pragma once -#include "plugin.h" +#include "stdafx.h" namespace CyrTranslit { diff --git a/plugins/CyrTranslit/src/TransliterationMap.cpp b/plugins/CyrTranslit/src/TransliterationMap.cpp index 99919a5960..f9ac320f44 100644 --- a/plugins/CyrTranslit/src/TransliterationMap.cpp +++ b/plugins/CyrTranslit/src/TransliterationMap.cpp @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "plugin.h" +#include "stdafx.h" namespace CyrTranslit { diff --git a/plugins/CyrTranslit/src/TransliterationMap.h b/plugins/CyrTranslit/src/TransliterationMap.h index 596e9d3e8f..960cb6ceac 100644 --- a/plugins/CyrTranslit/src/TransliterationMap.h +++ b/plugins/CyrTranslit/src/TransliterationMap.h @@ -19,7 +19,7 @@ #pragma once -#include "plugin.h" +#include "stdafx.h" namespace CyrTranslit { diff --git a/plugins/CyrTranslit/src/TransliterationProtocol.cpp b/plugins/CyrTranslit/src/TransliterationProtocol.cpp index dc75e17dbf..c4d6649f2c 100644 --- a/plugins/CyrTranslit/src/TransliterationProtocol.cpp +++ b/plugins/CyrTranslit/src/TransliterationProtocol.cpp @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "plugin.h" +#include "stdafx.h" namespace CyrTranslit { @@ -37,7 +37,7 @@ void TransliterationProtocol::initialize() } //------------------------------------------------------------------------------ -void TransliterationProtocol::TranslateMessageUTF(WPARAM wParam, LPARAM lParam) +void TransliterationProtocol::TranslateMessageUTF(WPARAM, LPARAM lParam) { CCSDATA *ccs = reinterpret_cast(lParam); @@ -55,7 +55,7 @@ void TransliterationProtocol::TranslateMessageUTF(WPARAM wParam, LPARAM lParam) strcpy(reinterpret_cast(ccs->lParam), txtUTF.c_str()); } -void TransliterationProtocol::TranslateMessageW(WPARAM wParam, LPARAM lParam) +void TransliterationProtocol::TranslateMessageW(WPARAM, LPARAM lParam) { CCSDATA *ccs = reinterpret_cast(lParam); @@ -75,7 +75,7 @@ void TransliterationProtocol::TranslateMessageW(WPARAM wParam, LPARAM lParam) wcscpy(reinterpret_cast(ccs->lParam + txtAlen), txtW.c_str()); } -void TransliterationProtocol::TranslateMessageA(WPARAM wParam, LPARAM lParam) +void TransliterationProtocol::TranslateMessageA(WPARAM, LPARAM lParam) { CCSDATA *ccs = reinterpret_cast(lParam); diff --git a/plugins/CyrTranslit/src/TransliterationProtocol.h b/plugins/CyrTranslit/src/TransliterationProtocol.h index 2f746a64b8..08cb715447 100644 --- a/plugins/CyrTranslit/src/TransliterationProtocol.h +++ b/plugins/CyrTranslit/src/TransliterationProtocol.h @@ -19,7 +19,7 @@ #pragma once -#include "plugin.h" +#include "stdafx.h" namespace CyrTranslit { diff --git a/plugins/CyrTranslit/src/main.cpp b/plugins/CyrTranslit/src/main.cpp index 589d406e0f..5f8b499f08 100644 --- a/plugins/CyrTranslit/src/main.cpp +++ b/plugins/CyrTranslit/src/main.cpp @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "plugin.h" +#include "stdafx.h" HINSTANCE hInst; int hLangpack = 0; @@ -37,7 +37,7 @@ PLUGININFOEX pluginInfoEx={ //------------------------------------------------------------------------------ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) { hInst = hinstDLL; return TRUE; @@ -45,7 +45,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) //------------------------------------------------------------------------------ -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { return &pluginInfoEx; } diff --git a/plugins/CyrTranslit/src/plugin.h b/plugins/CyrTranslit/src/plugin.h deleted file mode 100644 index f6503b8140..0000000000 --- a/plugins/CyrTranslit/src/plugin.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Plugin.H: Main common header of MirandaIM plugin - * Copyright 2009 Valeriy V. Vyshnyak. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#define _CRT_SECURE_NO_WARNINGS - -#include -#include - -#include -#include -#include -#include -#include - -#include "version.h" -#include "MirandaContact.h" -#include "TransliterationMap.h" -#include "TransliterationProtocol.h" diff --git a/plugins/CyrTranslit/src/stdafx.cpp b/plugins/CyrTranslit/src/stdafx.cpp deleted file mode 100644 index eca86509fa..0000000000 --- a/plugins/CyrTranslit/src/stdafx.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* -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 -as published by the Free Software Foundation version 2 -of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#include "plugin.h" \ No newline at end of file diff --git a/plugins/CyrTranslit/src/stdafx.cxx b/plugins/CyrTranslit/src/stdafx.cxx new file mode 100644 index 0000000000..6fb37564b7 --- /dev/null +++ b/plugins/CyrTranslit/src/stdafx.cxx @@ -0,0 +1,18 @@ +/* +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 +as published by the Free Software Foundation version 2 +of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include "stdafx.h" \ No newline at end of file diff --git a/plugins/CyrTranslit/src/stdafx.h b/plugins/CyrTranslit/src/stdafx.h new file mode 100644 index 0000000000..40f1692b52 --- /dev/null +++ b/plugins/CyrTranslit/src/stdafx.h @@ -0,0 +1,32 @@ +/** + * Plugin.H: Main common header of MirandaIM plugin + * Copyright 2009 Valeriy V. Vyshnyak. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include +#include + +#include +#include +#include +#include +#include + +#include "version.h" +#include "MirandaContact.h" +#include "TransliterationMap.h" +#include "TransliterationProtocol.h" -- cgit v1.2.3