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 --- src/modules/options/descbutton.cpp | 7 ++++--- src/modules/options/filter.cpp | 11 ++++++----- src/modules/options/filter.h | 12 ++++++------ src/modules/options/headerbar.cpp | 7 ++++--- src/modules/options/iconheader.cpp | 7 ++++--- src/modules/options/options.cpp | 6 ++++-- 6 files changed, 28 insertions(+), 22 deletions(-) (limited to 'src/modules/options') diff --git a/src/modules/options/descbutton.cpp b/src/modules/options/descbutton.cpp index b9875b1ee6..fe0aba9319 100644 --- a/src/modules/options/descbutton.cpp +++ b/src/modules/options/descbutton.cpp @@ -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-12 Miranda IM, 2012-13 Miranda NG project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-12 Miranda IM project, +Copyright (c) 2007 Artem Shpynov all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/modules/options/filter.cpp b/src/modules/options/filter.cpp index f52598d17b..d9e9f29c33 100644 --- a/src/modules/options/filter.cpp +++ b/src/modules/options/filter.cpp @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-12 Miranda IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -11,7 +12,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. @@ -46,7 +47,7 @@ void ClearFilterStrings() BOOL ContainsFilterString(const PageHash key, TCHAR *data) { CPageKeywords* values = filterStrings[key]; - return (values) ? values->ContainsString(data) : FALSE; + return (values) ? values->ContainsString(data) : FALSE; } void AddTreeViewNodes(HWND hWndDlg, PageHash key, HTREEITEM root) @@ -119,7 +120,7 @@ void AddDialogString(HWND hWndDlg, const PageHash key) } if (lstrcmpi(szClass, _T("combobox")) == 0) { - if (GetWindowStyle(hWndDlg) & CBS_HASSTRINGS) { + if (GetWindowStyle(hWndDlg) & CBS_HASSTRINGS) { int count = ComboBox_GetCount(hWndDlg); for (int i=0; i < count; i++) { title[0] = 0; //safety diff --git a/src/modules/options/filter.h b/src/modules/options/filter.h index df81e247ce..afe04fc50b 100644 --- a/src/modules/options/filter.h +++ b/src/modules/options/filter.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-12 Miranda IM, 2012-13 Miranda NG project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-12 Miranda IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -11,7 +12,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. @@ -70,12 +71,12 @@ public: BOOL ContainsString(TCHAR *data) { for (int i=0; i < _pageKeyWords.getCount(); i++) - if (_tcsstr(_pageKeyWords[i], data)) + if (_tcsstr(_pageKeyWords[i], data)) return TRUE; return FALSE; } static int PageSortFunc(const CPageKeywords* p1, const CPageKeywords* p2) - { + { if (p1->_pageHashKey < p2->_pageHashKey) { return -1; } else if (p1->_pageHashKey > p2->_pageHashKey) { return 1; } return 0; @@ -96,4 +97,3 @@ public: }; #endif //M_OPTIONS_FILTERING_H - diff --git a/src/modules/options/headerbar.cpp b/src/modules/options/headerbar.cpp index f4fdec8745..ee26fde856 100644 --- a/src/modules/options/headerbar.cpp +++ b/src/modules/options/headerbar.cpp @@ -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-12 Miranda IM, 2012-13 Miranda NG project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-12 Miranda IM project, +Copyright (c) 2007 Artem Shpynov all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/modules/options/iconheader.cpp b/src/modules/options/iconheader.cpp index ab23c41d2e..8523481fe2 100644 --- a/src/modules/options/iconheader.cpp +++ b/src/modules/options/iconheader.cpp @@ -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-12 Miranda IM, 2012-13 Miranda NG project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-12 Miranda IM project, +Copyright (c) 2007 Artem Shpynov all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/modules/options/options.cpp b/src/modules/options/options.cpp index 4cd938183f..0239c10aa5 100644 --- a/src/modules/options/options.cpp +++ b/src/modules/options/options.cpp @@ -1,8 +1,10 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-12 Miranda IM project, +Copyright (c) 2007 Artem Shpynov all portions of this codebase are copyrighted to the people listed in contributors.txt. -- cgit v1.2.3