diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-06-15 15:30:16 +0200 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-06-18 15:28:01 +0200 |
| commit | 47b0285d7b37b2f646ae32ca1fe8cf6f1875997a (patch) | |
| tree | 7af1188d264df1fd750402149aef04fe864b97db /vcl | |
| parent | 2d92d754aeb03da256cc617f15d1ae377aa2b651 (diff) | |
Drop winId and KWindowSystem::setMainWindow
as fpicker isn't a separate binary anymore
Change-Id: I9c9c57a21f5dc79714f37f8bc65b998887c29e78
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/kde5/KDE5FilePicker.cxx | 3 | ||||
| -rw-r--r-- | vcl/unx/kde5/KDE5FilePicker.hxx | 4 | ||||
| -rw-r--r-- | vcl/unx/kde5/KDE5FilePicker2.cxx | 1 |
3 files changed, 0 insertions, 8 deletions
diff --git a/vcl/unx/kde5/KDE5FilePicker.cxx b/vcl/unx/kde5/KDE5FilePicker.cxx index 5d9acdcd7a50..19bea46654a3 100644 --- a/vcl/unx/kde5/KDE5FilePicker.cxx +++ b/vcl/unx/kde5/KDE5FilePicker.cxx @@ -40,8 +40,6 @@ KDE5FilePicker::~KDE5FilePicker() delete _dialog; } -void KDE5FilePicker::setWinId(sal_uIntPtr winId) { _winId = winId; } - bool KDE5FilePicker::eventFilter(QObject* o, QEvent* e) { if (e->type() == QEvent::Show && o->isWidgetType()) @@ -49,7 +47,6 @@ bool KDE5FilePicker::eventFilter(QObject* o, QEvent* e) auto* w = static_cast<QWidget*>(o); if (!w->parentWidget() && w->isModal()) { - KWindowSystem::setMainWindow(w, _winId); if (auto* fileWidget = w->findChild<KFileWidget*>({}, Qt::FindDirectChildrenOnly)) fileWidget->setCustomWidget(_extraControls); } diff --git a/vcl/unx/kde5/KDE5FilePicker.hxx b/vcl/unx/kde5/KDE5FilePicker.hxx index 4b45052827c4..69d86c5107a9 100644 --- a/vcl/unx/kde5/KDE5FilePicker.hxx +++ b/vcl/unx/kde5/KDE5FilePicker.hxx @@ -78,8 +78,6 @@ protected: //layout for extra custom controls QGridLayout* _layout; - sal_uIntPtr _winId; - bool allowRemoteUrls; public: @@ -140,8 +138,6 @@ public: // XFilePicker2 functions virtual css::uno::Sequence<OUString> SAL_CALL getSelectedFiles() override; - void setWinId(sal_uIntPtr winId); - // XInitialization virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override; diff --git a/vcl/unx/kde5/KDE5FilePicker2.cxx b/vcl/unx/kde5/KDE5FilePicker2.cxx index cebd2ee4f4f9..b7c3320344bf 100644 --- a/vcl/unx/kde5/KDE5FilePicker2.cxx +++ b/vcl/unx/kde5/KDE5FilePicker2.cxx @@ -82,7 +82,6 @@ KDE5FilePicker::KDE5FilePicker(QFileDialog::FileMode eMode) , _dialog(new QFileDialog(nullptr, {}, QDir::homePath())) , _extraControls(new QWidget) , _layout(new QGridLayout(_extraControls)) - , _winId(0) , allowRemoteUrls(false) { _dialog->setSupportedSchemes({ |