diff options
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/qt5/QtInstanceDialog.hxx | 16 | ||||
| -rw-r--r-- | vcl/inc/qt5/QtInstanceMessageDialog.hxx | 13 |
2 files changed, 14 insertions, 15 deletions
diff --git a/vcl/inc/qt5/QtInstanceDialog.hxx b/vcl/inc/qt5/QtInstanceDialog.hxx index 6c00df7181fb..16db9acd1d1e 100644 --- a/vcl/inc/qt5/QtInstanceDialog.hxx +++ b/vcl/inc/qt5/QtInstanceDialog.hxx @@ -17,15 +17,20 @@ class QtInstanceDialog : public QObject, public QtInstanceWindow, public virtual std::unique_ptr<QDialog> m_pDialog; + // the DialogController/Dialog/function passed to the runAsync variants + std::shared_ptr<weld::DialogController> m_xRunAsyncDialogController; + std::shared_ptr<weld::Dialog> m_xRunAsyncDialog; + std::function<void(sal_Int32)> m_aRunAsyncFunc; + public: QtInstanceDialog(QDialog* pDialog); ~QtInstanceDialog(); - virtual bool runAsync(std::shared_ptr<Dialog> const&, - const std::function<void(sal_Int32)>&) override; + virtual bool runAsync(const std::shared_ptr<weld::DialogController>& rxOwner, + const std::function<void(sal_Int32)>& func) override; - virtual bool runAsync(const std::shared_ptr<weld::DialogController>&, - const std::function<void(sal_Int32)>&) override; + virtual bool runAsync(std::shared_ptr<Dialog> const& rxSelf, + const std::function<void(sal_Int32)>& func) override; virtual void collapse(weld::Widget*, weld::Widget*) override; @@ -55,6 +60,9 @@ public: * int VCL response code of that button. */ static const char* const PROPERTY_VCL_RESPONSE_CODE; + +protected slots: + virtual void dialogFinished(int nResult); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/qt5/QtInstanceMessageDialog.hxx b/vcl/inc/qt5/QtInstanceMessageDialog.hxx index ea532a6eabb2..a410a8fd5dfc 100644 --- a/vcl/inc/qt5/QtInstanceMessageDialog.hxx +++ b/vcl/inc/qt5/QtInstanceMessageDialog.hxx @@ -20,11 +20,6 @@ class QtInstanceMessageDialog : public QtInstanceDialog, public virtual weld::Me private: QMessageBox* m_pMessageDialog; - // the DialogController/Dialog/function passed to the runAsync variants - std::shared_ptr<weld::DialogController> m_xRunAsyncDialogController; - std::shared_ptr<weld::Dialog> m_xRunAsyncDialog; - std::function<void(sal_Int32)> m_aRunAsyncFunc; - public: QtInstanceMessageDialog(QMessageBox* pMessageDialog); @@ -44,17 +39,13 @@ public: virtual void set_default_response(int nResponse) override; QtInstanceButton* weld_widget_for_response(int nResponse) override; virtual int run() override; - virtual bool runAsync(std::shared_ptr<weld::DialogController> const& rxOwner, - const std::function<void(sal_Int32)>& func) override; - virtual bool runAsync(std::shared_ptr<Dialog> const& rxSelf, - const std::function<void(sal_Int32)>& func) override; virtual void response(int nResponse) override; private: virtual QPushButton* buttonForResponseCode(int nResponse); -private slots: - void dialogFinished(int nResult); +protected slots: + virtual void dialogFinished(int nResult) override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |