From b93e076795f7998aef8a63f7602998cdc6632a80 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 11 Feb 2013 12:15:06 +0000 Subject: core: copyright update to year 2013 git-svn-id: http://svn.miranda-ng.org/main/trunk@3549 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/utils/bmpfilter.cpp | 7 ++++--- src/modules/utils/colourpicker.cpp | 7 ++++--- src/modules/utils/hyperlink.cpp | 15 ++++++++------- src/modules/utils/imgconv.cpp | 7 ++++--- src/modules/utils/openurl.cpp | 7 ++++--- src/modules/utils/path.cpp | 19 ++++++++++--------- src/modules/utils/resizer.cpp | 7 ++++--- src/modules/utils/timeutils.cpp | 24 ++++++++++++------------ src/modules/utils/timezones.cpp | 10 +++++----- src/modules/utils/utils.cpp | 15 ++++++++------- src/modules/utils/windowlist.cpp | 5 +++-- 11 files changed, 66 insertions(+), 57 deletions(-) (limited to 'src/modules/utils') diff --git a/src/modules/utils/bmpfilter.cpp b/src/modules/utils/bmpfilter.cpp index 442c75996a..2f111f8ae6 100644 --- a/src/modules/utils/bmpfilter.cpp +++ b/src/modules/utils/bmpfilter.cpp @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +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 @@ -11,7 +11,7 @@ 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, +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. @@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h" #include diff --git a/src/modules/utils/colourpicker.cpp b/src/modules/utils/colourpicker.cpp index fccd240660..1b5c4ca55e 100644 --- a/src/modules/utils/colourpicker.cpp +++ b/src/modules/utils/colourpicker.cpp @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +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 @@ -11,7 +11,7 @@ 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, +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. @@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h" static LRESULT CALLBACK ColourPickerWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) diff --git a/src/modules/utils/hyperlink.cpp b/src/modules/utils/hyperlink.cpp index dceff9dd11..ebb24b7c14 100644 --- a/src/modules/utils/hyperlink.cpp +++ b/src/modules/utils/hyperlink.cpp @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +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 @@ -11,7 +11,7 @@ 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, +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. @@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h" struct HyperlinkWndData { @@ -35,7 +36,7 @@ struct HyperlinkWndData { /* internal messages */ #define HLK_MEASURETEXT (WM_USER+1) -#define HLK_INVALIDATE (WM_USER+2) +#define HLK_INVALIDATE (WM_USER+2) static LRESULT CALLBACK HyperlinkWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { @@ -216,7 +217,7 @@ static LRESULT CALLBACK HyperlinkWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPA COLORREF textColor; PAINTSTRUCT ps; HDC hdc; - + hdc = BeginPaint(hwnd, &ps); if (hdc != NULL) { if (IsWindowEnabled(hwnd)) { @@ -246,9 +247,9 @@ static LRESULT CALLBACK HyperlinkWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPA } return 0; } - case WM_NCDESTROY: + case WM_NCDESTROY: if (dat->hEnableFont != NULL) DeleteObject(dat->hEnableFont); - mir_free(dat); + mir_free(dat); break; } return DefWindowProc(hwnd, msg, wParam, lParam); diff --git a/src/modules/utils/imgconv.cpp b/src/modules/utils/imgconv.cpp index 03c39eef1d..5267162025 100644 --- a/src/modules/utils/imgconv.cpp +++ b/src/modules/utils/imgconv.cpp @@ -1,8 +1,8 @@ /* Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2010 Miranda IM project, -all portions of this codebase are copyrighted to the people +Copyright 2010-12 Miranda IM, 2012-13 Miranda NG project, +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 @@ -10,7 +10,7 @@ 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, +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. @@ -19,6 +19,7 @@ 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 "..\..\core\commonheaders.h" typedef DWORD ARGB; diff --git a/src/modules/utils/openurl.cpp b/src/modules/utils/openurl.cpp index ebf462cca4..764169f268 100644 --- a/src/modules/utils/openurl.cpp +++ b/src/modules/utils/openurl.cpp @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +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 @@ -11,7 +11,7 @@ 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, +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. @@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h" #include diff --git a/src/modules/utils/path.cpp b/src/modules/utils/path.cpp index 184dd876f7..8c9cfbc6fe 100644 --- a/src/modules/utils/path.cpp +++ b/src/modules/utils/path.cpp @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +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 @@ -11,7 +11,7 @@ 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, +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. @@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h" #include "../database/profilemanager.h" @@ -32,7 +33,7 @@ static INT_PTR pathToRelative(WPARAM wParam, LPARAM lParam) return PathToRelative((char*)wParam, (char*)lParam); } -static INT_PTR pathToAbsolute(WPARAM wParam, LPARAM lParam) +static INT_PTR pathToAbsolute(WPARAM wParam, LPARAM lParam) { return PathToAbsolute((char*)wParam, (char*)lParam, NULL); } @@ -171,10 +172,10 @@ static __forceinline char *GetPathVarX(char *, int code) switch(code) { case 1: mir_sntprintf(szFullPath, SIZEOF(szFullPath), _T("%s\\%s\\AvatarCache"), g_profileDir, szProfileName); - break; + break; case 2: mir_sntprintf(szFullPath, SIZEOF(szFullPath), _T("%s\\%s\\Logs"), g_profileDir, szProfileName); - break; + break; case 3: mir_sntprintf(szFullPath, SIZEOF(szFullPath), _T("%s\\%s"), g_profileDir, szProfileName); break; @@ -252,10 +253,10 @@ static __forceinline TCHAR *GetPathVarX(TCHAR *, int code) switch(code) { case 1: mir_sntprintf(szFullPath, SIZEOF(szFullPath), _T("%s\\%s\\AvatarCache"), g_profileDir, szProfileName); - break; + break; case 2: mir_sntprintf(szFullPath, SIZEOF(szFullPath), _T("%s\\%s\\Logs"), g_profileDir, szProfileName); - break; + break; case 3: mir_sntprintf(szFullPath, SIZEOF(szFullPath), _T("%s\\%s"), g_profileDir, szProfileName); break; @@ -276,7 +277,7 @@ XCHAR *GetInternalVariable(XCHAR *key, size_t keyLength, HANDLE hContact) theValue = GetContactNickX(key, hContact); else if ( !_xcscmp(theKey, XSTR(key, "proto"))) theValue = mir_a2x(key, GetContactProto(hContact)); - else if ( !_xcscmp(theKey, XSTR(key, "userid"))) + else if ( !_xcscmp(theKey, XSTR(key, "userid"))) theValue = GetContactIDX(key, hContact); } diff --git a/src/modules/utils/resizer.cpp b/src/modules/utils/resizer.cpp index 0f9b0b418f..4834e1ec89 100644 --- a/src/modules/utils/resizer.cpp +++ b/src/modules/utils/resizer.cpp @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +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 @@ -11,7 +11,7 @@ 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, +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. @@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h" typedef struct { diff --git a/src/modules/utils/timeutils.cpp b/src/modules/utils/timeutils.cpp index 8df679d359..a27a65ee52 100644 --- a/src/modules/utils/timeutils.cpp +++ b/src/modules/utils/timeutils.cpp @@ -1,7 +1,7 @@ /* Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2010 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -10,7 +10,7 @@ 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, +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. @@ -47,11 +47,11 @@ void FormatTime(const SYSTEMTIME *st, const TCHAR *szFormat, TCHAR *szDest, int TCHAR *pDest = szDest; int destCharsLeft = cbDest - 1; - for (const TCHAR* pFormat = szFormat; *pFormat; ++pFormat) + for (const TCHAR* pFormat = szFormat; *pFormat; ++pFormat) { DWORD fmt; bool date, iso = false; - switch (*pFormat) + switch (*pFormat) { case 't': fmt = TIME_NOSECONDS; @@ -83,26 +83,26 @@ void FormatTime(const SYSTEMTIME *st, const TCHAR *szFormat, TCHAR *szDest, int break; default: - if (destCharsLeft--) + if (destCharsLeft--) *pDest++=*pFormat; continue; } - + TCHAR dateTimeStr[64]; int dateTimeStrLen; if (iso) { - dateTimeStrLen = mir_sntprintf(dateTimeStr, SIZEOF(dateTimeStr), - _T("%d-%02d-%02dT%02d:%02d:%02dZ"), - st->wYear, st->wMonth, st->wDay, + dateTimeStrLen = mir_sntprintf(dateTimeStr, SIZEOF(dateTimeStr), + _T("%d-%02d-%02dT%02d:%02d:%02dZ"), + st->wYear, st->wMonth, st->wDay, st->wHour, st->wMinute, st->wSecond) + 1; } - else if (date) - dateTimeStrLen = GetDateFormat(LOCALE_USER_DEFAULT, fmt, st, NULL, + else if (date) + dateTimeStrLen = GetDateFormat(LOCALE_USER_DEFAULT, fmt, st, NULL, dateTimeStr, SIZEOF(dateTimeStr)); else - dateTimeStrLen = GetTimeFormat(LOCALE_USER_DEFAULT, fmt, st, NULL, + dateTimeStrLen = GetTimeFormat(LOCALE_USER_DEFAULT, fmt, st, NULL, dateTimeStr, SIZEOF(dateTimeStr)); if (dateTimeStrLen) --dateTimeStrLen; diff --git a/src/modules/utils/timezones.cpp b/src/modules/utils/timezones.cpp index 1f2a4f1306..a22dd4ef26 100644 --- a/src/modules/utils/timezones.cpp +++ b/src/modules/utils/timezones.cpp @@ -1,7 +1,7 @@ /* Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2010 Miranda ICQ/IM project, +Copyright 2010-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -10,7 +10,7 @@ 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, +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. @@ -353,10 +353,10 @@ typedef struct UINT addStr, getSel, setSel, getData, setData; } ListMessages; -static const ListMessages lbMessages = +static const ListMessages lbMessages = { LB_ADDSTRING, LB_GETCURSEL, LB_SETCURSEL, LB_GETITEMDATA, LB_SETITEMDATA }; -static const ListMessages cbMessages = +static const ListMessages cbMessages = { CB_ADDSTRING, CB_GETCURSEL, CB_SETCURSEL, CB_GETITEMDATA, CB_SETITEMDATA }; static const ListMessages *GetListMessages(HWND hWnd, DWORD dwFlags) @@ -557,7 +557,7 @@ extern "C" __declspec(dllexport) void RecalculateTime(void) if ( !found) { - if ( !wcscmp(tz.tzi.StandardName, myInfo.myTZ.tzi.StandardName) || + if ( !wcscmp(tz.tzi.StandardName, myInfo.myTZ.tzi.StandardName) || !wcscmp(tz.tzi.DaylightName, myInfo.myTZ.tzi.DaylightName)) { _tcscpy(myInfo.myTZ.tszName, tz.tszName); diff --git a/src/modules/utils/utils.cpp b/src/modules/utils/utils.cpp index 4f165bbd6c..8739273094 100644 --- a/src/modules/utils/utils.cpp +++ b/src/modules/utils/utils.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -11,7 +11,7 @@ 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, +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. @@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h" #define MS_SYSTEM_GET_MD5I "Miranda/System/GetMD5I" @@ -41,9 +42,9 @@ int InitCrypt(void); static BOOL bModuleInitialized = FALSE; static CountryListEntry countries[] = { - {0, "Unspecified", ""}, - {9999, "Other", ""}, - {0xFFFF, "Unknown", ""}, + {0, "Unspecified", ""}, + {9999, "Other", ""}, + {0xFFFF, "Unknown", ""}, {93, "Afghanistan", "AF"}, {358, "Aland Islands", "AX"}, {355, "Albania", "AL"}, @@ -351,7 +352,7 @@ static INT_PTR AssertInsideScreen(WPARAM wParam, LPARAM lParam) RECT rcScreen; SystemParametersInfo(SPI_GETWORKAREA, 0, &rcScreen, FALSE); - if (MyMonitorFromWindow) + if (MyMonitorFromWindow) { if (MyMonitorFromRect(rc, MONITOR_DEFAULTTONULL)) return 0; @@ -362,7 +363,7 @@ static INT_PTR AssertInsideScreen(WPARAM wParam, LPARAM lParam) if (MyGetMonitorInfo(hMonitor, &mi)) rcScreen = mi.rcWork; } - else + else { RECT rcDest; if (IntersectRect(&rcDest, &rcScreen, rc)) diff --git a/src/modules/utils/windowlist.cpp b/src/modules/utils/windowlist.cpp index 7230ab4a23..4453048f36 100644 --- a/src/modules/utils/windowlist.cpp +++ b/src/modules/utils/windowlist.cpp @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -11,7 +11,7 @@ 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, +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. @@ -20,6 +20,7 @@ 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 "..\..\core\commonheaders.h" static WINDOWLISTENTRY *windowList = NULL; -- cgit v1.2.3