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 /svtools | |
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 'svtools')
-rw-r--r-- | svtools/source/brwbox/brwimpl.hxx | 3 | ||||
-rw-r--r-- | svtools/source/contnr/treelist.cxx | 2 | ||||
-rw-r--r-- | svtools/source/contnr/treelistentry.cxx | 4 | ||||
-rw-r--r-- | svtools/source/control/ctrlbox.cxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/dialogcontrolling.cxx | 3 | ||||
-rw-r--r-- | svtools/source/misc/templatefoldercache.cxx | 14 |
6 files changed, 10 insertions, 18 deletions
diff --git a/svtools/source/brwbox/brwimpl.hxx b/svtools/source/brwbox/brwimpl.hxx index ed1de0cec294..e494a7bd400e 100644 --- a/svtools/source/brwbox/brwimpl.hxx +++ b/svtools/source/brwbox/brwimpl.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/lang/XComponent.hpp> #include <map> -#include <functional> namespace svt { @@ -33,7 +32,7 @@ namespace svt public: typedef ::std::map< sal_Int32, css::uno::Reference< css::accessibility::XAccessible > > THeaderCellMap; - struct THeaderCellMapFunctorDispose : ::std::unary_function<THeaderCellMap::value_type,void> + struct THeaderCellMapFunctorDispose { void operator()(const THeaderCellMap::value_type& _aType) { diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index 76fb434aaa6c..43eaf9aadba1 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -183,7 +183,7 @@ bool SvTreeList::IsChild(const SvTreeListEntry* pParent, const SvTreeListEntry* namespace { -class FindByPointer : public std::unary_function<SvTreeListEntry, bool> +class FindByPointer { const SvTreeListEntry* mpEntry; public: diff --git a/svtools/source/contnr/treelistentry.cxx b/svtools/source/contnr/treelistentry.cxx index dbc04f23c7f7..3e71eceac0f2 100644 --- a/svtools/source/contnr/treelistentry.cxx +++ b/svtools/source/contnr/treelistentry.cxx @@ -165,7 +165,7 @@ SvLBoxItem& SvTreeListEntry::GetItem( size_t nPos ) namespace { -class FindByType : public std::unary_function<SvLBoxItem, void> +class FindByType { SvLBoxItemType meType; public: @@ -176,7 +176,7 @@ public: } }; -class FindByPointer : public std::unary_function<SvLBoxItem, void> +class FindByPointer { const SvLBoxItem* mpItem; public: diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index a02890d5cfbe..ee034242c89a 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -360,7 +360,7 @@ std::vector<double> GetDashing( SvxBorderLineStyle nDashing ) namespace { -class ApplyScale : public std::unary_function<double, void> +class ApplyScale { double mfScale; public: diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx index 8e1c15016da4..4766e3540feb 100644 --- a/svtools/source/misc/dialogcontrolling.cxx +++ b/svtools/source/misc/dialogcontrolling.cxx @@ -21,7 +21,6 @@ #include <vcl/window.hxx> #include <algorithm> -#include <functional> namespace svt @@ -144,7 +143,7 @@ namespace svt namespace { - struct ResetDialogController : public ::std::unary_function< const std::shared_ptr<DialogController>&, void > + struct ResetDialogController { void operator()( const std::shared_ptr<DialogController>& _pController ) { diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index c2a1dee516ad..140a63c0850d 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -172,7 +172,7 @@ namespace svt /// sorts the sib contents of a TemplateFolderContent - struct SubContentSort : public ::std::unary_function< ::rtl::Reference< TemplateContent >, void > + struct SubContentSort { void operator() ( TemplateFolderContent& _rFolder ) const { @@ -254,9 +254,7 @@ namespace svt }; - struct StoreContentURL - :public ::std::unary_function< ::rtl::Reference< TemplateContent >, void > - ,public StorageHelper + struct StoreContentURL : public StorageHelper { uno::Reference< util::XOfficeInstallationDirectories > m_xOfficeInstDirs; @@ -279,9 +277,7 @@ namespace svt /// functor which stores the complete content of a TemplateContent - struct StoreFolderContent - :public ::std::unary_function< ::rtl::Reference< TemplateContent >, void > - ,public StorageHelper + struct StoreFolderContent : public StorageHelper { uno::Reference< util::XOfficeInstallationDirectories > m_xOfficeInstDirs; @@ -327,9 +323,7 @@ namespace svt /// functor which reads a complete TemplateContent instance - struct ReadFolderContent - :public ::std::unary_function< ::rtl::Reference< TemplateContent >, void > - ,public StorageHelper + struct ReadFolderContent : public StorageHelper { uno::Reference< util::XOfficeInstallationDirectories > m_xOfficeInstDirs; |