No need for rtl::Reference friend, no need for #include vclptr.hxx

Change-Id: I7bdd15a93e728ef7e98a53001c6eb6b56f761a6d
2016-12-09 20:01:52 +01:00
parent cbf5b21f2a
commit a9659f30d6
3 changed files with 5 additions and 3 deletions
--- a/compilerplugins/clang/test/vclwidgets.cxx
+++ b/compilerplugins/clang/test/vclwidgets.cxx
@@ -8,6 +8,8 @@
 */

 #include <sal/config.h>
+
+#include <vcl/vclptr.hxx>
 #include <vcl/vclreferencebase.hxx>

 struct Widget : public VclReferenceBase
--- a/include/vcl/abstdlg.hxx
+++ b/include/vcl/abstdlg.hxx
@@ -22,6 +22,7 @@
 #include <rtl/ustring.hxx>
 #include <tools/link.hxx>
 #include <vcl/dllapi.h>
+#include <vcl/vclptr.hxx>
 #include <vcl/vclreferencebase.hxx>
 #include <vector>

--- a/include/vcl/vclreferencebase.hxx
+++ b/include/vcl/vclreferencebase.hxx
@@ -20,8 +20,8 @@
 #define INCLUDED_VCL_Reference_HXX

 #include <vcl/dllapi.h>
-#include <vcl/vclptr.hxx>
 #include <tools/debug.hxx>
+
 #include <cassert>

 class VclReferenceBase;
@@ -30,8 +30,7 @@ class VCL_DLLPUBLIC VclReferenceBase
 {
    mutable int mnRefCnt;

-    template<typename T> friend class ::rtl::Reference;
-    template<typename T> friend class ::VclPtr;
+    template<typename T> friend class VclPtr;

 public:
    inline void acquire() const