[Libreoffice-commits] core.git: vcl/unx

[Libreoffice Gerrit user]

 vcl/unx/kde5/KDE5FilePicker.hxx  |    6 ------
 vcl/unx/kde5/KDE5FilePicker2.cxx |   27 ---------------------------
 2 files changed, 33 deletions(-)

New commits:
commit 9c960a6b4f80268dc63960c53f8de50e9af6e099
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Tue Feb 5 15:34:31 2019 +0100
Commit:     Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Wed Feb 20 16:45:32 2019 +0100

    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: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/vcl/unx/kde5/KDE5FilePicker.hxx b/vcl/unx/kde5/KDE5FilePicker.hxx
index e8fb54f96fa7..6fff9e44c2a4 100644
--- a/vcl/unx/kde5/KDE5FilePicker.hxx
+++ b/vcl/unx/kde5/KDE5FilePicker.hxx
@@ -80,8 +80,6 @@ public:
     virtual sal_Int16 SAL_CALL execute() override;
 
     // 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 css::uno::Sequence<OUString> SAL_CALL getFiles() override;
 
@@ -150,8 +148,6 @@ protected:
 
 Q_SIGNALS:
     sal_Int16 executeSignal();
-    void setDefaultNameSignal(const OUString& rName);
-    void setDisplayDirectorySignal(const OUString& rDir);
     OUString getDisplayDirectorySignal();
     OUString getDirectorySignal();
     void setValueSignal(sal_Int16 nControlId, sal_Int16 nControlAction,
@@ -169,8 +165,6 @@ Q_SIGNALS:
     css::uno::Sequence<OUString> getSelectedFilesSignal();
 
 private Q_SLOTS:
-    void setDefaultNameSlot(const OUString& rName) { return setDefaultName(rName); }
-    void setDisplayDirectorySlot(const OUString& rDir) { return setDisplayDirectory(rDir); }
     OUString getDisplayDirectorySlot() { return implGetDirectory(); }
     OUString getDirectorySlot() { return implGetDirectory(); }
     void setValueSlot(sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any& rValue)
diff --git a/vcl/unx/kde5/KDE5FilePicker2.cxx b/vcl/unx/kde5/KDE5FilePicker2.cxx
index 5f8aa5d25365..2d295cf128c5 100644
--- a/vcl/unx/kde5/KDE5FilePicker2.cxx
+++ b/vcl/unx/kde5/KDE5FilePicker2.cxx
@@ -104,10 +104,6 @@ KDE5FilePicker::KDE5FilePicker(QFileDialog::FileMode eMode)
             Qt::BlockingQueuedConnection);
 
     // XFilePicker
-    connect(this, &KDE5FilePicker::setDefaultNameSignal, this, &KDE5FilePicker::setDefaultNameSlot,
-            Qt::BlockingQueuedConnection);
-    connect(this, &KDE5FilePicker::setDisplayDirectorySignal, this,
-            &KDE5FilePicker::setDisplayDirectorySlot, Qt::BlockingQueuedConnection);
     connect(this, &KDE5FilePicker::getDisplayDirectorySignal, this,
             &KDE5FilePicker::getDisplayDirectorySlot, Qt::BlockingQueuedConnection);
     // XFolderPicker
@@ -164,29 +160,6 @@ sal_Int16 SAL_CALL KDE5FilePicker::execute()
     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()
 {
     if (qApp->thread() != QThread::currentThread())