summaryrefslogtreecommitdiff
path: root/include/svtools/treelist.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-30 10:20:00 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-30 10:20:00 +0200
commit3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed (patch)
treebdfd28afe5a452060e3d985c5f01b45f4b7bc2cd /include/svtools/treelist.hxx
parent57d254d42b6e1d836bd21e6fb2e968af2b511c7d (diff)
Gradually typed Link
Turn the Link class into a template abstracting over the link's argument and return types, but provide default template arguments that keep the generic, unsafe "void* in, sal_IntPtr out" behvior. That way, individual uses of the Link class can be updated over time. All the related macros are duplicated with ..._TYPED counterparts, that additionally take the RetType (except for LINK_TYPED, which manages to infer the relevant types from the supplied Member). (It would have been attractive to change the "untyped" LinkStubs from taking a void* to a properly typed ArgType parameter, too, but that would cause -fsanitize=function to flag uses of "untyped" Link::Call.) Change-Id: I3b0140378bad99abbf240140ebb4a46a05d2d2f8
Diffstat (limited to 'include/svtools/treelist.hxx')
-rw-r--r--include/svtools/treelist.hxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx
index 22689dcf844c..dfd6fbc146bf 100644
--- a/include/svtools/treelist.hxx
+++ b/include/svtools/treelist.hxx
@@ -72,8 +72,8 @@ class SVT_DLLPUBLIC SvTreeList
ListViewsType aViewList;
sal_uLong nEntryCount;
- Link aCloneLink;
- Link aCompareLink;
+ Link<> aCloneLink;
+ Link<> aCompareLink;
SvSortMode eSortMode;
sal_uInt16 nRefCount;
@@ -218,10 +218,10 @@ public:
// DECL_LINK(CloneHdl,SvTreeListEntry*);
// The Handler needs to return a SvTreeListEntry*
SvTreeListEntry* Clone( SvTreeListEntry* pEntry, sal_uLong& nCloneCount ) const;
- void SetCloneLink( const Link& rLink )
+ void SetCloneLink( const Link<>& rLink )
{ aCloneLink=rLink; }
- const Link& GetCloneLink() const
+ const Link<>& GetCloneLink() const
{ return aCloneLink; }
SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource ) const; // Calls the Clone Link
@@ -233,8 +233,8 @@ public:
void SetSortMode( SvSortMode eMode ) { eSortMode = eMode; }
SvSortMode GetSortMode() const { return eSortMode; }
sal_Int32 Compare(const SvTreeListEntry* pLeft, const SvTreeListEntry* pRight) const;
- void SetCompareHdl( const Link& rLink ) { aCompareLink = rLink; }
- const Link& GetCompareHdl() const { return aCompareLink; }
+ void SetCompareHdl( const Link<>& rLink ) { aCompareLink = rLink; }
+ const Link<>& GetCompareHdl() const { return aCompareLink; }
void Resort();
void Reverse();
};