From 055d4460e17344248c7364afc5d19deeda39d644 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 1 Jan 2014 12:32:05 +0000 Subject: copyright update for year 2014 git-svn-id: http://svn.miranda-ng.org/main/trunk@7438 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- include/m_addcontact.h | 7 +++--- include/m_avatars.h | 5 +++-- include/m_awaymsg.h | 6 ++--- include/m_button.h | 5 +++-- include/m_button_int.h | 7 +++--- include/m_clc.h | 5 +++-- include/m_clist.h | 5 +++-- include/m_clistint.h | 5 +++-- include/m_clui.h | 6 ++--- include/m_cluiframes.h | 7 ++++-- include/m_contacts.h | 5 +++-- include/m_core.h | 9 ++++---- include/m_crypto.h | 6 ++--- include/m_database.h | 7 +++--- include/m_db_int.h | 2 +- include/m_descbutton.h | 7 +++--- include/m_email.h | 6 ++--- include/m_errors.h | 5 +++-- include/m_extraicons.h | 38 +++++++++++++++++-------------- include/m_file.h | 6 ++--- include/m_findadd.h | 6 ++--- include/m_history.h | 6 ++--- include/m_hotkeys.h | 7 +++--- include/m_icolib.h | 5 +++-- include/m_iconheader.h | 7 +++--- include/m_icq.h | 9 ++++---- include/m_idle.h | 6 ++--- include/m_ignore.h | 6 ++--- include/m_imgsrvc.h | 6 +++-- include/m_jabber.h | 12 +++++----- include/m_json.h | 5 +++-- include/m_langpack.h | 5 +++-- include/m_message.h | 5 +++-- include/m_modernopt.h | 7 +++--- include/m_netlib.h | 5 +++-- include/m_options.h | 5 +++-- include/m_pluginupdater.h | 2 +- include/m_png.h | 7 ++++-- include/m_protocols.h | 5 +++-- include/m_protoint.h | 13 ++++++----- include/m_protomod.h | 5 +++-- include/m_protosvc.h | 7 +++--- include/m_skin.h | 5 +++-- include/m_ssl.h | 5 +++-- include/m_string.h | 57 +++++++++++++++++++++++++++++++++-------------- include/m_system.h | 5 +++-- include/m_system_cpp.h | 7 +++--- include/m_timezones.h | 6 +++-- include/m_url.h | 6 ++--- include/m_userinfo.h | 5 +++-- include/m_utils.h | 5 +++-- include/m_xml.h | 47 +++++++++++++++++++------------------- include/m_xstatus.h | 2 +- include/newpluginapi.h | 7 +++--- include/statusmodes.h | 7 +++--- include/win2k.h | 5 +++-- 56 files changed, 265 insertions(+), 194 deletions(-) (limited to 'include') diff --git a/include/m_addcontact.h b/include/m_addcontact.h index be0e6a40ee..ffba5c2ca2 100644 --- a/include/m_addcontact.h +++ b/include/m_addcontact.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -61,5 +62,3 @@ typedef struct{ #define MS_ADDCONTACT_SHOW "AddContact/Show" #endif // M_ADDCONTACT_H__ - - diff --git a/include/m_avatars.h b/include/m_avatars.h index 4a97194dbd..ce5fd20949 100644 --- a/include/m_avatars.h +++ b/include/m_avatars.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2012 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-12 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_awaymsg.h b/include/m_awaymsg.h index b53ff4f182..83d5cbc9f0 100644 --- a/include/m_awaymsg.h +++ b/include/m_awaymsg.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -45,4 +46,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #endif #endif // M_AWAYMSG_H__ - diff --git a/include/m_button.h b/include/m_button.h index 364915e91e..e0f0afa0b6 100644 --- a/include/m_button.h +++ b/include/m_button.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_button_int.h b/include/m_button_int.h index 9bdd651731..724b72eee6 100644 --- a/include/m_button_int.h +++ b/include/m_button_int.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -51,7 +52,7 @@ struct MButtonCtrl bIsThemed, // themed button bIsSkinned, // skinned button bSendOnDown; // sends BN_CLICKED on WM_LBUTTONDOWN - + pfnPainterFunc fnPainter; // custom button painter IAccPropServices* pAccPropServices; diff --git a/include/m_clc.h b/include/m_clc.h index b7f6bf10f4..ac64caeae4 100644 --- a/include/m_clc.h +++ b/include/m_clc.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_clist.h b/include/m_clist.h index 2636f2881b..a09e85dd28 100644 --- a/include/m_clist.h +++ b/include/m_clist.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_clistint.h b/include/m_clistint.h index 25de86bda3..b0d49e935e 100644 --- a/include/m_clistint.h +++ b/include/m_clistint.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_clui.h b/include/m_clui.h index bbda841f01..07d9f9b5d8 100644 --- a/include/m_clui.h +++ b/include/m_clui.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -157,4 +158,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #endif // M_CLUI_H__ - diff --git a/include/m_cluiframes.h b/include/m_cluiframes.h index 89b36c2f3c..fa82cc4a8b 100644 --- a/include/m_cluiframes.h +++ b/include/m_cluiframes.h @@ -1,6 +1,9 @@ /* -Miranda ICQ: the free icq client for MS Windows -Copyright (C) 2000-2 Richard Hughes, Roland Rabien & Tristan Van de Vreede + +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-02 Richard Hughes, Roland Rabien & Tristan Van de Vreede This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/include/m_contacts.h b/include/m_contacts.h index dd14dfd39d..1e57e90ab2 100644 --- a/include/m_contacts.h +++ b/include/m_contacts.h @@ -1,5 +1,7 @@ /* -Miranda IM + +Miranda NG: the free IM client for Microsoft* Windows* +Copyright (c) 2012-14 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 @@ -110,4 +112,3 @@ typedef struct { #define MS_CONTACT_GETCONTACTINFO "Miranda/Contact/GetContactInfo" #endif // M_CONTACTS_H__ - diff --git a/include/m_core.h b/include/m_core.h index 8902bcd9f9..3491df1b57 100644 --- a/include/m_core.h +++ b/include/m_core.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -143,7 +144,7 @@ hContact was the last contact in the db or hContact was invalid. * DATABASE EVENTS */ -/* +/* Adds a new event to a contact's event list Returns a handle to the newly added event, or NULL on failure Triggers a db/event/added event just before it returns. @@ -192,7 +193,7 @@ Events in a chain are sorted chronologically automatically MIR_CORE_DLL(HANDLE) db_event_first(HANDLE hContact); -/* +/* Retrieves a handle to the first unread event in the chain for hContact Returns the handle, or NULL if hContact is invalid or all its events have been read diff --git a/include/m_crypto.h b/include/m_crypto.h index 32b532f9b1..d4ab864c54 100644 --- a/include/m_crypto.h +++ b/include/m_crypto.h @@ -1,8 +1,8 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2010 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -64,7 +64,7 @@ typedef MICryptoEngine* (__cdecl *pfnCryptoProviderFactory)(void); #define CPF_UNICODE 1 #if defined(_UNICODE) - #define CPF_TCHAR CPF_UNICODE + #define CPF_TCHAR CPF_UNICODE #else #define CPF_TCHAR 0 #endif diff --git a/include/m_database.h b/include/m_database.h index f5a8c1d7da..b8e1e1f558 100644 --- a/include/m_database.h +++ b/include/m_database.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -571,7 +572,7 @@ __inline WORD DBGetContactSettingRangedWord(HANDLE hContact, const char *szModul return (wVal < minValue || wVal > maxValue) ? errorValue : wVal; } -__inline DWORD DBGetContactSettingRangedDword(HANDLE hContact, const char *szModule, const char *szSetting, DWORD errorValue, DWORD minValue, DWORD maxValue) +__inline DWORD DBGetContactSettingRangedDword(HANDLE hContact, const char *szModule, const char *szSetting, DWORD errorValue, DWORD minValue, DWORD maxValue) { DWORD dwVal = db_get_dw(hContact, szModule, szSetting, errorValue); return (dwVal < minValue || dwVal > maxValue) ? errorValue : dwVal; diff --git a/include/m_db_int.h b/include/m_db_int.h index 4adc5212df..5c9c093f7d 100644 --- a/include/m_db_int.h +++ b/include/m_db_int.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2012-13 Miranda NG project, +Copyright 2012-14 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_descbutton.h b/include/m_descbutton.h index bfe11ab53a..34406dcec5 100644 --- a/include/m_descbutton.h +++ b/include/m_descbutton.h @@ -1,9 +1,10 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2007 Artem Shpynov -Copyright 2000-2007 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2007-12 Miranda ICQ/IM project, +Copyright (c) 2007 Artem Shpynov all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_email.h b/include/m_email.h index c19979ed5e..ecbf27cb0c 100644 --- a/include/m_email.h +++ b/include/m_email.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -33,4 +34,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MS_EMAIL_SENDEMAIL "SREMail/SendCommand" #endif // M_EMAIL_H__ - diff --git a/include/m_errors.h b/include/m_errors.h index 86b053ec7d..cf6f198341 100644 --- a/include/m_errors.h +++ b/include/m_errors.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_extraicons.h b/include/m_extraicons.h index add2858e02..f6feb26397 100644 --- a/include/m_extraicons.h +++ b/include/m_extraicons.h @@ -1,21 +1,25 @@ /* - Copyright (C) 2009 Ricardo Pescuma Domenecci - - This is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this file; see the file license.txt. If - not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - */ + +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2009 Ricardo Pescuma Domenecci + +This is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public +License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +This 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 +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with this file; see the file license.txt. If +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. +*/ #ifndef __M_EXTRAICONS_H__ #define __M_EXTRAICONS_H__ diff --git a/include/m_file.h b/include/m_file.h index 7285078a64..98597bb745 100644 --- a/include/m_file.h +++ b/include/m_file.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -66,4 +67,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MS_FILE_GETRECEIVEDFILESFOLDER "SRFile/GetReceivedFilesFolder" #endif // M_FILE_H__ - diff --git a/include/m_findadd.h b/include/m_findadd.h index 9e7d170595..228125c91d 100644 --- a/include/m_findadd.h +++ b/include/m_findadd.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -32,4 +33,3 @@ returns 0 always #define MS_FINDADD_FINDADD "FindAdd/FindAddCommand" #endif // M_FINDADD_H__ - diff --git a/include/m_history.h b/include/m_history.h index dba50b83bc..a0c61f4fb4 100644 --- a/include/m_history.h +++ b/include/m_history.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -31,4 +32,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MS_HISTORY_SHOWCONTACTHISTORY "History/ShowContactHistory" #endif // M_HISTORY_H__ - diff --git a/include/m_hotkeys.h b/include/m_hotkeys.h index d15c14a993..33ebde9817 100644 --- a/include/m_hotkeys.h +++ b/include/m_hotkeys.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -69,7 +70,7 @@ Returns 0 on failure or hotkey atom id on success */ __forceinline INT_PTR Hotkey_Register(HOTKEYDESC *hk) -{ +{ return CallService("CoreHotkeys/Register", (WPARAM)hLangpack, (LPARAM)hk); } diff --git a/include/m_icolib.h b/include/m_icolib.h index dcdb9082ee..4790a6bc10 100644 --- a/include/m_icolib.h +++ b/include/m_icolib.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_iconheader.h b/include/m_iconheader.h index 1cd1199093..a4bf1ff0c4 100644 --- a/include/m_iconheader.h +++ b/include/m_iconheader.h @@ -1,9 +1,10 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2007 Artem Shpynov -Copyright 2000-2007 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-2007 Miranda ICQ/IM project, +Copyright (c) 2007 Artem Shpynov all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_icq.h b/include/m_icq.h index 5478c09e00..3afb3b7b42 100644 --- a/include/m_icq.h +++ b/include/m_icq.h @@ -2,10 +2,11 @@ // ICQ plugin for Miranda Instant Messenger // ________________________________________ // -// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede -// Copyright © 2001-2002 Jon Keating, Richard Hughes -// Copyright © 2002-2004 Martin Öberg, Sam Kothari, Robert Rainwater -// Copyright © 2004-2010 Joe Kucera +// Copyright (c) 2000-01 Richard Hughes, Roland Rabien, Tristan Van de Vreede +// Copyright (c) 2001-02 Jon Keating, Richard Hughes +// Copyright (c) 2002-04 Martin Öberg, Sam Kothari, Robert Rainwater +// Copyright (c) 2004-10 Joe Kucera +// Copyright (c) 2012-14 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 diff --git a/include/m_idle.h b/include/m_idle.h index bdcf0b3c0f..6ff36c7d3b 100644 --- a/include/m_idle.h +++ b/include/m_idle.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2005 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-05 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -71,4 +72,3 @@ typedef struct { #define MS_IDLE_GETIDLEINFO "Miranda/Idle/GetInfo" #endif // M_IDLE_H__ - diff --git a/include/m_ignore.h b/include/m_ignore.h index c20a029502..0c1789a543 100644 --- a/include/m_ignore.h +++ b/include/m_ignore.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -61,4 +62,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #endif // M_IGNORE_H__ - diff --git a/include/m_imgsrvc.h b/include/m_imgsrvc.h index e1627754f3..3857efd78b 100644 --- a/include/m_imgsrvc.h +++ b/include/m_imgsrvc.h @@ -1,7 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2012 Miranda ICQ/IM project, +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-12 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_jabber.h b/include/m_jabber.h index dd1ed23084..4484baa87e 100644 --- a/include/m_jabber.h +++ b/include/m_jabber.h @@ -1,10 +1,12 @@ /* -Jabber Protocol Plugin for Miranda IM -Copyright ( C ) 2002-04 Santithorn Bunchua -Copyright ( C ) 2005-08 George Hazan -Copyright ( C ) 2007 Maxim Mluhov -Copyright ( C ) 2008-09 Dmitriy Chervov +Jabber Protocol Plugin for Miranda NG + +Copyright (c) 2002-04 Santithorn Bunchua +Copyright (c) 2005-08 George Hazan +Copyright (c) 2007 Maxim Mluhov +Copyright (c) 2008-09 Dmitriy Chervov +Copyright (c) 2012-14 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 diff --git a/include/m_json.h b/include/m_json.h index d381ab6f20..bb67088f79 100644 --- a/include/m_json.h +++ b/include/m_json.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_langpack.h b/include/m_langpack.h index 2edede4426..1e83530c4c 100644 --- a/include/m_langpack.h +++ b/include/m_langpack.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2012 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-12 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_message.h b/include/m_message.h index 897f4a5475..3fd5188fce 100644 --- a/include/m_message.h +++ b/include/m_message.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_modernopt.h b/include/m_modernopt.h index 02f2d1cdba..3e6038088c 100644 --- a/include/m_modernopt.h +++ b/include/m_modernopt.h @@ -1,9 +1,10 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2007 Artem Shpynov -Copyright 2000-2007 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (ñ) 2000-10 Miranda ICQ/IM project, +Copyright (c) 2007 Artem Shpynov all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_netlib.h b/include/m_netlib.h index 44b67a7124..d660336581 100644 --- a/include/m_netlib.h +++ b/include/m_netlib.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2012 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-12 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_options.h b/include/m_options.h index a0d3692945..58ccf222cb 100644 --- a/include/m_options.h +++ b/include/m_options.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_pluginupdater.h b/include/m_pluginupdater.h index 58bca0f7b3..24cfe89cb6 100644 --- a/include/m_pluginupdater.h +++ b/include/m_pluginupdater.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2012-13 Miranda NG project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_png.h b/include/m_png.h index b1c4a6976f..8c837f78dc 100644 --- a/include/m_png.h +++ b/include/m_png.h @@ -1,6 +1,9 @@ /* -Plugin of Miranda IM for reading/writing PNG images. -Copyright (c) 2004-5 George Hazan (ghazan@postman.ru) + +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2004-05 George Hazan (ghazan@postman.ru) Portions of this code are gotten from the libpng codebase. Copyright 2000, Willem van Schaik. For conditions of distribution and diff --git a/include/m_protocols.h b/include/m_protocols.h index 0604217424..b34b8d8f50 100644 --- a/include/m_protocols.h +++ b/include/m_protocols.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_protoint.h b/include/m_protoint.h index 255cda85ff..93103629fa 100644 --- a/include/m_protoint.h +++ b/include/m_protoint.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -210,17 +211,17 @@ public: } __forceinline HANDLE CreateProtoEvent(const char *name) - { return ::ProtoCreateHookableEvent(this, name); } + { return ::ProtoCreateHookableEvent(this, name); } typedef int (__cdecl T::*MyEventFunc)(WPARAM, LPARAM); __forceinline void HookProtoEvent(const char *name, MyEventFunc pFunc) - { ::ProtoHookEvent(this, name, (ProtoEventFunc)pFunc); } + { ::ProtoHookEvent(this, name, (ProtoEventFunc)pFunc); } typedef void (__cdecl T::*MyThreadFunc)(void*); __forceinline void ForkThread(MyThreadFunc pFunc, void *param) - { ::ProtoForkThread(this, (ProtoThreadFunc)pFunc, param); } + { ::ProtoForkThread(this, (ProtoThreadFunc)pFunc, param); } HANDLE __forceinline ForkThreadEx(MyThreadFunc pFunc, void *param, UINT *pThreadId) - { return ::ProtoForkThreadEx(this, (ProtoThreadFunc)pFunc, param, pThreadId); } + { return ::ProtoForkThreadEx(this, (ProtoThreadFunc)pFunc, param, pThreadId); } typedef INT_PTR (__cdecl T::*MyServiceFunc)(WPARAM, LPARAM); __forceinline void CreateProtoService(const char *name, MyServiceFunc pFunc) diff --git a/include/m_protomod.h b/include/m_protomod.h index 4f1ef4697d..efa76d729f 100644 --- a/include/m_protomod.h +++ b/include/m_protomod.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_protosvc.h b/include/m_protosvc.h index 2ad9c9d7c7..1d29112910 100644 --- a/include/m_protosvc.h +++ b/include/m_protosvc.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-09 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -740,7 +741,7 @@ Returns the result of db_event_add() #define MS_PROTO_RECVMSG "Proto/RecvMessage" __forceinline INT_PTR Proto_RecvMessage(HANDLE hContact, PROTORECVEVENT *pcre) -{ +{ CCSDATA ccs = { hContact, PSR_MESSAGE, 0, (LPARAM)pcre }; return CallService(MS_PROTO_RECVMSG, 0, (LPARAM)&ccs ); } diff --git a/include/m_skin.h b/include/m_skin.h index 53bf6fc4a4..30833f39b6 100644 --- a/include/m_skin.h +++ b/include/m_skin.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_ssl.h b/include/m_ssl.h index 097847dfd5..53d9b731df 100644 --- a/include/m_ssl.h +++ b/include/m_ssl.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_string.h b/include/m_string.h index 13d77b4331..7551a29ade 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -1,3 +1,26 @@ +/* + +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +all portions of this codebase are copyrighted to the people +listed in contributors.txt. + +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. +*/ + #pragma once #include @@ -49,7 +72,7 @@ struct CMStringData int nDataLength; // Length of currently used data in XCHARs (not including terminating null) int nAllocLength; // Length of allocated data in XCHARs (not including terminating null) long nRefs; // Reference count: negative == locked - + __forceinline void* data() { return (this + 1); } __forceinline void AddRef() { InterlockedIncrement(&nRefs); } __forceinline bool IsLocked() const { return nRefs < 0; } @@ -339,7 +362,7 @@ public: return m_pszData; } - void UnlockBuffer() + void UnlockBuffer() { CMStringData* pData = GetData(); pData->Unlock(); @@ -969,7 +992,7 @@ public: } static void __stdcall ConvertToBaseType(LPWSTR pszDest, int nDestLength, LPCWSTR pszSrc, int nSrcLength = -1) - { + { if (nSrcLength == -1) { nSrcLength=1 + GetBaseTypeLength(pszSrc); } // nLen is in wchar_ts #if _MSC_VER >= 1400 @@ -1040,7 +1063,7 @@ public: { } - static void __stdcall ConvertToAnsi(LPWSTR /*psz*/, size_t) + static void __stdcall ConvertToAnsi(LPWSTR /*psz*/, size_t) { } }; @@ -1108,7 +1131,7 @@ public: CThisSimpleString() { if (nLength > 0) - { + { //Convert ch to the BaseType wchar_t pszCh[2] = { ch , 0 }; int nBaseTypeCharLen = 1; @@ -1124,14 +1147,14 @@ public: PXSTR pszBuffer = this->GetBuffer(nLength*nBaseTypeCharLen); if (nBaseTypeCharLen == 1) { //Optimization for a common case - wide char translates to 1 ansi/wide char. - StringTraits::FloodCharacters(buffBaseTypeChar[0], nLength, pszBuffer); + StringTraits::FloodCharacters(buffBaseTypeChar[0], nLength, pszBuffer); } else { XCHAR* p=pszBuffer; for (int i=0 ; i < nLength ;i++) { for (int j=0 ; j < nBaseTypeCharLen ;++j) - { + { *p=buffBaseTypeChar[j]; ++p; } @@ -1337,7 +1360,7 @@ public: PXSTR pszBuffer = this->GetBuffer(nNewLength); - // move existing bytes down + // move existing bytes down #if _MSC_VER >= 1400 memmove_s(pszBuffer+iIndex+1, (nNewLength-iIndex)*sizeof(XCHAR), pszBuffer+iIndex, (nNewLength-iIndex)*sizeof(XCHAR)); #else @@ -1368,7 +1391,7 @@ public: nNewLength += nInsertLength; PXSTR pszBuffer = this->GetBuffer(nNewLength); - // move existing bytes down + // move existing bytes down #if _MSC_VER >= 1400 memmove_s(pszBuffer+iIndex+nInsertLength, (nNewLength-iIndex-nInsertLength+1)*sizeof(XCHAR), pszBuffer+iIndex, (nNewLength-iIndex-nInsertLength+1)*sizeof(XCHAR)); memcpy_s(pszBuffer+iIndex, nInsertLength*sizeof(XCHAR), psz, nInsertLength*sizeof(XCHAR)); @@ -1469,9 +1492,9 @@ public: while((pszTarget = StringTraits::StringFindString(pszStart, pszOld)) != NULL) { int nBalance = nOldLength-int(pszTarget-pszBuffer+nSourceLen); - memmove_s(pszTarget+nReplacementLen, nBalance*sizeof(XCHAR), + memmove_s(pszTarget+nReplacementLen, nBalance*sizeof(XCHAR), pszTarget+nSourceLen, nBalance*sizeof(XCHAR)); - memcpy_s(pszTarget, nReplacementLen*sizeof(XCHAR), + memcpy_s(pszTarget, nReplacementLen*sizeof(XCHAR), pszNew, nReplacementLen*sizeof(XCHAR)); pszStart = pszTarget+nReplacementLen; pszTarget[nReplacementLen+nBalance] = 0; @@ -1696,7 +1719,7 @@ public: PXSTR pszBuffer = this->GetBuffer(this->GetLength()); psz = pszBuffer+iFirst; int nDataLength = this->GetLength()-iFirst; - memmove_s(pszBuffer, (this->GetLength()+1)*sizeof(XCHAR), + memmove_s(pszBuffer, (this->GetLength()+1)*sizeof(XCHAR), psz, (nDataLength+1)*sizeof(XCHAR)); this->ReleaseBufferSetLength(nDataLength); } @@ -1751,7 +1774,7 @@ public: if (pszLast != NULL) { - // truncate at left-most matching character + // truncate at left-most matching character int iLast = int(pszLast-this->GetString()); this->Truncate(iLast); } @@ -1792,7 +1815,7 @@ public: if (pszLast != NULL) { - // truncate at left-most matching character + // truncate at left-most matching character int iLast = int(pszLast-this->GetString()); this->Truncate(iLast); } @@ -1818,7 +1841,7 @@ public: PXSTR pszBuffer = this->GetBuffer(this->GetLength()); psz = pszBuffer+iFirst; int nDataLength = this->GetLength()-iFirst; - memmove_s(pszBuffer, (this->GetLength()+1)*sizeof(XCHAR), + memmove_s(pszBuffer, (this->GetLength()+1)*sizeof(XCHAR), psz, (nDataLength+1)*sizeof(XCHAR)); this->ReleaseBufferSetLength(nDataLength); } @@ -1848,7 +1871,7 @@ public: PXSTR pszBuffer = this->GetBuffer(this->GetLength()); psz = pszBuffer+iFirst; int nDataLength = this->GetLength()-iFirst; - memmove_s(pszBuffer, (this->GetLength()+1)*sizeof(XCHAR), + memmove_s(pszBuffer, (this->GetLength()+1)*sizeof(XCHAR), psz, (nDataLength+1)*sizeof(XCHAR)); this->ReleaseBufferSetLength(nDataLength); } @@ -1973,7 +1996,7 @@ public: int nCurrentLength = this->GetLength(); int nAppendLength = StringTraits::GetFormattedLength(pszFormat, args); PXSTR pszBuffer = this->GetBuffer(nCurrentLength+nAppendLength); - StringTraits::Format(pszBuffer+nCurrentLength, + StringTraits::Format(pszBuffer+nCurrentLength, nAppendLength+1, pszFormat, args); this->ReleaseBufferSetLength(nCurrentLength+nAppendLength); } diff --git a/include/m_system.h b/include/m_system.h index d55f7fb554..d330108e43 100644 --- a/include/m_system.h +++ b/include/m_system.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_system_cpp.h b/include/m_system_cpp.h index 2775f5220f..e06e0f12df 100644 --- a/include/m_system_cpp.h +++ b/include/m_system_cpp.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -206,7 +207,7 @@ template struct OBJLIST : public LIST __inline int remove(T *p) { int i = getIndex( p ); - if ( i != -1 ) { + if ( i != -1 ) { remove(i); return 1; } diff --git a/include/m_timezones.h b/include/m_timezones.h index e9c103229a..3be1c57602 100644 --- a/include/m_timezones.h +++ b/include/m_timezones.h @@ -1,7 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2010 Miranda ICQ/IM project, +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (ñ) 2000-10 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_url.h b/include/m_url.h index d544839c8a..ec39566b31 100644 --- a/include/m_url.h +++ b/include/m_url.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -32,4 +33,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MS_URL_SENDURL "SRUrl/SendCommand" #endif // M_URL_H__ - diff --git a/include/m_userinfo.h b/include/m_userinfo.h index 81bc9cd4cd..1e865480d8 100644 --- a/include/m_userinfo.h +++ b/include/m_userinfo.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_utils.h b/include/m_utils.h index 17640c6d32..a400842fa3 100644 --- a/include/m_utils.h +++ b/include/m_utils.h @@ -1,9 +1,10 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2012 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-12 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_xml.h b/include/m_xml.h index 06231a75e2..b6895978ab 100644 --- a/include/m_xml.h +++ b/include/m_xml.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -42,27 +43,27 @@ typedef enum /// Enumeration for XML parse errors. typedef enum XMLError { - eXMLErrorNone = 0, - eXMLErrorMissingEndTag, - eXMLErrorNoXMLTagFound, - eXMLErrorEmpty, - eXMLErrorMissingTagName, - eXMLErrorMissingEndTagName, - eXMLErrorUnmatchedEndTag, - eXMLErrorUnmatchedEndClearTag, - eXMLErrorUnexpectedToken, - eXMLErrorNoElements, - eXMLErrorFileNotFound, - eXMLErrorFirstTagNotFound, - eXMLErrorUnknownCharacterEntity, - eXMLErrorCharacterCodeAbove255, - eXMLErrorCharConversionError, - eXMLErrorCannotOpenWriteFile, - eXMLErrorCannotWriteFile, - - eXMLErrorBase64DataSizeIsNotMultipleOf4, - eXMLErrorBase64DecodeIllegalCharacter, - eXMLErrorBase64DecodeTruncatedData, + eXMLErrorNone = 0, + eXMLErrorMissingEndTag, + eXMLErrorNoXMLTagFound, + eXMLErrorEmpty, + eXMLErrorMissingTagName, + eXMLErrorMissingEndTagName, + eXMLErrorUnmatchedEndTag, + eXMLErrorUnmatchedEndClearTag, + eXMLErrorUnexpectedToken, + eXMLErrorNoElements, + eXMLErrorFileNotFound, + eXMLErrorFirstTagNotFound, + eXMLErrorUnknownCharacterEntity, + eXMLErrorCharacterCodeAbove255, + eXMLErrorCharConversionError, + eXMLErrorCannotOpenWriteFile, + eXMLErrorCannotWriteFile, + + eXMLErrorBase64DataSizeIsNotMultipleOf4, + eXMLErrorBase64DecodeIllegalCharacter, + eXMLErrorBase64DecodeTruncatedData, eXMLErrorBase64DecodeBufferTooSmall } XMLError; diff --git a/include/m_xstatus.h b/include/m_xstatus.h index 24011592f6..4d904fcd03 100644 --- a/include/m_xstatus.h +++ b/include/m_xstatus.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2012-13 Miranda NG project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/newpluginapi.h b/include/newpluginapi.h index 8ba459b730..90e4ce1eec 100644 --- a/include/newpluginapi.h +++ b/include/newpluginapi.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -79,7 +80,7 @@ typedef struct _MUUID { #define MIID_SERVICEMODE {0x8a92c026, 0x953a, 0x4f5f, { 0x99, 0x21, 0xf2, 0xc2, 0xdc, 0x19, 0x5e, 0xc5}} -/* Each service mode plugin must implement MS_SERVICEMODE_LAUNCH +/* Each service mode plugin must implement MS_SERVICEMODE_LAUNCH This service might return one of the following values: SERVICE_CONTINUE - load Miranda normally, like there's no service plugins at all SERVICE_ONLYDB - load database and then execute service plugin only diff --git a/include/statusmodes.h b/include/statusmodes.h index 2120f2d979..3c287191bc 100644 --- a/include/statusmodes.h +++ b/include/statusmodes.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -48,5 +49,3 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MAX_STATUS_COUNT (ID_STATUS_OUTTOLUNCH-ID_STATUS_OFFLINE+1) #endif // STATUSMODES_H__ - - diff --git a/include/win2k.h b/include/win2k.h index 00db8cbb09..791e11ada9 100644 --- a/include/win2k.h +++ b/include/win2k.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. -- cgit v1.2.3