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

kde5 fpicker: Drop 'setDefaultName' and 'setDisplayDirectory'

... and related signals/slots.
They are the same as in the Qt5FilePicker base class.

Change-Id: I115d0daa6beace44b9c791fc892d7cf553c562bb
Reviewed-on: https://gerrit.libreoffice.org/68045
Tested-by: Jenkins
Reviewed-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 9c960a6b)
Reviewed-on: https://gerrit.libreoffice.org/72642
üst 15e428ad
...@@ -80,8 +80,6 @@ public: ...@@ -80,8 +80,6 @@ public:
virtual sal_Int16 SAL_CALL execute() override; virtual sal_Int16 SAL_CALL execute() override;
// XFilePicker functions // XFilePicker functions
virtual void SAL_CALL setDefaultName(const OUString& rName) override;
virtual void SAL_CALL setDisplayDirectory(const OUString& rDirectory) override;
virtual OUString SAL_CALL getDisplayDirectory() override; virtual OUString SAL_CALL getDisplayDirectory() override;
virtual css::uno::Sequence<OUString> SAL_CALL getFiles() override; virtual css::uno::Sequence<OUString> SAL_CALL getFiles() override;
...@@ -149,8 +147,6 @@ protected: ...@@ -149,8 +147,6 @@ protected:
Q_SIGNALS: Q_SIGNALS:
sal_Int16 executeSignal(); sal_Int16 executeSignal();
void setDefaultNameSignal(const OUString& rName);
void setDisplayDirectorySignal(const OUString& rDir);
OUString getDisplayDirectorySignal(); OUString getDisplayDirectorySignal();
OUString getDirectorySignal(); OUString getDirectorySignal();
void setValueSignal(sal_Int16 nControlId, sal_Int16 nControlAction, void setValueSignal(sal_Int16 nControlId, sal_Int16 nControlAction,
...@@ -168,8 +164,6 @@ Q_SIGNALS: ...@@ -168,8 +164,6 @@ Q_SIGNALS:
css::uno::Sequence<OUString> getSelectedFilesSignal(); css::uno::Sequence<OUString> getSelectedFilesSignal();
private Q_SLOTS: private Q_SLOTS:
void setDefaultNameSlot(const OUString& rName) { return setDefaultName(rName); }
void setDisplayDirectorySlot(const OUString& rDir) { return setDisplayDirectory(rDir); }
OUString getDisplayDirectorySlot() { return implGetDirectory(); } OUString getDisplayDirectorySlot() { return implGetDirectory(); }
OUString getDirectorySlot() { return implGetDirectory(); } OUString getDirectorySlot() { return implGetDirectory(); }
void setValueSlot(sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any& rValue) void setValueSlot(sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any& rValue)
......
...@@ -103,10 +103,6 @@ KDE5FilePicker::KDE5FilePicker(QFileDialog::FileMode eMode) ...@@ -103,10 +103,6 @@ KDE5FilePicker::KDE5FilePicker(QFileDialog::FileMode eMode)
Qt::BlockingQueuedConnection); Qt::BlockingQueuedConnection);
// XFilePicker // XFilePicker
connect(this, &KDE5FilePicker::setDefaultNameSignal, this, &KDE5FilePicker::setDefaultNameSlot,
Qt::BlockingQueuedConnection);
connect(this, &KDE5FilePicker::setDisplayDirectorySignal, this,
&KDE5FilePicker::setDisplayDirectorySlot, Qt::BlockingQueuedConnection);
connect(this, &KDE5FilePicker::getDisplayDirectorySignal, this, connect(this, &KDE5FilePicker::getDisplayDirectorySignal, this,
&KDE5FilePicker::getDisplayDirectorySlot, Qt::BlockingQueuedConnection); &KDE5FilePicker::getDisplayDirectorySlot, Qt::BlockingQueuedConnection);
// XFolderPicker // XFolderPicker
...@@ -163,29 +159,6 @@ sal_Int16 SAL_CALL KDE5FilePicker::execute() ...@@ -163,29 +159,6 @@ sal_Int16 SAL_CALL KDE5FilePicker::execute()
return m_pFileDialog->exec() == QFileDialog::Accepted ? 1 : 0; return m_pFileDialog->exec() == QFileDialog::Accepted ? 1 : 0;
} }
void SAL_CALL KDE5FilePicker::setDefaultName(const OUString& name)
{
if (qApp->thread() != QThread::currentThread())
{
SolarMutexReleaser aReleaser;
return Q_EMIT setDefaultNameSignal(name);
}
m_pFileDialog->selectFile(toQString(name));
}
void SAL_CALL KDE5FilePicker::setDisplayDirectory(const OUString& dir)
{
if (qApp->thread() != QThread::currentThread())
{
SolarMutexReleaser aReleaser;
return Q_EMIT setDisplayDirectorySignal(dir);
}
QString qDir(toQString(dir));
m_pFileDialog->setDirectoryUrl(QUrl(qDir));
}
OUString SAL_CALL KDE5FilePicker::getDisplayDirectory() OUString SAL_CALL KDE5FilePicker::getDisplayDirectory()
{ {
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