From 7a65cbd15d4f808f973d782deea2a5e1a02accd6 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 17 Jul 2012 12:51:21 +0000 Subject: obsolete heaader file, m_plugins.h, removed git-svn-id: http://svn.miranda-ng.org/main/trunk@1005 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/AVS/src/commonheaders.h | 1 - plugins/AssocMgr/src/common.h | 1 - plugins/AutoShutdown/src/common.h | 1 - plugins/Clist_classic/src/commonheaders.h | 1 - .../Clist_modern/src/hdr/modern_commonheaders.h | 1 - plugins/Clist_mw/src/commonheaders.h | 1 - plugins/Clist_nicer/SRC/Include/commonheaders.h | 1 - plugins/Clist_nicer/skineditor/src/commonheaders.h | 1 - plugins/CryptoPP/commonheaders.h | 1 - plugins/Db3x/src/commonheaders.h | 1 - plugins/Db3x_mmap/commonheaders.h | 1 - plugins/Db_autobackups/headers.h | 1 - plugins/Dbx_mmap_SA/commonheaders.h | 1 - plugins/Dbx_tree/Interface.h | 1 - plugins/ModernOpt/commonheaders.h | 1 - plugins/NewAwaySysMod/Common.h | 1 - plugins/NewXstatusNotify/common.h | 1 - plugins/Popup/src/headers.h | 1 - plugins/QuickMessages/quickmessages.h | 1 - plugins/SecureIM/commonheaders.h | 1 - plugins/Utils/templates.cpp | 23 ++++++++++------------ plugins/helpers/commonheaders.h | 1 - plugins/mTextControl/src/headers.h | 1 - 23 files changed, 10 insertions(+), 35 deletions(-) (limited to 'plugins') diff --git a/plugins/AVS/src/commonheaders.h b/plugins/AVS/src/commonheaders.h index 88e01d1f12..26986e89a6 100644 --- a/plugins/AVS/src/commonheaders.h +++ b/plugins/AVS/src/commonheaders.h @@ -44,7 +44,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -#include #include #include #include diff --git a/plugins/AssocMgr/src/common.h b/plugins/AssocMgr/src/common.h index 9f6c0b7505..2bdfe841cb 100644 --- a/plugins/AssocMgr/src/common.h +++ b/plugins/AssocMgr/src/common.h @@ -41,7 +41,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -#include #include #include #include diff --git a/plugins/AutoShutdown/src/common.h b/plugins/AutoShutdown/src/common.h index d0ee925bdc..2c79be9fb5 100644 --- a/plugins/AutoShutdown/src/common.h +++ b/plugins/AutoShutdown/src/common.h @@ -51,7 +51,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -#include #include #include #include diff --git a/plugins/Clist_classic/src/commonheaders.h b/plugins/Clist_classic/src/commonheaders.h index d046660d0c..11522da792 100644 --- a/plugins/Clist_classic/src/commonheaders.h +++ b/plugins/Clist_classic/src/commonheaders.h @@ -45,7 +45,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -#include #include #include #include diff --git a/plugins/Clist_modern/src/hdr/modern_commonheaders.h b/plugins/Clist_modern/src/hdr/modern_commonheaders.h index 738b402ec2..2bacaba3b6 100644 --- a/plugins/Clist_modern/src/hdr/modern_commonheaders.h +++ b/plugins/Clist_modern/src/hdr/modern_commonheaders.h @@ -102,7 +102,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -#include #include #include #include diff --git a/plugins/Clist_mw/src/commonheaders.h b/plugins/Clist_mw/src/commonheaders.h index 61af060b38..1e6bccf2b0 100644 --- a/plugins/Clist_mw/src/commonheaders.h +++ b/plugins/Clist_mw/src/commonheaders.h @@ -56,7 +56,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -#include #include "m_genmenu.h" #include "m_clui.h" diff --git a/plugins/Clist_nicer/SRC/Include/commonheaders.h b/plugins/Clist_nicer/SRC/Include/commonheaders.h index 91de256f0a..9d2c14f304 100644 --- a/plugins/Clist_nicer/SRC/Include/commonheaders.h +++ b/plugins/Clist_nicer/SRC/Include/commonheaders.h @@ -63,7 +63,6 @@ #include #include #include -#include #include #include #include diff --git a/plugins/Clist_nicer/skineditor/src/commonheaders.h b/plugins/Clist_nicer/skineditor/src/commonheaders.h index 1d6d88b245..3692962393 100644 --- a/plugins/Clist_nicer/skineditor/src/commonheaders.h +++ b/plugins/Clist_nicer/skineditor/src/commonheaders.h @@ -41,7 +41,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -#include #include #include #include diff --git a/plugins/CryptoPP/commonheaders.h b/plugins/CryptoPP/commonheaders.h index 4e94917d78..a7ac221f5e 100644 --- a/plugins/CryptoPP/commonheaders.h +++ b/plugins/CryptoPP/commonheaders.h @@ -45,7 +45,6 @@ // Miranda API #include #include -#include #include #include #include diff --git a/plugins/Db3x/src/commonheaders.h b/plugins/Db3x/src/commonheaders.h index 415bb7448d..cf4b2d4985 100644 --- a/plugins/Db3x/src/commonheaders.h +++ b/plugins/Db3x/src/commonheaders.h @@ -42,7 +42,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include -#include #include #include #include diff --git a/plugins/Db3x_mmap/commonheaders.h b/plugins/Db3x_mmap/commonheaders.h index 0d319af5a3..dd796f9b48 100644 --- a/plugins/Db3x_mmap/commonheaders.h +++ b/plugins/Db3x_mmap/commonheaders.h @@ -43,7 +43,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include -#include #include #include #include diff --git a/plugins/Db_autobackups/headers.h b/plugins/Db_autobackups/headers.h index 93cc6fbc73..eab2ffc667 100644 --- a/plugins/Db_autobackups/headers.h +++ b/plugins/Db_autobackups/headers.h @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include diff --git a/plugins/Dbx_mmap_SA/commonheaders.h b/plugins/Dbx_mmap_SA/commonheaders.h index b4c913a694..cfa7ff2d2e 100644 --- a/plugins/Dbx_mmap_SA/commonheaders.h +++ b/plugins/Dbx_mmap_SA/commonheaders.h @@ -45,7 +45,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. //miranda headers #include #include -#include #include #include #include diff --git a/plugins/Dbx_tree/Interface.h b/plugins/Dbx_tree/Interface.h index dac5894b7d..0f2093d3a4 100644 --- a/plugins/Dbx_tree/Interface.h +++ b/plugins/Dbx_tree/Interface.h @@ -27,7 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MIRANDA_VER 0x0A00 #include #include "newpluginapi.h" -#include "m_plugins.h" #include "m_system.h" #include "m_utils.h" #include "win2k.h" diff --git a/plugins/ModernOpt/commonheaders.h b/plugins/ModernOpt/commonheaders.h index d2d5ed8b86..2d133a802e 100644 --- a/plugins/ModernOpt/commonheaders.h +++ b/plugins/ModernOpt/commonheaders.h @@ -61,7 +61,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -#include #include #include #include diff --git a/plugins/NewAwaySysMod/Common.h b/plugins/NewAwaySysMod/Common.h index 5d687492fa..808347598b 100644 --- a/plugins/NewAwaySysMod/Common.h +++ b/plugins/NewAwaySysMod/Common.h @@ -48,7 +48,6 @@ #include "m_options.h" #include "..\..\protocols\IcqOscarJ\icq_constants.h" #include "m_skin.h" -#include "m_plugins.h" #include "m_awaymsg.h" #include "m_utils.h" #include "m_system_cpp.h" diff --git a/plugins/NewXstatusNotify/common.h b/plugins/NewXstatusNotify/common.h index 3c805ad8c3..3cc765af4d 100644 --- a/plugins/NewXstatusNotify/common.h +++ b/plugins/NewXstatusNotify/common.h @@ -61,7 +61,6 @@ #include "m_langpack.h" #include "m_message.h" #include "m_options.h" -#include "m_plugins.h" #include "m_popup.h" #include "m_protosvc.h" #include "m_skin.h" diff --git a/plugins/Popup/src/headers.h b/plugins/Popup/src/headers.h index 09f505504b..3b892576b9 100644 --- a/plugins/Popup/src/headers.h +++ b/plugins/Popup/src/headers.h @@ -95,7 +95,6 @@ Last change by : $Author: Merlin_de $ #include #include #include - #include #include #include #include diff --git a/plugins/QuickMessages/quickmessages.h b/plugins/QuickMessages/quickmessages.h index 1e9a3d9761..f236b4175f 100644 --- a/plugins/QuickMessages/quickmessages.h +++ b/plugins/QuickMessages/quickmessages.h @@ -27,7 +27,6 @@ along with this program. If not, see . #include #define MIRANDA_VER 0x0A00 -#include "m_plugins.h" #include "newpluginapi.h" #include "m_utils.h" #include "m_system.h" diff --git a/plugins/SecureIM/commonheaders.h b/plugins/SecureIM/commonheaders.h index cc12efdaa0..c848d43484 100644 --- a/plugins/SecureIM/commonheaders.h +++ b/plugins/SecureIM/commonheaders.h @@ -75,7 +75,6 @@ // Miranda API #include "newpluginapi.h" #include "m_stdhdr.h" -#include "m_plugins.h" #include "m_system.h" #include "m_database.h" #include "m_protomod.h" diff --git a/plugins/Utils/templates.cpp b/plugins/Utils/templates.cpp index 11a81d856e..0fbb4715f8 100644 --- a/plugins/Utils/templates.cpp +++ b/plugins/Utils/templates.cpp @@ -10,7 +10,6 @@ extern "C" #include #include #include -#include #include #include #include @@ -88,14 +87,14 @@ int CopyData(StringHelper *str, const char *text, size_t len) memmove(&str->text[str->used], text, sizeof(char) * len); str->used += len; str->text[str->used] = '\0'; - + return 0; } -char * ParseText(const char *text, - const char **variables, size_t variablesSize, - const char **data, size_t dataSize) +char * ParseText(const char *text, + const char **variables, size_t variablesSize, + const char **data, size_t dataSize) { size_t length = strlen(text); size_t nextPos = 0; @@ -211,14 +210,14 @@ int CopyDataW(StringHelperW *str, const WCHAR *text, size_t len) memmove(&str->text[str->used], text, sizeof(WCHAR) * len); str->used += len; str->text[str->used] = '\0'; - + return 0; } -WCHAR * ParseTextW(const WCHAR *text, - const WCHAR **variables, size_t variablesSize, - const WCHAR **data, size_t dataSize) +WCHAR * ParseTextW(const WCHAR *text, + const WCHAR **variables, size_t variablesSize, + const WCHAR **data, size_t dataSize) { size_t length = lstrlenW(text); size_t nextPos = 0; @@ -356,13 +355,13 @@ WCHAR *MNotifyGetWParsedTemplate(HANDLE notifyORtype, const char *name, const WC BOOL MNotifyHasVariables(HANDLE notifyORtype) { - return MNotifyGetDWord(notifyORtype, NFOPT_VARIABLES_STRS, NULL) != NULL && + return MNotifyGetDWord(notifyORtype, NFOPT_VARIABLES_STRS, NULL) != NULL && MNotifyGetDWord(notifyORtype, NFOPT_VARIABLES_SIZE, 0) != 0; } BOOL MNotifyHasWVariables(HANDLE notifyORtype) { - return MNotifyGetDWord(notifyORtype, NFOPT_VARIABLES_STRSW, NULL) != NULL && + return MNotifyGetDWord(notifyORtype, NFOPT_VARIABLES_STRSW, NULL) != NULL && MNotifyGetDWord(notifyORtype, NFOPT_VARIABLES_SIZE, 0) != 0; } @@ -472,5 +471,3 @@ void MNotifyShowWVariables(HANDLE notifyORtype) mir_free(ret.text); } - - diff --git a/plugins/helpers/commonheaders.h b/plugins/helpers/commonheaders.h index 354d719864..a7ee53e754 100644 --- a/plugins/helpers/commonheaders.h +++ b/plugins/helpers/commonheaders.h @@ -48,7 +48,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -#include #include #include #include diff --git a/plugins/mTextControl/src/headers.h b/plugins/mTextControl/src/headers.h index e1a1388afc..aaa25dfd07 100644 --- a/plugins/mTextControl/src/headers.h +++ b/plugins/mTextControl/src/headers.h @@ -47,7 +47,6 @@ extern "C" { #include #include #include - #include #include #include #include -- cgit v1.2.3