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

kde5 fpicker: Drop 'getFiles' and 'getSelectedFiles'

... and related signals/slots.

Those from the Qt5FilePicker base class do the same thing,
except for one 'SolarMutexReleaser' that was commented out
in 'KDE5FilePicker::getFiles' for no apparent reason since
that line was added in commit 8fb0881a.

Take over the slightly nicer syntax for the range-based for loop
from 'KDE5FilePicker::getSelectedFiles' to
'Qt5FilePicker::getSelectedFiles'.

Change-Id: I419f933d256f3b85eccaea85803b4890770efa24
Reviewed-on: https://gerrit.libreoffice.org/68046
Tested-by: Jenkins
Reviewed-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
üst 9c960a6b
...@@ -300,9 +300,11 @@ uno::Sequence<OUString> SAL_CALL Qt5FilePicker::getSelectedFiles() ...@@ -300,9 +300,11 @@ uno::Sequence<OUString> SAL_CALL Qt5FilePicker::getSelectedFiles()
} }
QList<QUrl> urls = m_pFileDialog->selectedUrls(); QList<QUrl> urls = m_pFileDialog->selectedUrls();
uno::Sequence<OUString> seq(urls.size()); uno::Sequence<OUString> seq(urls.size());
int i = 0;
foreach (const QUrl& url, urls) size_t i = 0;
seq[i++] = toOUString(url.toString()); for (const QUrl& aURL : urls)
seq[i++] = toOUString(aURL.toString());
return seq; return seq;
} }
......
...@@ -81,7 +81,6 @@ public: ...@@ -81,7 +81,6 @@ public:
// XFilePicker functions // XFilePicker functions
virtual OUString SAL_CALL getDisplayDirectory() override; virtual OUString SAL_CALL getDisplayDirectory() override;
virtual css::uno::Sequence<OUString> SAL_CALL getFiles() override;
// XFilterManager functions // XFilterManager functions
virtual void SAL_CALL appendFilter(const OUString& rTitle, const OUString& rFilter) override; virtual void SAL_CALL appendFilter(const OUString& rTitle, const OUString& rFilter) override;
...@@ -117,9 +116,6 @@ public: ...@@ -117,9 +116,6 @@ public:
virtual sal_Bool SAL_CALL getShowState( ); virtual sal_Bool SAL_CALL getShowState( );
*/ */
// XFilePicker2 functions
virtual css::uno::Sequence<OUString> SAL_CALL getSelectedFiles() override;
// XInitialization // XInitialization
virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override; virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override;
...@@ -161,8 +157,6 @@ Q_SIGNALS: ...@@ -161,8 +157,6 @@ Q_SIGNALS:
const css::uno::Sequence<css::beans::StringPair>& rFilters); const css::uno::Sequence<css::beans::StringPair>& rFilters);
void setCurrentFilterSignal(const OUString& rFilter); void setCurrentFilterSignal(const OUString& rFilter);
OUString getCurrentFilterSignal(); OUString getCurrentFilterSignal();
css::uno::Sequence<OUString> getFilesSignal();
css::uno::Sequence<OUString> getSelectedFilesSignal();
private Q_SLOTS: private Q_SLOTS:
OUString getDisplayDirectorySlot() { return implGetDirectory(); } OUString getDisplayDirectorySlot() { return implGetDirectory(); }
...@@ -202,7 +196,6 @@ private Q_SLOTS: ...@@ -202,7 +196,6 @@ private Q_SLOTS:
void setCurrentFilterSlot(const OUString& rFilter) { return setCurrentFilter(rFilter); } void setCurrentFilterSlot(const OUString& rFilter) { return setCurrentFilter(rFilter); }
OUString getCurrentFilterSlot() { return getCurrentFilter(); } OUString getCurrentFilterSlot() { return getCurrentFilter(); }
css::uno::Sequence<OUString> getSelectedFilesSlot() { return getFiles(); }
}; };
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -130,11 +130,6 @@ KDE5FilePicker::KDE5FilePicker(QFileDialog::FileMode eMode) ...@@ -130,11 +130,6 @@ KDE5FilePicker::KDE5FilePicker(QFileDialog::FileMode eMode)
Qt::BlockingQueuedConnection); Qt::BlockingQueuedConnection);
connect(this, &KDE5FilePicker::enableControlSignal, this, &KDE5FilePicker::enableControlSlot, connect(this, &KDE5FilePicker::enableControlSignal, this, &KDE5FilePicker::enableControlSlot,
Qt::BlockingQueuedConnection); Qt::BlockingQueuedConnection);
// XFilePicker2
connect(this, &KDE5FilePicker::getSelectedFilesSignal, this,
&KDE5FilePicker::getSelectedFilesSlot, Qt::BlockingQueuedConnection);
connect(this, &KDE5FilePicker::getFilesSignal, this, &KDE5FilePicker::getFiles,
Qt::BlockingQueuedConnection);
// used to set the custom controls // used to set the custom controls
qApp->installEventFilter(this); qApp->installEventFilter(this);
...@@ -171,41 +166,6 @@ OUString SAL_CALL KDE5FilePicker::getDisplayDirectory() ...@@ -171,41 +166,6 @@ OUString SAL_CALL KDE5FilePicker::getDisplayDirectory()
return implGetDirectory(); return implGetDirectory();
} }
uno::Sequence<OUString> SAL_CALL KDE5FilePicker::getFiles()
{
if (qApp->thread() != QThread::currentThread())
{
//SolarMutexReleaser aReleaser;
return Q_EMIT getFilesSignal();
}
uno::Sequence<OUString> seq = getSelectedFiles();
if (seq.getLength() > 1)
seq.realloc(1);
return seq;
}
// XFilePicker2
uno::Sequence<OUString> SAL_CALL KDE5FilePicker::getSelectedFiles()
{
if (qApp->thread() != QThread::currentThread())
{
SolarMutexReleaser aReleaser;
return Q_EMIT getSelectedFilesSignal();
}
QList<QUrl> aURLs = m_pFileDialog->selectedUrls();
uno::Sequence<OUString> seq(aURLs.size());
size_t i = 0;
for (auto& aURL : aURLs)
{
seq[i++] = toOUString(aURL.toString());
}
return seq;
}
// XFilterManager // XFilterManager
void SAL_CALL KDE5FilePicker::appendFilter(const OUString& title, const OUString& filter) void SAL_CALL KDE5FilePicker::appendFilter(const OUString& title, const OUString& filter)
{ {
......
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