Kaydet (Commit) 15e428ad authored tarafından Michael Weghorn's avatar Michael Weghorn Kaydeden (comit) Katarina Behrens

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: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 4a5761b6)
Reviewed-on: https://gerrit.libreoffice.org/72641
üst 74a01340
...@@ -77,7 +77,6 @@ public: ...@@ -77,7 +77,6 @@ public:
virtual ~KDE5FilePicker() override; virtual ~KDE5FilePicker() override;
// XExecutableDialog functions // XExecutableDialog functions
virtual void SAL_CALL setTitle(const OUString& rTitle) override;
virtual sal_Int16 SAL_CALL execute() override; virtual sal_Int16 SAL_CALL execute() override;
// XFilePicker functions // XFilePicker functions
...@@ -150,7 +149,6 @@ protected: ...@@ -150,7 +149,6 @@ protected:
Q_SIGNALS: Q_SIGNALS:
sal_Int16 executeSignal(); sal_Int16 executeSignal();
void setTitleSignal(const OUString& rTitle);
void setDefaultNameSignal(const OUString& rName); void setDefaultNameSignal(const OUString& rName);
void setDisplayDirectorySignal(const OUString& rDir); void setDisplayDirectorySignal(const OUString& rDir);
OUString getDisplayDirectorySignal(); OUString getDisplayDirectorySignal();
...@@ -170,7 +168,6 @@ Q_SIGNALS: ...@@ -170,7 +168,6 @@ Q_SIGNALS:
css::uno::Sequence<OUString> getSelectedFilesSignal(); css::uno::Sequence<OUString> getSelectedFilesSignal();
private Q_SLOTS: private Q_SLOTS:
void setTitleSlot(const OUString& rTitle) { return setTitle(rTitle); }
void setDefaultNameSlot(const OUString& rName) { return setDefaultName(rName); } void setDefaultNameSlot(const OUString& rName) { return setDefaultName(rName); }
void setDisplayDirectorySlot(const OUString& rDir) { return setDisplayDirectory(rDir); } void setDisplayDirectorySlot(const OUString& rDir) { return setDisplayDirectory(rDir); }
OUString getDisplayDirectorySlot() { return implGetDirectory(); } OUString getDisplayDirectorySlot() { return implGetDirectory(); }
......
...@@ -102,9 +102,6 @@ KDE5FilePicker::KDE5FilePicker(QFileDialog::FileMode eMode) ...@@ -102,9 +102,6 @@ KDE5FilePicker::KDE5FilePicker(QFileDialog::FileMode eMode)
connect(this, &KDE5FilePicker::executeSignal, this, &KDE5FilePicker::execute, connect(this, &KDE5FilePicker::executeSignal, this, &KDE5FilePicker::execute,
Qt::BlockingQueuedConnection); Qt::BlockingQueuedConnection);
// XExecutableDialog
connect(this, &KDE5FilePicker::setTitleSignal, this, &KDE5FilePicker::setTitleSlot,
Qt::BlockingQueuedConnection);
// XFilePicker // XFilePicker
connect(this, &KDE5FilePicker::setDefaultNameSignal, this, &KDE5FilePicker::setDefaultNameSlot, connect(this, &KDE5FilePicker::setDefaultNameSignal, this, &KDE5FilePicker::setDefaultNameSlot,
Qt::BlockingQueuedConnection); Qt::BlockingQueuedConnection);
...@@ -148,18 +145,6 @@ KDE5FilePicker::KDE5FilePicker(QFileDialog::FileMode eMode) ...@@ -148,18 +145,6 @@ KDE5FilePicker::KDE5FilePicker(QFileDialog::FileMode eMode)
KDE5FilePicker::~KDE5FilePicker() { delete _extraControls; } 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() sal_Int16 SAL_CALL KDE5FilePicker::execute()
{ {
if (qApp->thread() != QThread::currentThread()) if (qApp->thread() != QThread::currentThread())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment