diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2019-02-05 15:22:10 +0100 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2019-02-20 16:44:09 +0100 |
| commit | 4a5761b6c3d504b3c54d3cb3e1ecd6e26b0c7690 (patch) | |
| tree | ce03ab0a3c683ac72287e7cee35c1e0756ce7cd8 | |
| parent | 1e9148f96341424d5403f2e5175937e289010701 (diff) | |
Drop KDE5FilePicker::setTitle and related signals/slots
Base class's 'Qt5FilePicker::setTitle' is the same.
Change-Id: I071bf5f962c2d8b0821d78e97793c8637f5c0a1b
Reviewed-on: https://gerrit.libreoffice.org/68044
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
| -rw-r--r-- | vcl/unx/kde5/KDE5FilePicker.hxx | 3 | ||||
| -rw-r--r-- | vcl/unx/kde5/KDE5FilePicker2.cxx | 15 |
2 files changed, 0 insertions, 18 deletions
diff --git a/vcl/unx/kde5/KDE5FilePicker.hxx b/vcl/unx/kde5/KDE5FilePicker.hxx index 09a787f1a393..e8fb54f96fa7 100644 --- a/vcl/unx/kde5/KDE5FilePicker.hxx +++ b/vcl/unx/kde5/KDE5FilePicker.hxx @@ -77,7 +77,6 @@ public: virtual ~KDE5FilePicker() override; // XExecutableDialog functions - virtual void SAL_CALL setTitle(const OUString& rTitle) override; virtual sal_Int16 SAL_CALL execute() override; // XFilePicker functions @@ -151,7 +150,6 @@ protected: Q_SIGNALS: sal_Int16 executeSignal(); - void setTitleSignal(const OUString& rTitle); void setDefaultNameSignal(const OUString& rName); void setDisplayDirectorySignal(const OUString& rDir); OUString getDisplayDirectorySignal(); @@ -171,7 +169,6 @@ Q_SIGNALS: css::uno::Sequence<OUString> getSelectedFilesSignal(); private Q_SLOTS: - void setTitleSlot(const OUString& rTitle) { return setTitle(rTitle); } void setDefaultNameSlot(const OUString& rName) { return setDefaultName(rName); } void setDisplayDirectorySlot(const OUString& rDir) { return setDisplayDirectory(rDir); } OUString getDisplayDirectorySlot() { return implGetDirectory(); } diff --git a/vcl/unx/kde5/KDE5FilePicker2.cxx b/vcl/unx/kde5/KDE5FilePicker2.cxx index 5116a80af7c7..5f8aa5d25365 100644 --- a/vcl/unx/kde5/KDE5FilePicker2.cxx +++ b/vcl/unx/kde5/KDE5FilePicker2.cxx @@ -103,9 +103,6 @@ KDE5FilePicker::KDE5FilePicker(QFileDialog::FileMode eMode) connect(this, &KDE5FilePicker::executeSignal, this, &KDE5FilePicker::execute, Qt::BlockingQueuedConnection); - // XExecutableDialog - connect(this, &KDE5FilePicker::setTitleSignal, this, &KDE5FilePicker::setTitleSlot, - Qt::BlockingQueuedConnection); // XFilePicker connect(this, &KDE5FilePicker::setDefaultNameSignal, this, &KDE5FilePicker::setDefaultNameSlot, Qt::BlockingQueuedConnection); @@ -149,18 +146,6 @@ KDE5FilePicker::KDE5FilePicker(QFileDialog::FileMode eMode) KDE5FilePicker::~KDE5FilePicker() { delete _extraControls; } -// XExecutableDialog -void SAL_CALL KDE5FilePicker::setTitle(const OUString& title) -{ - if (qApp->thread() != QThread::currentThread()) - { - SolarMutexReleaser aReleaser; - return Q_EMIT setTitleSignal(title); - } - - m_pFileDialog->setWindowTitle(toQString(title)); -} - sal_Int16 SAL_CALL KDE5FilePicker::execute() { if (qApp->thread() != QThread::currentThread()) |