diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-09-03 10:47:07 +0300 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-09-03 12:00:40 +0200 |
| commit | a06b83ff927d8973c8b4a2de9a0c7ce5cd4b1f96 (patch) | |
| tree | 27a5441db9b59bad60a603b961afcaf78340e358 /include | |
| parent | c505eb427b9e678d75581c56aff16aaf31264da7 (diff) | |
Parent reference should be const in VCL builder entry points
Change-Id: I2331e19f5e23e0dde8edd22befc7287515adf37e
Reviewed-on: https://gerrit.libreoffice.org/78536
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/NotebookBarAddonsMerger.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/builder.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/builderfactory.hxx | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/vcl/NotebookBarAddonsMerger.hxx b/include/vcl/NotebookBarAddonsMerger.hxx index ef6a3291e9f8..913e50734472 100644 --- a/include/vcl/NotebookBarAddonsMerger.hxx +++ b/include/vcl/NotebookBarAddonsMerger.hxx @@ -61,7 +61,7 @@ class NotebookBarAddonsMerger { public: typedef std::map<OString, OUString> stringmap; - typedef void (*customMakeWidget)(VclPtr<vcl::Window>& rRet, VclPtr<vcl::Window>& pParent, + typedef void (*customMakeWidget)(VclPtr<vcl::Window>& rRet, const VclPtr<vcl::Window>& pParent, stringmap& rVec); NotebookBarAddonsMerger(); ~NotebookBarAddonsMerger(); diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index adefc6d39713..4cdd10930dea 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -65,7 +65,7 @@ public: typedef std::map<OString, OUString> stringmap; typedef std::map<OString, std::pair<OString, OString>> accelmap; /// These functions create a new widget with parent pParent and return it in rRet - typedef void (*customMakeWidget)(VclPtr<vcl::Window> &rRet, VclPtr<vcl::Window> &pParent, stringmap &rVec); + typedef void (*customMakeWidget)(VclPtr<vcl::Window> &rRet, const VclPtr<vcl::Window> &pParent, stringmap &rVec); public: VclBuilder(vcl::Window* pParent, const OUString& sUIRootDir, const OUString& sUIFile, diff --git a/include/vcl/builderfactory.hxx b/include/vcl/builderfactory.hxx index 0781726c0ffb..719f1d8b206c 100644 --- a/include/vcl/builderfactory.hxx +++ b/include/vcl/builderfactory.hxx @@ -14,21 +14,21 @@ #include <vcl/builder.hxx> #define VCL_BUILDER_FACTORY(typeName) \ - extern "C" SAL_DLLPUBLIC_EXPORT void make##typeName(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) \ + extern "C" SAL_DLLPUBLIC_EXPORT void make##typeName(VclPtr<vcl::Window> & rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) \ { \ (void)rMap; \ rRet = VclPtr<typeName>::Create(pParent); \ } #define VCL_BUILDER_FACTORY_ARGS(typeName,arg1) \ - extern "C" SAL_DLLPUBLIC_EXPORT void make##typeName(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) \ + extern "C" SAL_DLLPUBLIC_EXPORT void make##typeName(VclPtr<vcl::Window> & rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) \ { \ (void)rMap; \ rRet = VclPtr<typeName>::Create(pParent,arg1); \ } #define VCL_BUILDER_FACTORY_CONSTRUCTOR(typeName,arg2) \ - extern "C" SAL_DLLPUBLIC_EXPORT void make##typeName(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) \ + extern "C" SAL_DLLPUBLIC_EXPORT void make##typeName(VclPtr<vcl::Window> & rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) \ { \ OUString sBorder = BuilderUtils::extractCustomProperty(rMap); \ WinBits wb = arg2; \ @@ -38,7 +38,7 @@ } #define VCL_BUILDER_FACTORY_EXTERN(typeName) \ - extern "C" void make##typeName(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) + extern "C" void make##typeName(VclPtr<vcl::Window> & rRet, const VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) #endif |