1 files changed, 9 insertions, 9 deletions
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index 637f173da20e..abdb75372539 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -31,8 +31,10 @@
 #include <com/sun/star/sdb/application/DatabaseObject.hpp>
 #include <com/sun/star/sdb/application/DatabaseObjectContainer.hpp>
 #include <com/sun/star/sdb/XDatabaseRegistrationsListener.hpp>
+#include <comphelper/interfacecontainer2.hxx>
 #include <cppuhelper/implbase5.hxx>
 #include "callbacks.hxx"
+#include <utility>
 #include <vcl/transfer.hxx>
 #include <svx/dataaccessdescriptor.hxx>
 #include "TableCopyHelper.hxx"
@@ -45,7 +47,7 @@ namespace com::sun::star::container { class XNameContainer; }
 
 namespace dbaui
 {
-    struct DBTreeEditedEntry;
+    struct DBTreeListUserData;
     class ImageProvider;
 
     typedef ::cppu::ImplHelper5 <   css::frame::XStatusListener
@@ -72,7 +74,7 @@ namespace dbaui
             bool                        bEnabled;
 
             ExternalFeature() : bEnabled( false ) { }
-            ExternalFeature( const css::util::URL& _rURL ) : aURL( _rURL ), bEnabled( false ) { }
+            ExternalFeature( css::util::URL _aURL ) : aURL(std::move( _aURL )), bEnabled( false ) { }
         };
 
         typedef std::map< sal_uInt16, ExternalFeature >  ExternalFeaturesMap;
@@ -219,7 +221,7 @@ namespace dbaui
         virtual vcl::Window* getMenuParent() const override;
         virtual void adjustMenuPosition(const weld::TreeView& rControl, ::Point& rPos) const override;
 
-        virtual void impl_initialize() override;
+        virtual void impl_initialize(const ::comphelper::NamedValueCollection& rArguments) override;
 
         // SbaGridListener overridables
         virtual void RowChanged() override;
@@ -289,7 +291,7 @@ namespace dbaui
 
         /** close the connection (and collapse the list entries) of the given list entries
         */
-        void        closeConnection(weld::TreeIter& rEntry, bool bDisposeConnection = true);
+        void        closeConnection(const weld::TreeIter& rEntry, bool bDisposeConnection = true);
 
         void        populateTree(const css::uno::Reference< css::container::XNameAccess>& xNameAccess, const weld::TreeIter& rParent, EntryType eEntryType);
         void        initializeTreeModel();
@@ -308,7 +310,7 @@ namespace dbaui
         */
         std::unique_ptr<ImageProvider> getImageProviderFor(const weld::TreeIter* pAnyEntry);
 
-        void    implAdministrate(weld::TreeIter& rApplyTo);
+        void    implAdministrate(const weld::TreeIter& rApplyTo);
 
         bool implCopyObject(ODataClipboard& rExchange, const weld::TreeIter& rApplyTo, sal_Int32 nCommandType);
 
@@ -349,14 +351,12 @@ namespace dbaui
             bool _bSelectDirect
         );
 
-        std::unique_ptr<weld::TreeIter> implGetConnectionEntry(weld::TreeIter& rEntry) const;
+        std::unique_ptr<weld::TreeIter> implGetConnectionEntry(const weld::TreeIter& rEntry) const;
         /// inserts an entry into the tree
         std::unique_ptr<weld::TreeIter> implAppendEntry(
             const weld::TreeIter* pParent,
             const OUString& rName,
-            void* pUserData,
-            EntryType eEntryType
-        );
+            const DBTreeListUserData* pUserData);
 
         /// loads the grid control with the data object specified (which may be a table, a query or a command)
         bool implLoadAnything(const OUString& _rDataSourceName, const OUString& _rCommand,