From 69fbf74d5bf9c474a6ec04101426dfe79b4ad9bf Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 29 Aug 2019 20:17:53 +0100
Subject: weld addressbook wizard
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I118ed34ddaf7d62e5bb15497399cd10533339328
Reviewed-on: https://gerrit.libreoffice.org/78287
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 extensions/source/abpilot/typeselectionpage.hxx | 28 ++++++++++++-------------
 1 file changed, 13 insertions(+), 15 deletions(-)

(limited to 'extensions/source/abpilot/typeselectionpage.hxx')

diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx
index 219afd059bf2..cf5c537b39f0 100644
--- a/extensions/source/abpilot/typeselectionpage.hxx
+++ b/extensions/source/abpilot/typeselectionpage.hxx
@@ -22,30 +22,28 @@
 
 #include "abspage.hxx"
 #include "addresssettings.hxx"
-#include <vcl/edit.hxx>
-#include <vcl/vclptr.hxx>
-
+#include <vcl/weld.hxx>
 
 namespace abp
 {
 
     class TypeSelectionPage final : public AddressBookSourcePage
     {
-        VclPtr<RadioButton> m_pEvolution;
-        VclPtr<RadioButton> m_pEvolutionGroupwise;
-        VclPtr<RadioButton> m_pEvolutionLdap;
-        VclPtr<RadioButton> m_pMORK;
-        VclPtr<RadioButton> m_pThunderbird;
-        VclPtr<RadioButton> m_pKab;
-        VclPtr<RadioButton> m_pMacab;
-        VclPtr<RadioButton> m_pOther;
+        std::unique_ptr<weld::RadioButton> m_xEvolution;
+        std::unique_ptr<weld::RadioButton> m_xEvolutionGroupwise;
+        std::unique_ptr<weld::RadioButton> m_xEvolutionLdap;
+        std::unique_ptr<weld::RadioButton> m_xMORK;
+        std::unique_ptr<weld::RadioButton> m_xThunderbird;
+        std::unique_ptr<weld::RadioButton> m_xKab;
+        std::unique_ptr<weld::RadioButton> m_xMacab;
+        std::unique_ptr<weld::RadioButton> m_xOther;
 
         struct ButtonItem {
-            VclPtr<RadioButton> m_pItem;
+            weld::RadioButton* m_pItem;
             AddressSourceType m_eType;
             bool         m_bVisible;
 
-            ButtonItem( RadioButton *pItem,
+            ButtonItem( weld::RadioButton *pItem,
                         AddressSourceType eType,
                         bool         bVisible ) :
                     m_pItem( pItem ),
@@ -57,7 +55,7 @@ namespace abp
         std::vector< ButtonItem > m_aAllTypes;
 
     public:
-        explicit TypeSelectionPage( OAddressBookSourcePilot* _pParent );
+        explicit TypeSelectionPage(OAddressBookSourcePilot* pDialog, TabPageParent pPageParent);
         virtual ~TypeSelectionPage() override;
         virtual void        dispose() override;
 
@@ -76,7 +74,7 @@ namespace abp
         // OImportPage overridables
         virtual bool        canAdvance() const override;
 
-        DECL_LINK( OnTypeSelected, Button*, void );
+        DECL_LINK( OnTypeSelected, weld::Button&, void );
 
         void                selectType( AddressSourceType _eType );
     };
-- 
cgit