From 785060b22ded6e5d8d6edfdcf4aceb59e0d88e78 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 18 Sep 2018 14:45:09 +0100 Subject: rename to original names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1f4f57b77982a71f9be7cb5cd61116c9aa77189e Reviewed-on: https://gerrit.libreoffice.org/60713 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- cui/source/dialogs/cuigrfflt.cxx | 22 +++++++++++----------- cui/source/factory/dlgfact.cxx | 16 ++++++++-------- cui/source/factory/dlgfact.hxx | 7 +++---- cui/source/inc/cuigrfflt.hxx | 16 ++++++++-------- 4 files changed, 30 insertions(+), 31 deletions(-) (limited to 'cui') diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 1299c6a33d87..4850bd6927ca 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -125,29 +125,29 @@ void CuiGraphicPreviewWindow::Resize() ScaleImageToFit(); } -GraphicFilterDialogController::GraphicFilterDialogController(weld::Window* pParent, +GraphicFilterDialog::GraphicFilterDialog(weld::Window* pParent, const OUString& rUIXMLDescription, const OString& rID, const Graphic& rGraphic) : GenericDialogController(pParent, rUIXMLDescription, rID) - , maModifyHdl(LINK(this, GraphicFilterDialogController, ImplModifyHdl)) + , maModifyHdl(LINK(this, GraphicFilterDialog, ImplModifyHdl)) , mxPreview(new weld::CustomWeld(*m_xBuilder, "preview", maPreview)) { bIsBitmap = rGraphic.GetType() == GraphicType::Bitmap; - maTimer.SetInvokeHandler(LINK(this, GraphicFilterDialogController, ImplPreviewTimeoutHdl)); + maTimer.SetInvokeHandler(LINK(this, GraphicFilterDialog, ImplPreviewTimeoutHdl)); maTimer.SetTimeout(5); maPreview.init(&rGraphic, maModifyHdl); } -IMPL_LINK_NOARG(GraphicFilterDialogController, ImplPreviewTimeoutHdl, Timer *, void) +IMPL_LINK_NOARG(GraphicFilterDialog, ImplPreviewTimeoutHdl, Timer *, void) { maTimer.Stop(); maPreview.SetPreview(GetFilteredGraphic(maPreview.GetScaledOriginal(), maPreview.GetScaleX(), maPreview.GetScaleY())); } -IMPL_LINK_NOARG(GraphicFilterDialogController, ImplModifyHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(GraphicFilterDialog, ImplModifyHdl, LinkParamNone*, void) { if (bIsBitmap) { @@ -158,7 +158,7 @@ IMPL_LINK_NOARG(GraphicFilterDialogController, ImplModifyHdl, LinkParamNone*, vo GraphicFilterMosaic::GraphicFilterMosaic(weld::Window* pParent, const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges) - : GraphicFilterDialogController(pParent, "cui/ui/mosaicdialog.ui", "MosaicDialog", rGraphic) + : GraphicFilterDialog(pParent, "cui/ui/mosaicdialog.ui", "MosaicDialog", rGraphic) , mxMtrWidth(m_xBuilder->weld_metric_spin_button("width", FUNIT_PIXEL)) , mxMtrHeight(m_xBuilder->weld_metric_spin_button("height", FUNIT_PIXEL)) , mxCbxEdges(m_xBuilder->weld_check_button("edges")) @@ -225,7 +225,7 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic, } GraphicFilterSmooth::GraphicFilterSmooth(weld::Window* pParent, const Graphic& rGraphic, double nRadius) - : GraphicFilterDialogController(pParent, "cui/ui/smoothdialog.ui", "SmoothDialog", rGraphic) + : GraphicFilterDialog(pParent, "cui/ui/smoothdialog.ui", "SmoothDialog", rGraphic) , mxMtrRadius(m_xBuilder->weld_spin_button("radius")) { mxMtrRadius->set_value(nRadius * 10); @@ -267,7 +267,7 @@ Graphic GraphicFilterSmooth::GetFilteredGraphic( const Graphic& rGraphic, double GraphicFilterSolarize::GraphicFilterSolarize(weld::Window* pParent, const Graphic& rGraphic, sal_uInt8 cGreyThreshold, bool bInvert) - : GraphicFilterDialogController(pParent, "cui/ui/solarizedialog.ui", "SolarizeDialog", rGraphic) + : GraphicFilterDialog(pParent, "cui/ui/solarizedialog.ui", "SolarizeDialog", rGraphic) , mxMtrThreshold(m_xBuilder->weld_metric_spin_button("value", FUNIT_PERCENT)) , mxCbxInvert(m_xBuilder->weld_check_button("invert")) { @@ -323,7 +323,7 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, doub GraphicFilterSepia::GraphicFilterSepia(weld::Window* pParent, const Graphic& rGraphic, sal_uInt16 nSepiaPercent) - : GraphicFilterDialogController(pParent, "cui/ui/agingdialog.ui", "AgingDialog", rGraphic) + : GraphicFilterDialog(pParent, "cui/ui/agingdialog.ui", "AgingDialog", rGraphic) , mxMtrSepia(m_xBuilder->weld_metric_spin_button("value", FUNIT_PERCENT)) { mxMtrSepia->set_value(nSepiaPercent, FUNIT_PERCENT); @@ -360,7 +360,7 @@ Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic, double, GraphicFilterPoster::GraphicFilterPoster(weld::Window* pParent, const Graphic& rGraphic, sal_uInt16 nPosterCount) - : GraphicFilterDialogController(pParent, "cui/ui/posterdialog.ui", "PosterDialog", rGraphic) + : GraphicFilterDialog(pParent, "cui/ui/posterdialog.ui", "PosterDialog", rGraphic) , mxNumPoster(m_xBuilder->weld_spin_button("value")) { mxNumPoster->set_range(2, rGraphic.GetBitmapEx().GetBitCount()); @@ -416,7 +416,7 @@ void EmbossControl::SetDrawingArea(weld::DrawingArea* pDrawingArea) GraphicFilterEmboss::GraphicFilterEmboss(weld::Window* pParent, const Graphic& rGraphic, RectPoint eLightSource) - : GraphicFilterDialogController(pParent, "cui/ui/embossdialog.ui", "EmbossDialog", rGraphic) + : GraphicFilterDialog(pParent, "cui/ui/embossdialog.ui", "EmbossDialog", rGraphic) , mxCtlLight(new weld::CustomWeld(*m_xBuilder, "lightsource", maCtlLight)) { maCtlLight.SetActualRP(eLightSource); diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index fe4363606089..2af171c3b6f2 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -189,7 +189,7 @@ short AbstractSvxPathSelectDialog_Impl::Execute() IMPL_ABSTDLG_BASE(AbstractSvxHpLinkDlg_Impl); IMPL_ABSTDLG_BASE(AbstractFmSearchDialog_Impl); -short AbstractGraphicFilterDialogController_Impl::Execute() +short AbstractGraphicFilterDialog_Impl::Execute() { return m_xDlg->run(); } @@ -813,7 +813,7 @@ void AbstractFmSearchDialog_Impl::SetActiveField(const OUString& strField) pDlg->SetActiveField(strField); } -Graphic AbstractGraphicFilterDialogController_Impl::GetFilteredGraphic(const Graphic& rGraphic, double fScaleX, double fScaleY) +Graphic AbstractGraphicFilterDialog_Impl::GetFilteredGraphic(const Graphic& rGraphic, double fScaleX, double fScaleY) { return m_xDlg->GetFilteredGraphic(rGraphic, fScaleX, fScaleY); } @@ -1276,37 +1276,37 @@ VclPtr AbstractDialogFactory_Impl::CreateFmSearchDialog( VclPtr AbstractDialogFactory_Impl::CreateGraphicFilterEmboss(weld::Window* pParent, const Graphic& rGraphic) { - return VclPtr::Create(o3tl::make_unique(pParent, rGraphic, RectPoint::MM)); + return VclPtr::Create(o3tl::make_unique(pParent, rGraphic, RectPoint::MM)); } VclPtr AbstractDialogFactory_Impl::CreateGraphicFilterPoster(weld::Window* pParent, const Graphic& rGraphic) { - return VclPtr::Create(o3tl::make_unique(pParent, rGraphic, 16)); + return VclPtr::Create(o3tl::make_unique(pParent, rGraphic, 16)); } VclPtr AbstractDialogFactory_Impl::CreateGraphicFilterSepia(weld::Window* pParent, const Graphic& rGraphic) { - return VclPtr::Create(o3tl::make_unique(pParent, rGraphic, 10)); + return VclPtr::Create(o3tl::make_unique(pParent, rGraphic, 10)); } VclPtr AbstractDialogFactory_Impl::CreateGraphicFilterSmooth(weld::Window* pParent, const Graphic& rGraphic, double nRadius) { - return VclPtr::Create(o3tl::make_unique(pParent, rGraphic, nRadius)); + return VclPtr::Create(o3tl::make_unique(pParent, rGraphic, nRadius)); } VclPtr AbstractDialogFactory_Impl::CreateGraphicFilterSolarize(weld::Window* pParent, const Graphic& rGraphic) { - return VclPtr::Create(o3tl::make_unique(pParent, rGraphic, 128, false /*bInvert*/)); + return VclPtr::Create(o3tl::make_unique(pParent, rGraphic, 128, false /*bInvert*/)); } VclPtr AbstractDialogFactory_Impl::CreateGraphicFilterMosaic(weld::Window* pParent, const Graphic& rGraphic) { - return VclPtr::Create(o3tl::make_unique(pParent, rGraphic, 4, 4, false /*bEnhanceEdges*/)); + return VclPtr::Create(o3tl::make_unique(pParent, rGraphic, 4, 4, false /*bEnhanceEdges*/)); } VclPtr AbstractDialogFactory_Impl::CreateSvxAreaTabDialog(weld::Window* pParent, diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 615f56e52cb1..07b202371d26 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -46,7 +46,6 @@ class SvxHpLinkDlg; class FmSearchDialog; class Graphic; class GraphicFilterDialog; -class GraphicFilterDialogController; class SvxAreaTabDialog; class InsertObjectDialog_Impl; class SvPasteObjectDialog; @@ -470,12 +469,12 @@ class AbstractFmSearchDialog_Impl :public AbstractFmSearchDialog virtual void SetActiveField(const OUString& strField) override; }; -class AbstractGraphicFilterDialogController_Impl : public AbstractGraphicFilterDialog +class AbstractGraphicFilterDialog_Impl : public AbstractGraphicFilterDialog { protected: - std::unique_ptr m_xDlg; + std::unique_ptr m_xDlg; public: - explicit AbstractGraphicFilterDialogController_Impl(std::unique_ptr p) + explicit AbstractGraphicFilterDialog_Impl(std::unique_ptr p) : m_xDlg(std::move(p)) { } diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index 5e70e23ed2c6..ae5169d4b8cc 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -68,7 +68,7 @@ public: const Size& GetGraphicSizePixel() const { return maOrigGraphicSizePixel; } }; -class GraphicFilterDialogController : public weld::GenericDialogController +class GraphicFilterDialog : public weld::GenericDialogController { private: @@ -88,11 +88,11 @@ protected: public: - GraphicFilterDialogController(weld::Window* pParent, const OUString& rUIXMLDescription, const OString& rID, const Graphic& rGraphic); + GraphicFilterDialog(weld::Window* pParent, const OUString& rUIXMLDescription, const OString& rID, const Graphic& rGraphic); virtual Graphic GetFilteredGraphic(const Graphic& rGraphic, double fScaleX, double fScaleY) = 0; }; -class GraphicFilterSmooth : public GraphicFilterDialogController +class GraphicFilterSmooth : public GraphicFilterDialog { private: std::unique_ptr mxMtrRadius; @@ -104,7 +104,7 @@ public: virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) override; }; -class GraphicFilterMosaic : public GraphicFilterDialogController +class GraphicFilterMosaic : public GraphicFilterDialog { private: std::unique_ptr mxMtrWidth; @@ -121,7 +121,7 @@ public: bool IsEnhanceEdges() const { return mxCbxEdges->get_active(); } }; -class GraphicFilterSolarize : public GraphicFilterDialogController +class GraphicFilterSolarize : public GraphicFilterDialog { private: std::unique_ptr mxMtrThreshold; @@ -136,7 +136,7 @@ public: bool IsInvert() const { return mxCbxInvert->get_active(); } }; -class GraphicFilterSepia : public GraphicFilterDialogController +class GraphicFilterSepia : public GraphicFilterDialog { private: std::unique_ptr mxMtrSepia; @@ -147,7 +147,7 @@ public: virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) override; }; -class GraphicFilterPoster : public GraphicFilterDialogController +class GraphicFilterPoster : public GraphicFilterDialog { private: std::unique_ptr mxNumPoster; @@ -173,7 +173,7 @@ public: void SetModifyHdl( const Link& rHdl ) { maModifyHdl = rHdl; } }; -class GraphicFilterEmboss : public GraphicFilterDialogController +class GraphicFilterEmboss : public GraphicFilterDialog { private: EmbossControl maCtlLight; -- cgit