diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-06-28 21:48:22 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-07-03 12:21:03 +0200 |
| commit | c4ddf6cd6d97e7ce7c2e63e4d393bbeffcb34e4d (patch) | |
| tree | 128225fc91bd7da687f965337a49b9b64fbe8a79 /vcl/source/app | |
| parent | 5034e8217c9844293dc94e5dff0bdc865ad7a91a (diff) | |
C++11 remove std::unary_function bases from functors
std::unary_function is deprecated since C++11 and removed in C++17
90% done with regexp magic.
removed obsolete <functional> includes.
The std::unary_function base class was used in 3 places:
* chart2/source/tools/DataSeriesHelper.cxx: lcl_MatchesRole
is used in a std::not1 function helper who uses the members
return_type and argument_type.
- replace deprecated std::not1 with a lambda
* chart2/source/tools/ModifyListenerHelper.cxx:
lcl_weakReferenceToSame used the argument_type member in the
operator() parameter.
- inline the parameter type.
* xmloff/source/chart/SchXMLExport.cxx: lcl_SequenceToMapElement
used result_type and argument_type in operator().
- inline the types
Also fix compile error with gcc about finding std::for_each.
Change-Id: I073673beb01410c3108e7d0346d9e7d6b9ad2e2f
Reviewed-on: https://gerrit.libreoffice.org/39358
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/source/app')
| -rw-r--r-- | vcl/source/app/IconThemeInfo.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/app/IconThemeScanner.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/app/IconThemeSelector.cxx | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/vcl/source/app/IconThemeInfo.cxx b/vcl/source/app/IconThemeInfo.cxx index 6abae73f4826..9dac8f81b913 100644 --- a/vcl/source/app/IconThemeInfo.cxx +++ b/vcl/source/app/IconThemeInfo.cxx @@ -154,8 +154,7 @@ IconThemeInfo::ThemeIdToDisplayName(const OUString& themeId) namespace { - class SameTheme : - public std::unary_function<const vcl::IconThemeInfo &, bool> + class SameTheme { private: const OUString& m_rThemeId; diff --git a/vcl/source/app/IconThemeScanner.cxx b/vcl/source/app/IconThemeScanner.cxx index 6eca72f41f86..4d45a915d012 100644 --- a/vcl/source/app/IconThemeScanner.cxx +++ b/vcl/source/app/IconThemeScanner.cxx @@ -175,8 +175,7 @@ IconThemeScanner::~IconThemeScanner() namespace { - class SameTheme : - public std::unary_function<const vcl::IconThemeInfo &, bool> + class SameTheme { private: const OUString& m_rThemeId; diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx index 95ee517b6f21..2f976d9cb8c0 100644 --- a/vcl/source/app/IconThemeSelector.cxx +++ b/vcl/source/app/IconThemeSelector.cxx @@ -20,8 +20,7 @@ namespace vcl { namespace { - class SameTheme : - public std::unary_function<const vcl::IconThemeInfo &, bool> + class SameTheme { private: const OUString& m_rThemeId; |