diff options
author | Noel <noelgrandin@gmail.com> | 2020-10-06 12:27:39 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-10-06 15:30:42 +0200 |
commit | 7cd179df80957b7daefab028cf35aebb1083b014 (patch) | |
tree | f76056c2eaf044088cd1dc8159136bac774500f0 | |
parent | add missing null pointer check (diff) | |
download | core-7cd179df80957b7daefab028cf35aebb1083b014.tar.gz core-7cd179df80957b7daefab028cf35aebb1083b014.zip |
loplugin:const& make some params and methods const
Change-Id: I2973128a9c6c53187e1da400d1a5df763d515596
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104020
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
24 files changed, 54 insertions, 53 deletions
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 55d1239acb60..2fc7252c5f23 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -312,7 +312,7 @@ void ImpEditView::SelectionChanged() } // This function is also called when a text's font || size is changed. Because its highlight rectangle must be updated. -void ImpEditView::lokSelectionCallback(std::unique_ptr<tools::PolyPolygon> &pPolyPoly, bool bStartHandleVisible, bool bEndHandleVisible) { +void ImpEditView::lokSelectionCallback(const std::unique_ptr<tools::PolyPolygon> &pPolyPoly, bool bStartHandleVisible, bool bEndHandleVisible) { VclPtr<vcl::Window> pParent = pOutWin->GetParentWithLOKNotifier(); vcl::Region aRegion( *pPolyPoly ); diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 0efc9d552074..59db76fea44d 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -305,7 +305,7 @@ private: return mpEditViewCallbacks; } - void lokSelectionCallback(std::unique_ptr<tools::PolyPolygon> &pPolyPoly, bool bStartHandleVisible, bool bEndHandleVisible); + void lokSelectionCallback(const std::unique_ptr<tools::PolyPolygon> &pPolyPoly, bool bStartHandleVisible, bool bEndHandleVisible); void setEditViewCallbacks(EditViewCallbacks* pEditViewCallbacks) { diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 4c4855ca7461..23f8e464f1ce 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -410,14 +410,14 @@ class DBChangeDialog_Impl : public weld::GenericDialogController DECL_LINK(DoubleClickHdl, weld::TreeView&, bool); public: - DBChangeDialog_Impl(weld::Window* pParent, BibDataManager* pMan); + DBChangeDialog_Impl(weld::Window* pParent, const BibDataManager* pMan); OUString GetCurrentURL()const; }; } -DBChangeDialog_Impl::DBChangeDialog_Impl(weld::Window* pParent, BibDataManager* pDatMan ) +DBChangeDialog_Impl::DBChangeDialog_Impl(weld::Window* pParent, const BibDataManager* pDatMan ) : GenericDialogController(pParent, "modules/sbibliography/ui/choosedatasourcedialog.ui", "ChooseDataSourceDialog") , m_xSelectionLB(m_xBuilder->weld_tree_view("treeview")) { diff --git a/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx index cfcb08d6deb6..d57495a546f1 100644 --- a/i18npool/source/textconversion/textconversion_ko.cxx +++ b/i18npool/source/textconversion/textconversion_ko.cxx @@ -188,7 +188,7 @@ TextConversion_ko::getCharConversions(const OUString& aText, sal_Int32 nStartPos return output; } -static Sequence< OUString >& operator += (Sequence< OUString > &rSeq1, Sequence< OUString > &rSeq2 ) +static Sequence< OUString >& operator += (Sequence< OUString > &rSeq1, const Sequence< OUString > &rSeq2 ) { if (! rSeq1.hasElements() && rSeq2.hasElements()) rSeq1 = rSeq2; diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx index bda6ecc05462..fadf510ca997 100644 --- a/include/sfx2/objface.hxx +++ b/include/sfx2/objface.hxx @@ -102,7 +102,7 @@ public: const OUString& GetPopupMenuName() const; StatusBarId GetStatusBarId() const; - void Register( SfxModule* ); + void Register( const SfxModule* ); SAL_DLLPRIVATE bool ContainsSlot_Impl( const SfxSlot *pSlot ) const { return pSlot >= pSlots && pSlot < pSlots + Count(); } diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index e60139348c26..78a1f3eb22e6 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -594,11 +594,11 @@ public: const css::uno::Reference<css::embed::XStorage>& xTarget, const css::uno::Sequence<OUString>& rExceptions = css::uno::Sequence<OUString>()); - bool isEditDocLocked(); - bool isContentExtractionLocked(); - bool isExportLocked(); - bool isPrintLocked(); - bool isSaveLocked(); + bool isEditDocLocked() const; + bool isContentExtractionLocked() const; + bool isExportLocked() const; + bool isPrintLocked() const; + bool isSaveLocked() const; // The functions from SvPersist void EnableSetModified( bool bEnable = true ); diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index f341644d7f16..60de3579e8d3 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -537,7 +537,7 @@ inline void SfxShell::SetPool static SfxInterface* pInterface; \ static SfxInterface* GetStaticInterface(); \ static SfxInterfaceId GetInterfaceId() {return nId;} \ - static void RegisterInterface(SfxModule* pMod=nullptr); \ + static void RegisterInterface(const SfxModule* pMod=nullptr); \ virtual SfxInterface* GetInterface() const override; #define SFX_TMPL_INTERFACE(Class,SuperClass,Abstract) \ @@ -563,7 +563,7 @@ inline void SfxShell::SetPool return GetStaticInterface(); \ } \ \ - void Class::RegisterInterface(SfxModule* pMod) \ + void Class::RegisterInterface(const SfxModule* pMod) \ { \ GetStaticInterface()->Register(pMod); \ } diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 817e276665d4..68631f7f0d20 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -379,7 +379,7 @@ public: void connect_get_property_tree(const Link<tools::JsonWriter&, void>& rLink) { m_xComboBox->connect_get_property_tree(rLink); } void set_entry_width_chars(int nWidth) { m_xComboBox->set_entry_width_chars(nWidth); } void set_size_request(int nWidth, int nHeight) { m_xComboBox->set_size_request(nWidth, nHeight); } - int get_max_mru_count() { return m_xComboBox->get_max_mru_count(); } + int get_max_mru_count() const { return m_xComboBox->get_max_mru_count(); } void set_max_mru_count(int nCount) { m_xComboBox->set_max_mru_count(nCount); } // font size is in points, not pixels, e.g. see Window::[G]etPointFont diff --git a/include/svx/gallerybinaryengine.hxx b/include/svx/gallerybinaryengine.hxx index 1e6fd0b28eb1..4f1351880269 100644 --- a/include/svx/gallerybinaryengine.hxx +++ b/include/svx/gallerybinaryengine.hxx @@ -76,8 +76,8 @@ public: SAL_DLLPRIVATE bool implWrite(const GalleryTheme& rTheme, const GalleryThemeEntry* pThm); - void insertObject(const SgaObject& rObj, GalleryObject* pFoundEntry, sal_uInt32& rInsertPos); - void removeObject(std::unique_ptr<GalleryObject>& pEntry); + void insertObject(const SgaObject& rObj, GalleryObject* pFoundEntry, sal_uInt32 nInsertPos); + void removeObject(const std::unique_ptr<GalleryObject>& pEntry); std::unique_ptr<SgaObject> implReadSgaObject(GalleryObject const* pEntry); bool implWriteSgaObject(const SgaObject& rObj, sal_uInt32 nPos, GalleryObject* pExistentEntry); @@ -94,9 +94,10 @@ public: ConvertDataFormat nFormat = ConvertDataFormat::Unknown); SgaObjectBmp insertGraphic(const Graphic& rGraphic, const GfxLink& aGfxLink, - ConvertDataFormat& nExportFormat, const INetURLObject& rUserURL); + const ConvertDataFormat& nExportFormat, + const INetURLObject& rUserURL); - SgaObjectSvDraw updateSvDrawObject(GalleryObject* pEntry); + SgaObjectSvDraw updateSvDrawObject(const GalleryObject* pEntry); void updateTheme(); static void insertFileOrDirURL(const INetURLObject& rFileOrDirURL, diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index 14f0f31d5e92..b83f7cac7ab7 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -305,7 +305,7 @@ namespace { virtual void restart() override; virtual bool isPaused() override; virtual void setPauseStatus(const bool pauseStatus) override; - TimeValue getPauseTimeValue(); + TimeValue getPauseTimeValue() const; void setPauseTimeValue(const TimeValue pauseTime); private: TimeValue maStartTimeValue; @@ -1840,7 +1840,7 @@ void PresentationTimeLabel::setPauseStatus(const bool pauseStatus) paused = pauseStatus; } -TimeValue PresentationTimeLabel::getPauseTimeValue() +TimeValue PresentationTimeLabel::getPauseTimeValue() const { return pauseTimeValue; } diff --git a/sfx2/inc/emojicontrol.hxx b/sfx2/inc/emojicontrol.hxx index 98a28985fe42..eee551600da4 100644 --- a/sfx2/inc/emojicontrol.hxx +++ b/sfx2/inc/emojicontrol.hxx @@ -25,7 +25,7 @@ class SfxEmojiControl final : public WeldToolbarPopup { public: - explicit SfxEmojiControl(EmojiPopup* pControl, weld::Widget* pParent); + explicit SfxEmojiControl(const EmojiPopup* pControl, weld::Widget* pParent); virtual ~SfxEmojiControl() override; virtual void GrabFocus() override; diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 72637cbcdcaf..10e53fa6c435 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -234,7 +234,7 @@ void ContentTabPage_Impl::InitRoot() } } -void ContentTabPage_Impl::ClearChildren(weld::TreeIter* pParent) +void ContentTabPage_Impl::ClearChildren(const weld::TreeIter* pParent) { std::unique_ptr<weld::TreeIter> xEntry = m_xContentBox->make_iterator(pParent); bool bEntry = m_xContentBox->iter_children(*xEntry); diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 73df300dd6e3..25be4e6e3e12 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -72,7 +72,7 @@ private: DECL_LINK(ExpandingHdl, const weld::TreeIter&, bool); DECL_LINK(CollapsingHdl, const weld::TreeIter&, bool); - void ClearChildren(weld::TreeIter* pParent); + void ClearChildren(const weld::TreeIter* pParent); void InitRoot(); public: ContentTabPage_Impl(weld::Widget* pParent, SfxHelpIndexWindow_Impl* _pIdxWin); diff --git a/sfx2/source/control/emojicontrol.cxx b/sfx2/source/control/emojicontrol.cxx index a7d3718f3ee3..8eeea0d5cc19 100644 --- a/sfx2/source/control/emojicontrol.cxx +++ b/sfx2/source/control/emojicontrol.cxx @@ -38,7 +38,7 @@ const char FILTER_UNICODE9[] = "unicode9"; using namespace com::sun::star; -SfxEmojiControl::SfxEmojiControl(EmojiPopup* pControl, weld::Widget* pParent) +SfxEmojiControl::SfxEmojiControl(const EmojiPopup* pControl, weld::Widget* pParent) : WeldToolbarPopup(pControl->getFrameInterface(), pParent, "sfx/ui/emojicontrol.ui", "emojictrl") , mxPeopleBtn(m_xBuilder->weld_toggle_button(FILTER_PEOPLE)) , mxNatureBtn(m_xBuilder->weld_toggle_button(FILTER_NATURE)) diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index 37fcf8e7b238..a9bb8f37ba09 100644 --- a/sfx2/source/control/objface.cxx +++ b/sfx2/source/control/objface.cxx @@ -100,7 +100,7 @@ SfxInterface::SfxInterface( const char *pClassName, SetSlotMap( rSlotMap, nSlotCount ); } -void SfxInterface::Register( SfxModule* pMod ) +void SfxInterface::Register( const SfxModule* pMod ) { if ( pMod ) pMod->GetSlotPool()->RegisterInterface(*this); diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 62d02b67aae7..e9bfc17fa876 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -384,7 +384,7 @@ void SfxTemplatePanelControl::dispose() PanelLayout::dispose(); } -static void MakeExpanded_Impl(weld::TreeView& rBox, std::vector<OUString>& rEntries) +static void MakeExpanded_Impl(const weld::TreeView& rBox, std::vector<OUString>& rEntries) { std::unique_ptr<weld::TreeIter> xEntry = rBox.make_iterator(); if (rBox.get_iter_first(*xEntry)) @@ -487,7 +487,7 @@ static void FillBox_Impl(weld::TreeView& rBox, StyleTree_Impl* pEntry, const std::vector<OUString>& rEntries, SfxStyleFamily eStyleFamily, - weld::TreeIter* pParent) + const weld::TreeIter* pParent) { std::unique_ptr<weld::TreeIter> xResult = rBox.make_iterator(); const OUString& rName = pEntry->getName(); diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 1a5cde068054..6ca2de78fd8f 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -1863,7 +1863,7 @@ bool SfxObjectShell::IsContinueImportOnFilterExceptions(const OUString& aErrMess return mbContinueImportOnFilterExceptions == yes; } -bool SfxObjectShell::isEditDocLocked() +bool SfxObjectShell::isEditDocLocked() const { Reference<XModel> xModel = GetModel(); if (!xModel.is()) @@ -1874,7 +1874,7 @@ bool SfxObjectShell::isEditDocLocked() return aArgs.getOrDefault("LockEditDoc", false); } -bool SfxObjectShell::isContentExtractionLocked() +bool SfxObjectShell::isContentExtractionLocked() const { Reference<XModel> xModel = GetModel(); if (!xModel.is()) @@ -1883,7 +1883,7 @@ bool SfxObjectShell::isContentExtractionLocked() return aArgs.getOrDefault("LockContentExtraction", false); } -bool SfxObjectShell::isExportLocked() +bool SfxObjectShell::isExportLocked() const { Reference<XModel> xModel = GetModel(); if (!xModel.is()) @@ -1892,7 +1892,7 @@ bool SfxObjectShell::isExportLocked() return aArgs.getOrDefault("LockExport", false); } -bool SfxObjectShell::isPrintLocked() +bool SfxObjectShell::isPrintLocked() const { Reference<XModel> xModel = GetModel(); if (!xModel.is()) @@ -1901,7 +1901,7 @@ bool SfxObjectShell::isPrintLocked() return aArgs.getOrDefault("LockPrint", false); } -bool SfxObjectShell::isSaveLocked() +bool SfxObjectShell::isSaveLocked() const { Reference<XModel> xModel = GetModel(); if (!xModel.is()) diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 9149cb4246c3..7a5d73e3135c 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -338,7 +338,7 @@ static std::vector<OUString> gRenderedFontNames; namespace { - void calcCustomItemSize(weld::ComboBox& rComboBox) + void calcCustomItemSize(const weld::ComboBox& rComboBox) { gUserItemSz = Size(rComboBox.get_approximate_digit_width() * 52, rComboBox.get_text_height()); gUserItemSz.setHeight(gUserItemSz.Height() * 16); diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index d77f4a785d21..bbf13cff5c3f 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -140,7 +140,7 @@ public: INetURLObject GetURL() const; OUString GetFilterName() const; - sal_Int8 AcceptDrop( DropTargetHelper& rTarget ); + sal_Int8 AcceptDrop( const DropTargetHelper& rTarget ); sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); bool StartDrag(); void TogglePreview(); diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 4533981056ad..e17e275600f5 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -426,7 +426,7 @@ void GalleryBrowser2::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -sal_Int8 GalleryBrowser2::AcceptDrop( DropTargetHelper& rTarget ) +sal_Int8 GalleryBrowser2::AcceptDrop( const DropTargetHelper& rTarget ) { sal_Int8 nRet = DND_ACTION_NONE; diff --git a/svx/source/gallery2/gallerybinaryengine.cxx b/svx/source/gallery2/gallerybinaryengine.cxx index eb740c5a0cff..ec68e830f79b 100644 --- a/svx/source/gallery2/gallerybinaryengine.cxx +++ b/svx/source/gallery2/gallerybinaryengine.cxx @@ -131,7 +131,7 @@ bool GalleryBinaryEngine::implWrite(const GalleryTheme& rTheme, const GalleryThe } void GalleryBinaryEngine::insertObject(const SgaObject& rObj, GalleryObject* pFoundEntry, - sal_uInt32& rInsertPos) + sal_uInt32 nInsertPos) { if (pFoundEntry) { @@ -150,14 +150,14 @@ void GalleryBinaryEngine::insertObject(const SgaObject& rObj, GalleryObject* pFo else if (rObj.GetTitle() == "__<empty>__") const_cast<SgaObject&>(rObj).SetTitle(""); - implWriteSgaObject(rObj, rInsertPos, &aNewEntry); + implWriteSgaObject(rObj, nInsertPos, &aNewEntry); pFoundEntry->nOffset = aNewEntry.nOffset; } else - implWriteSgaObject(rObj, rInsertPos, nullptr); + implWriteSgaObject(rObj, nInsertPos, nullptr); } -void GalleryBinaryEngine::removeObject(std::unique_ptr<GalleryObject>& pEntry) +void GalleryBinaryEngine::removeObject(const std::unique_ptr<GalleryObject>& pEntry) { if (mrGalleryObjectCollection.getObjectList().empty()) KillFile(GetSdgURL()); @@ -489,7 +489,7 @@ INetURLObject GalleryBinaryEngine::implCreateUniqueURL(SgaObjKind eObjKind, } SgaObjectBmp GalleryBinaryEngine::insertGraphic(const Graphic& rGraphic, const GfxLink& aGfxLink, - ConvertDataFormat& nExportFormat, + const ConvertDataFormat& nExportFormat, const INetURLObject& rUserURL) { const INetURLObject aURL(implCreateUniqueURL(SgaObjKind::Bitmap, rUserURL, nExportFormat)); @@ -530,7 +530,7 @@ SgaObjectBmp GalleryBinaryEngine::insertGraphic(const Graphic& rGraphic, const G return SgaObjectBmp(); } -SgaObjectSvDraw GalleryBinaryEngine::updateSvDrawObject(GalleryObject* pEntry) +SgaObjectSvDraw GalleryBinaryEngine::updateSvDrawObject(const GalleryObject* pEntry) { if (GetSvDrawStorage().is()) { diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index ce0858d7b742..9f82691026dd 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -524,7 +524,7 @@ public: static guint GetKeyValFor(GdkKeymap* pKeyMap, guint16 hardware_keycode, guint8 group); static sal_uInt16 GetKeyModCode(guint nState); static GdkEvent* makeFakeKeyPress(GtkWidget* pWidget); - static SalWheelMouseEvent GetWheelEvent(GdkEventScroll& rEvent); + static SalWheelMouseEvent GetWheelEvent(const GdkEventScroll& rEvent); static gboolean NativeWidgetHelpPressed(GtkAccelGroup*, GObject*, guint, GdkModifierType, gpointer pFrame); static OUString GetPreeditDetails(GtkIMContext* pIMContext, std::vector<ExtTextInputAttr>& rInputFlags, sal_Int32& rCursorPos, sal_uInt8& rCursorFlags); diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 40558262977c..d97107d77375 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -2741,7 +2741,7 @@ IMPL_LINK_NOARG(GtkSalFrame, AsyncScroll, Timer *, void) } } -SalWheelMouseEvent GtkSalFrame::GetWheelEvent(GdkEventScroll& rEvent) +SalWheelMouseEvent GtkSalFrame::GetWheelEvent(const GdkEventScroll& rEvent) { SalWheelMouseEvent aEvent; diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 0a1366ab4996..405df2e1b742 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -1969,7 +1969,7 @@ protected: return ::SwapForRTL(m_pWidget); } - void do_enable_drag_source(rtl::Reference<TransferDataContainer>& rHelper, sal_uInt8 eDNDConstants) + void do_enable_drag_source(const rtl::Reference<TransferDataContainer>& rHelper, sal_uInt8 eDNDConstants) { css::uno::Reference<css::datatransfer::XTransferable> xTrans(rHelper.get()); css::uno::Reference<css::datatransfer::dnd::XDragSourceListener> xListener(rHelper.get()); @@ -4444,7 +4444,7 @@ private: *pActivate = true; } - bool signal_screenshot_popup_menu(GdkEventButton* pEvent) + bool signal_screenshot_popup_menu(const GdkEventButton* pEvent) { GtkWidget *pMenu = gtk_menu_new(); @@ -4885,7 +4885,7 @@ private: return pThis->signal_button(pEvent); } - bool signal_button(GdkEventButton* pEvent) + bool signal_button(const GdkEventButton* pEvent) { int nNewCurrentPage = -1; @@ -7990,7 +7990,7 @@ private: gtk_tool_button_set_icon_widget(pItem, pImage); } - void set_item_image(GtkToolButton* pItem, VirtualDevice* pDevice) + void set_item_image(GtkToolButton* pItem, const VirtualDevice* pDevice) { GtkWidget* pImage = nullptr; @@ -9231,7 +9231,7 @@ struct GtkTreeRowReferenceDeleter } }; -bool separator_function(GtkTreePath* path, const std::vector<std::unique_ptr<GtkTreeRowReference, GtkTreeRowReferenceDeleter>>& rSeparatorRows) +bool separator_function(const GtkTreePath* path, const std::vector<std::unique_ptr<GtkTreeRowReference, GtkTreeRowReferenceDeleter>>& rSeparatorRows) { bool bFound = false; for (auto& a : rSeparatorRows) @@ -9502,7 +9502,7 @@ private: } } - bool separator_function(GtkTreePath* path) + bool separator_function(const GtkTreePath* path) { return ::separator_function(path, m_aSeparatorRows); } @@ -9710,7 +9710,7 @@ private: return bRet; } - bool signal_test_collapse_row(GtkTreeIter& iter) + bool signal_test_collapse_row(const GtkTreeIter& iter) { disable_notify_events(); @@ -13193,7 +13193,7 @@ private: { return signal_command(rCEvt); } - bool signal_scroll(GdkEventScroll* pEvent) + bool signal_scroll(const GdkEventScroll* pEvent) { SalWheelMouseEvent aEvt(GtkSalFrame::GetWheelEvent(*pEvent)); @@ -14054,7 +14054,7 @@ private: return -1; } - bool separator_function(GtkTreePath* path) + bool separator_function(const GtkTreePath* path) { return ::separator_function(path, m_aSeparatorRows); } @@ -14619,7 +14619,7 @@ private: enable_notify_events(); } - void insert_including_mru(int pos, const OUString& rText, const OUString* pId, const OUString* pIconName, VirtualDevice* pImageSurface) + void insert_including_mru(int pos, const OUString& rText, const OUString* pId, const OUString* pIconName, const VirtualDevice* pImageSurface) { disable_notify_events(); GtkTreeIter iter; |