summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-07-31 18:30:09 +0200
committerMichael Stahl <mstahl@redhat.com>2015-07-31 21:24:25 +0200
commit2a62966d8947829d00702455977026369082007a (patch)
treee2323fa9b36ed1686f03de9aa5a272c77f3cc902 /include
parent1841946863ed006a36323fcca52a71272eae2ee6 (diff)
sfx2: replace boost::function with std::function
Change-Id: I72acc5f396553eb464338a395ef40f95ed57a07e
Diffstat (limited to 'include')
-rw-r--r--include/sfx2/sidebar/AsynchronousCall.hxx5
-rw-r--r--include/sfx2/sidebar/ControllerItem.hxx2
-rw-r--r--include/sfx2/sidebar/PanelTitleBar.hxx1
-rw-r--r--include/sfx2/sidebar/SidebarPanelBase.hxx1
-rw-r--r--include/sfx2/sidebar/TabBar.hxx12
-rw-r--r--include/sfx2/templatelocalview.hxx3
-rw-r--r--include/sfx2/thumbnailview.hxx8
7 files changed, 16 insertions, 16 deletions
diff --git a/include/sfx2/sidebar/AsynchronousCall.hxx b/include/sfx2/sidebar/AsynchronousCall.hxx
index 338505c83e4b..408805ad4330 100644
--- a/include/sfx2/sidebar/AsynchronousCall.hxx
+++ b/include/sfx2/sidebar/AsynchronousCall.hxx
@@ -19,10 +19,11 @@
#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_ASYNCHRONOUSCALL_HXX
#define INCLUDED_SFX2_SOURCE_SIDEBAR_ASYNCHRONOUSCALL_HXX
-#include <boost/function.hpp>
#include <tools/solar.h>
#include <tools/link.hxx>
+#include <functional>
+
struct ImplSVEvent;
namespace sfx2 { namespace sidebar {
@@ -32,7 +33,7 @@ namespace sfx2 { namespace sidebar {
class AsynchronousCall
{
public:
- typedef ::boost::function<void()> Action;
+ typedef ::std::function<void()> Action;
AsynchronousCall();
AsynchronousCall (const Action& rAction);
diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx
index 0a3802126401..97ea553bf24f 100644
--- a/include/sfx2/sidebar/ControllerItem.hxx
+++ b/include/sfx2/sidebar/ControllerItem.hxx
@@ -28,8 +28,6 @@
#include <com/sun/star/frame/XFrame.hpp>
-#include <boost/function.hpp>
-
class SfxViewFrame;
class ToolBox;
diff --git a/include/sfx2/sidebar/PanelTitleBar.hxx b/include/sfx2/sidebar/PanelTitleBar.hxx
index e3f00641f824..21cee82b1450 100644
--- a/include/sfx2/sidebar/PanelTitleBar.hxx
+++ b/include/sfx2/sidebar/PanelTitleBar.hxx
@@ -22,7 +22,6 @@
#include <sfx2/sidebar/TitleBar.hxx>
#include <com/sun/star/frame/XFrame.hpp>
-#include <boost/function.hpp>
namespace sfx2 { namespace sidebar {
diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx
index 75d155ee2ace..55a409781459 100644
--- a/include/sfx2/sidebar/SidebarPanelBase.hxx
+++ b/include/sfx2/sidebar/SidebarPanelBase.hxx
@@ -33,7 +33,6 @@
#include <com/sun/star/ui/XUpdateModel.hpp>
#include <boost/noncopyable.hpp>
-#include <boost/function.hpp>
#include <vcl/vclptr.hxx>
diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx
index 457e51022c57..2a8d7f9b3fff 100644
--- a/include/sfx2/sidebar/TabBar.hxx
+++ b/include/sfx2/sidebar/TabBar.hxx
@@ -27,10 +27,12 @@
#include <vcl/window.hxx>
#include <com/sun/star/frame/XFrame.hpp>
-#include <boost/function.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/scoped_ptr.hpp>
+#include <functional>
+
+
class Button;
class CheckBox;
class RadioButton;
@@ -61,13 +63,13 @@ public:
bool mbIsActive;
bool mbIsEnabled;
};
- typedef ::boost::function<void(
+ typedef ::std::function<void (
const Rectangle&,
const ::std::vector<DeckMenuData>& rMenuData)> PopupMenuProvider;
TabBar (
vcl::Window* pParentWindow,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
- const ::boost::function<void(const ::rtl::OUString&rsDeckId)>& rDeckActivationFunctor,
+ const ::std::function<void (const ::rtl::OUString&rsDeckId)>& rDeckActivationFunctor,
const PopupMenuProvider& rPopupMenuProvider,
SidebarController* rParentSidebarController);
@@ -99,13 +101,13 @@ private:
DECL_LINK(HandleClick, Button*);
VclPtr<RadioButton> mpButton;
::rtl::OUString msDeckId;
- ::boost::function<void(const ::rtl::OUString&rsDeckId)> maDeckActivationFunctor;
+ ::std::function<void (const ::rtl::OUString&rsDeckId)> maDeckActivationFunctor;
bool mbIsHidden;
bool mbIsHiddenByDefault;
};
typedef ::std::vector<Item> ItemContainer;
ItemContainer maItems;
- const ::boost::function<void(const ::rtl::OUString&rsDeckId)> maDeckActivationFunctor;
+ const ::std::function<void (const ::rtl::OUString&rsDeckId)> maDeckActivationFunctor;
sal_Int32 mnMenuSeparatorY;
PopupMenuProvider maPopupMenuProvider;
diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx
index 123a6f6f13b5..2d06ef912121 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -11,6 +11,7 @@
#define INCLUDED_SFX2_TEMPLATELOCALVIEW_HXX
#include <set>
+#include <functional>
#include <sfx2/templateabstractview.hxx>
@@ -56,7 +57,7 @@ public:
std::vector<OUString> getFolderNames ();
std::vector<TemplateItemProperties>
- getFilteredItems (const boost::function<bool (const TemplateItemProperties&) > &rFunc) const;
+ getFilteredItems (const std::function<bool (const TemplateItemProperties&) > &rFunc) const;
virtual sal_uInt16 createRegion (const OUString &rName) SAL_OVERRIDE;
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index a14ad32e6647..a522ef8e86c7 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -13,7 +13,7 @@
#include <sfx2/dllapi.h>
#include <vector>
-#include <boost/function.hpp>
+#include <functional>
#include <comphelper/processfactory.hxx>
#include <unotools/ucbstreamhelper.hxx>
@@ -226,9 +226,9 @@ public:
void ShowTooltips( bool bShowTooltips );
- void filterItems (const boost::function<bool (const ThumbnailViewItem*) > &func);
+ void filterItems (const std::function<bool (const ThumbnailViewItem*) > &func);
- void sortItems (const boost::function<bool (const ThumbnailViewItem*,
+ void sortItems (const std::function<bool (const ThumbnailViewItem*,
const ThumbnailViewItem*) > &func);
void setItemStateHdl (const Link<> &aLink) { maItemStateHdl = aLink; }
@@ -326,7 +326,7 @@ protected:
Link<> maItemStateHdl;
ThumbnailItemAttributes* mpItemAttrs;
- boost::function<bool (const ThumbnailViewItem*)> maFilterFunc;
+ std::function<bool (const ThumbnailViewItem*)> maFilterFunc;
};
#endif // INCLUDED_SFX2_THUMBNAILVIEW_HXX