From 44d0f35d4e3d74b9814e9a511b6dc55e9fffebc0 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 1 Aug 2015 21:12:42 +0000 Subject: XSoundNotify: common project git-svn-id: http://svn.miranda-ng.org/main/trunk@14803 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/XSoundNotify/src/Common.h | 49 ----------------------------------- plugins/XSoundNotify/src/dialog.cpp | 2 +- plugins/XSoundNotify/src/options.cpp | 2 +- plugins/XSoundNotify/src/stdafx.cpp | 18 ------------- plugins/XSoundNotify/src/stdafx.cxx | 18 +++++++++++++ plugins/XSoundNotify/src/stdafx.h | 47 +++++++++++++++++++++++++++++++++ plugins/XSoundNotify/src/xsn_main.cpp | 2 +- 7 files changed, 68 insertions(+), 70 deletions(-) delete mode 100644 plugins/XSoundNotify/src/Common.h delete mode 100644 plugins/XSoundNotify/src/stdafx.cpp create mode 100644 plugins/XSoundNotify/src/stdafx.cxx create mode 100644 plugins/XSoundNotify/src/stdafx.h (limited to 'plugins/XSoundNotify/src') diff --git a/plugins/XSoundNotify/src/Common.h b/plugins/XSoundNotify/src/Common.h deleted file mode 100644 index 16a60182fa..0000000000 --- a/plugins/XSoundNotify/src/Common.h +++ /dev/null @@ -1,49 +0,0 @@ -#define _CRT_SECURE_NO_WARNINGS - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "resource.h" -#include "Version.h" - -#define SETTINGSNAME "XSoundNotify" -#define SETTINGSKEY "XSNPlugin_sound" -#define SETTINGSIGNOREKEY "XSNPlugin_ignore" - -struct XSN_Data -{ - MCONTACT hContact; - TCHAR path[MAX_PATH]; - BYTE ignore; - - __forceinline XSN_Data(MCONTACT _aContact, TCHAR *_path, BYTE _ignore) : - hContact(_aContact) - { - _tcsncpy(path, _path, _countof(path)); - ignore = _ignore; - } -}; - -extern LIST XSN_Users; - -extern HINSTANCE hInst; -extern MWindowList hChangeSoundDlgList; -extern BYTE isIgnoreSound, isOwnSound; - -bool IsSuitableProto(PROTOACCOUNT *pa); - -INT OptInit(WPARAM wParam, LPARAM lParam); - -INT_PTR ShowDialog(WPARAM wParam, LPARAM lParam); diff --git a/plugins/XSoundNotify/src/dialog.cpp b/plugins/XSoundNotify/src/dialog.cpp index f893d65aab..142e178c95 100644 --- a/plugins/XSoundNotify/src/dialog.cpp +++ b/plugins/XSoundNotify/src/dialog.cpp @@ -7,7 +7,7 @@ modify it as they wish with no restriction. There is no warranty. */ -#include "Common.h" +#include "stdafx.h" static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { diff --git a/plugins/XSoundNotify/src/options.cpp b/plugins/XSoundNotify/src/options.cpp index 3e528ba273..0df84c1e80 100644 --- a/plugins/XSoundNotify/src/options.cpp +++ b/plugins/XSoundNotify/src/options.cpp @@ -7,7 +7,7 @@ modify it as they wish with no restriction. There is no warranty. */ -#include "Common.h" +#include "stdafx.h" bool IsSuitableProto(PROTOACCOUNT *pa) { diff --git a/plugins/XSoundNotify/src/stdafx.cpp b/plugins/XSoundNotify/src/stdafx.cpp deleted file mode 100644 index c5fe5abaad..0000000000 --- a/plugins/XSoundNotify/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 "common.h" \ No newline at end of file diff --git a/plugins/XSoundNotify/src/stdafx.cxx b/plugins/XSoundNotify/src/stdafx.cxx new file mode 100644 index 0000000000..6fb37564b7 --- /dev/null +++ b/plugins/XSoundNotify/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/XSoundNotify/src/stdafx.h b/plugins/XSoundNotify/src/stdafx.h new file mode 100644 index 0000000000..6e867669ed --- /dev/null +++ b/plugins/XSoundNotify/src/stdafx.h @@ -0,0 +1,47 @@ +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "resource.h" +#include "Version.h" + +#define SETTINGSNAME "XSoundNotify" +#define SETTINGSKEY "XSNPlugin_sound" +#define SETTINGSIGNOREKEY "XSNPlugin_ignore" + +struct XSN_Data +{ + MCONTACT hContact; + TCHAR path[MAX_PATH]; + BYTE ignore; + + __forceinline XSN_Data(MCONTACT _aContact, TCHAR *_path, BYTE _ignore) : + hContact(_aContact) + { + _tcsncpy(path, _path, _countof(path)); + ignore = _ignore; + } +}; + +extern LIST XSN_Users; + +extern HINSTANCE hInst; +extern MWindowList hChangeSoundDlgList; +extern BYTE isIgnoreSound, isOwnSound; + +bool IsSuitableProto(PROTOACCOUNT *pa); + +INT OptInit(WPARAM wParam, LPARAM lParam); + +INT_PTR ShowDialog(WPARAM wParam, LPARAM lParam); diff --git a/plugins/XSoundNotify/src/xsn_main.cpp b/plugins/XSoundNotify/src/xsn_main.cpp index dc23fae00a..baea4559fd 100644 --- a/plugins/XSoundNotify/src/xsn_main.cpp +++ b/plugins/XSoundNotify/src/xsn_main.cpp @@ -7,7 +7,7 @@ modify it as they wish with no restriction. There is no warranty. */ -#include "Common.h" +#include "stdafx.h" HINSTANCE hInst; int hLangpack; -- cgit v1.2.3