o3tl: rename compat_functional header

After the cleanup, the stuff there really stands on its own (and the remaining usage of select1st/2nd is more descriptive than lambdas). Change-Id: I0aba131d5dc550189f8130d167dc94167e404540 Reviewed-on: https://gerrit.libreoffice.org/17806 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2015-08-17 14:40:17 +02:00 · 2015-08-17 14:40:17 +02:00 · ad1f0d1f1a
commit ad1f0d1f1a
parent 9c4d75bea5
25 changed files with 26 additions and 26 deletions
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@ -112,7 +112,7 @@
 #include <framework/documentundoguard.hxx>
 #include <initializer_list>
 #include <map>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <osl/diagnose.h>
 #include <osl/file.hxx>
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@ -39,7 +39,7 @@
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/script/XScriptEventsSupplier.hpp>
 #include <com/sun/star/table/CellAddress.hpp>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
 #include <unotools/sharedunocomponent.hxx>
 #include <vcl/svapp.hxx>

--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@ -38,7 +38,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/mutex.hxx>
 #include <osl/process.h>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>

 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@ -48,7 +48,7 @@
 #include <vcl/window.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/settings.hxx>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>

 #include <algorithm>

--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@ -66,7 +66,7 @@
 #include <vector>
 #include <algorithm>
 #include <functional>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>

 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart;
--- a/chart2/source/inc/ContainerHelper.hxx
+++ b/chart2/source/inc/ContainerHelper.hxx
@ -25,7 +25,7 @@

 #include <algorithm>
 #include <functional>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>

 namespace chart
 {
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@ -45,7 +45,7 @@
 #include <algorithm>
 #include <iterator>
 #include <functional>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>

 using namespace ::com::sun::star;

--- a/connectivity/source/commontools/TSortIndex.cxx
+++ b/connectivity/source/commontools/TSortIndex.cxx
@ -20,7 +20,7 @@
 #include "TSortIndex.hxx"
 #include <algorithm>
 #include <iterator>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>

 using namespace connectivity;

--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@ -37,7 +37,7 @@
 #include <unotools/sharedunocomponent.hxx>
 #include "TConnection.hxx"

-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>

 #include <iterator>
 #include <set>
--- a/dbaccess/source/core/dataaccess/documentevents.cxx
+++ b/dbaccess/source/core/dataaccess/documentevents.cxx
@ -26,7 +26,7 @@

 #include <algorithm>
 #include <functional>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>

 namespace dbaccess
 {
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@ -58,7 +58,7 @@
 #include <com/sun/star/util/XModifiable.hpp>
 #include <rtl/ustring.hxx>
 #include <algorithm>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
 #include <boost/scoped_ptr.hpp>
 #include <cppuhelper/implbase1.hxx>
 #include <limits>
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@ -70,7 +70,7 @@

 #include <algorithm>
 #include <functional>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>

 namespace dbaui
 {
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@ -34,7 +34,7 @@

 #include <functional>
 #include <algorithm>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>

 namespace pcr
 {
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@ -68,7 +68,7 @@

 #include <map>
 #include <algorithm>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>

 extern "C" void SAL_CALL createRegistryInfo_EventHandler()
 {
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@ -41,7 +41,7 @@
 #include <tools/debug.hxx>

 #include <algorithm>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>

 extern "C" void SAL_CALL createRegistryInfo_GenericPropertyHandler()
 {
--- a/forms/inc/pch/precompiled_frm.hxx
+++ b/forms/inc/pch/precompiled_frm.hxx
@ -282,7 +282,7 @@
 #include <limits>
 #include <list>
 #include <memory>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
 #include <ooo/vba/XVBAToOOEventDescGen.hpp>
 #include <osl/diagnose.h>
 #include <osl/file.hxx>
--- a/forms/source/xforms/convert.cxx
+++ b/forms/source/xforms/convert.cxx
@ -23,7 +23,7 @@
 #include "unohelper.hxx"
 #include <algorithm>
 #include <functional>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
 #include <rtl/math.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
--- a/forms/source/xforms/datatyperepository.cxx
+++ b/forms/source/xforms/datatyperepository.cxx
@ -29,7 +29,7 @@

 #include <functional>
 #include <algorithm>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>

 namespace xforms
 {
--- a/include/o3tl/compat_functional.hxx
+++ b/include/o3tl/compat_functional.hxx
--- a/o3tl/README
+++ b/o3tl/README
@ -24,6 +24,7 @@ Represents a range of integer or iterator values.
 [git:o3tl/inc/o3tl/vector_pool.hxx]
 Simple vector-based memory pool allocator.

-[git:o3tl/inc/o3tl/compat_functional.hxx]
-Some more templates. Contains also templates from STLport's functional header that are not part of the
-C++ standard (STLport has been replaced by direct use of the C++ STL in LibreOffice).
+[git:o3tl/inc/o3tl/functional.hxx]
+Some more templates, leftovers in spirit of STLport's old functional
+header that are not part of the C++ standard (STLport has been
+replaced by direct use of the C++ STL in LibreOffice).
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@ -103,7 +103,7 @@
 #include "dlgpage.hxx"
 #include "helpids.hrc"
 #include <toolkit/helper/convert.hxx>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>

 #define DATA_OR_FORMULA     0
 #define FUNCTION            1
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@ -472,7 +472,7 @@
 #include <memory>
 #include <new>
 #include <numeric>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <officecfg/Office/Impress.hxx>
 #include <osl/diagnose.h>
--- a/sd/source/ui/tools/PropertySet.cxx
+++ b/sd/source/ui/tools/PropertySet.cxx
@ -19,7 +19,6 @@

 #include "tools/PropertySet.hxx"
 #include <algorithm>
-#include <o3tl/compat_functional.hxx>

 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@ -610,7 +610,7 @@
 #include <map>
 #include <math.h>
 #include <memory>
-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>
 #include <o3tl/numeric.hxx>
 #include <osl/diagnose.h>
 #include <osl/endian.h>
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@ -89,7 +89,7 @@

 #include <algorithm>

-#include <o3tl/compat_functional.hxx>
+#include <o3tl/functional.hxx>

 using namespace ::com::sun::star;
 using namespace ::comphelper;