From: Laurent Montel Date: Wed, 27 Feb 2019 07:59:18 +0000 (+0100) Subject: remove deprecated methods X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/4315e5c9380e22eed483f00adac3d075369eae49 remove deprecated methods --- diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp index e0e9bf4bd..6dae730eb 100644 --- a/src/dolphintabpage.cpp +++ b/src/dolphintabpage.cpp @@ -33,7 +33,7 @@ DolphinTabPage::DolphinTabPage(const QUrl &primaryUrl, const QUrl &secondaryUrl, { QVBoxLayout* layout = new QVBoxLayout(this); layout->setSpacing(0); - layout->setMargin(0); + layout->setContentsMargins(0, 0, 0, 0); m_splitter = new QSplitter(Qt::Horizontal, this); m_splitter->setChildrenCollapsible(false); diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 767f2ae8f..cdce157eb 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -71,12 +71,12 @@ DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) : m_topLayout = new QVBoxLayout(this); m_topLayout->setSpacing(0); - m_topLayout->setMargin(0); + m_topLayout->setContentsMargins(0, 0, 0, 0); m_navigatorWidget = new QWidget(this); QHBoxLayout* navigatorLayout = new QHBoxLayout(m_navigatorWidget); navigatorLayout->setSpacing(0); - navigatorLayout->setMargin(0); + navigatorLayout->setContentsMargins(0, 0, 0, 0); m_urlNavigator = new KUrlNavigator(DolphinPlacesModelSingleton::instance().placesModel(), url, this); connect(m_urlNavigator, &KUrlNavigator::activated, diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp index 813a50838..b4fef22a8 100644 --- a/src/filterbar/filterbar.cpp +++ b/src/filterbar/filterbar.cpp @@ -60,7 +60,7 @@ FilterBar::FilterBar(QWidget* parent) : // Apply layout QHBoxLayout* hLayout = new QHBoxLayout(this); - hLayout->setMargin(0); + hLayout->setContentsMargins(0, 0, 0, 0); hLayout->addWidget(closeButton); hLayout->addWidget(filterLabel); hLayout->addWidget(m_filterInput); diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp index c98a2150c..95953f66b 100644 --- a/src/panels/folders/folderspanel.cpp +++ b/src/panels/folders/folderspanel.cpp @@ -178,7 +178,7 @@ void FoldersPanel::showEvent(QShowEvent* event) container->setEnabledFrame(false); QVBoxLayout* layout = new QVBoxLayout(this); - layout->setMargin(0); + layout->setContentsMargins(0, 0, 0, 0); layout->addWidget(container); } diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp index 494429b8c..95f535713 100644 --- a/src/panels/information/phononwidget.cpp +++ b/src/panels/information/phononwidget.cpp @@ -104,10 +104,10 @@ void PhononWidget::showEvent(QShowEvent *event) if (!m_topLayout) { m_topLayout = new QVBoxLayout(this); - m_topLayout->setMargin(0); + m_topLayout->setContentsMargins(0, 0, 0, 0); QHBoxLayout *controlsLayout = new QHBoxLayout(this); - controlsLayout->setMargin(0); + controlsLayout->setContentsMargins(0, 0, 0, 0); controlsLayout->setSpacing(0); m_playButton = new QToolButton(this); diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp index 93fba7168..d0dbcce88 100644 --- a/src/panels/places/placespanel.cpp +++ b/src/panels/places/placespanel.cpp @@ -139,7 +139,7 @@ void PlacesPanel::showEvent(QShowEvent* event) container->setEnabledFrame(false); QVBoxLayout* layout = new QVBoxLayout(this); - layout->setMargin(0); + layout->setContentsMargins(0, 0, 0, 0); layout->addWidget(container); selectClosestItem(); diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp index 3377bab24..8dedd0be1 100644 --- a/src/panels/terminal/terminalpanel.cpp +++ b/src/panels/terminal/terminalpanel.cpp @@ -53,7 +53,7 @@ TerminalPanel::TerminalPanel(QWidget* parent) : m_sendCdToTerminalHistory() { m_layout = new QVBoxLayout(this); - m_layout->setMargin(0); + m_layout->setContentsMargins(0, 0, 0, 0); } TerminalPanel::~TerminalPanel() diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp index 61f5c2db4..9c41db9c5 100644 --- a/src/search/dolphinsearchbox.cpp +++ b/src/search/dolphinsearchbox.cpp @@ -382,7 +382,7 @@ void DolphinSearchBox::init() // Apply layout for the search input QHBoxLayout* searchInputLayout = new QHBoxLayout(); - searchInputLayout->setMargin(0); + searchInputLayout->setContentsMargins(0, 0, 0, 0); searchInputLayout->addWidget(closeButton); searchInputLayout->addWidget(m_searchLabel); searchInputLayout->addWidget(m_searchInput); @@ -442,7 +442,7 @@ void DolphinSearchBox::init() // Apply layout for the options QHBoxLayout* optionsLayout = new QHBoxLayout(); - optionsLayout->setMargin(0); + optionsLayout->setContentsMargins(0, 0, 0, 0); optionsLayout->addWidget(m_fileNameButton); optionsLayout->addWidget(m_contentButton); optionsLayout->addWidget(m_separator); @@ -468,7 +468,7 @@ void DolphinSearchBox::init() m_optionsScrollArea->setWidgetResizable(true); m_topLayout = new QVBoxLayout(this); - m_topLayout->setMargin(0); + m_topLayout->setContentsMargins(0, 0, 0, 0); m_topLayout->addLayout(searchInputLayout); m_topLayout->addWidget(m_optionsScrollArea); m_topLayout->addWidget(m_facetsWidget); diff --git a/src/settings/general/generalsettingspage.cpp b/src/settings/general/generalsettingspage.cpp index 3793fcdb5..daa74aff1 100644 --- a/src/settings/general/generalsettingspage.cpp +++ b/src/settings/general/generalsettingspage.cpp @@ -35,7 +35,7 @@ GeneralSettingsPage::GeneralSettingsPage(const QUrl& url, QWidget* parent) : m_pages() { QVBoxLayout* topLayout = new QVBoxLayout(this); - topLayout->setMargin(0); + topLayout->setContentsMargins(0, 0, 0, 0); QTabWidget* tabWidget = new QTabWidget(this); diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp index bd1124ada..0df806e41 100644 --- a/src/settings/kcm/kcmdolphingeneral.cpp +++ b/src/settings/kcm/kcmdolphingeneral.cpp @@ -41,7 +41,7 @@ DolphinGeneralConfigModule::DolphinGeneralConfigModule(QWidget* parent, const QV setButtons(KCModule::Default | KCModule::Help); QVBoxLayout* topLayout = new QVBoxLayout(this); - topLayout->setMargin(0); + topLayout->setContentsMargins(0, 0, 0, 0); QTabWidget* tabWidget = new QTabWidget(this); diff --git a/src/settings/kcm/kcmdolphinnavigation.cpp b/src/settings/kcm/kcmdolphinnavigation.cpp index bbc07365d..cc073247a 100644 --- a/src/settings/kcm/kcmdolphinnavigation.cpp +++ b/src/settings/kcm/kcmdolphinnavigation.cpp @@ -37,7 +37,7 @@ DolphinNavigationConfigModule::DolphinNavigationConfigModule(QWidget* parent, co setButtons(KCModule::Default | KCModule::Help); QVBoxLayout* topLayout = new QVBoxLayout(this); - topLayout->setMargin(0); + topLayout->setContentsMargins(0, 0, 0, 0); m_navigation = new NavigationSettingsPage(this); connect(m_navigation, &NavigationSettingsPage::changed, this, static_cast(&DolphinNavigationConfigModule::changed)); diff --git a/src/settings/kcm/kcmdolphinservices.cpp b/src/settings/kcm/kcmdolphinservices.cpp index 202bc5cf5..91f4fd121 100644 --- a/src/settings/kcm/kcmdolphinservices.cpp +++ b/src/settings/kcm/kcmdolphinservices.cpp @@ -37,7 +37,7 @@ DolphinServicesConfigModule::DolphinServicesConfigModule(QWidget* parent, const setButtons(KCModule::Default | KCModule::Help); QVBoxLayout* topLayout = new QVBoxLayout(this); - topLayout->setMargin(0); + topLayout->setContentsMargins(0, 0, 0, 0); m_services = new ServicesSettingsPage(this); connect(m_services, &ServicesSettingsPage::changed, this, static_cast(&DolphinServicesConfigModule::changed)); diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp index 8b04baeb6..584b7f64c 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.cpp +++ b/src/settings/kcm/kcmdolphinviewmodes.cpp @@ -42,7 +42,7 @@ DolphinViewModesConfigModule::DolphinViewModesConfigModule(QWidget* parent, cons setButtons(KCModule::Default | KCModule::Help); QVBoxLayout* topLayout = new QVBoxLayout(this); - topLayout->setMargin(0); + topLayout->setContentsMargins(0, 0, 0, 0); QTabWidget* tabWidget = new QTabWidget(this); diff --git a/src/settings/navigation/navigationsettingspage.cpp b/src/settings/navigation/navigationsettingspage.cpp index 82015480a..aeb8019a5 100644 --- a/src/settings/navigation/navigationsettingspage.cpp +++ b/src/settings/navigation/navigationsettingspage.cpp @@ -34,7 +34,7 @@ NavigationSettingsPage::NavigationSettingsPage(QWidget* parent) : QVBoxLayout* topLayout = new QVBoxLayout(this); QWidget* vBox = new QWidget(this); QVBoxLayout *vBoxLayout = new QVBoxLayout(vBox); - vBoxLayout->setMargin(0); + vBoxLayout->setContentsMargins(0, 0, 0, 0); vBoxLayout->setAlignment(Qt::AlignTop); m_openArchivesAsFolder = new QCheckBox(i18nc("@option:check", "Open archives as folder"), vBox); diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp index f8b7daa79..23d8731d4 100644 --- a/src/settings/startup/startupsettingspage.cpp +++ b/src/settings/startup/startupsettingspage.cpp @@ -50,7 +50,7 @@ StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) : // create 'Home URL' editor QHBoxLayout* homeUrlBoxLayout = new QHBoxLayout(); - homeUrlBoxLayout->setMargin(0); + homeUrlBoxLayout->setContentsMargins(0, 0, 0, 0); m_homeUrl = new QLineEdit(); m_homeUrl->setClearButtonEnabled(true); @@ -67,7 +67,7 @@ StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) : this, &StartupSettingsPage::selectHomeUrl); QHBoxLayout* buttonBoxLayout = new QHBoxLayout(); - buttonBoxLayout->setMargin(0); + buttonBoxLayout->setContentsMargins(0, 0, 0, 0); QPushButton* useCurrentButton = new QPushButton(i18nc("@action:button", "Use Current Location")); buttonBoxLayout->addWidget(useCurrentButton); @@ -79,7 +79,7 @@ StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) : this, &StartupSettingsPage::useDefaultLocation); QVBoxLayout* homeBoxLayout = new QVBoxLayout(); - homeBoxLayout->setMargin(0); + homeBoxLayout->setContentsMargins(0, 0, 0, 0); homeBoxLayout->addLayout(homeUrlBoxLayout); homeBoxLayout->addLayout(buttonBoxLayout); diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp index ff42e39aa..e7b4589e3 100644 --- a/src/settings/viewmodes/dolphinfontrequester.cpp +++ b/src/settings/viewmodes/dolphinfontrequester.cpp @@ -35,7 +35,7 @@ DolphinFontRequester::DolphinFontRequester(QWidget* parent) : m_customFont() { QHBoxLayout* topLayout = new QHBoxLayout(this); - topLayout->setMargin(0); + topLayout->setContentsMargins(0, 0, 0, 0); m_modeCombo = new QComboBox(this); m_modeCombo->addItem(i18nc("@item:inlistbox Font", "System Font")); diff --git a/src/settings/viewmodes/viewsettingspage.cpp b/src/settings/viewmodes/viewsettingspage.cpp index dd85a6159..be2226db6 100644 --- a/src/settings/viewmodes/viewsettingspage.cpp +++ b/src/settings/viewmodes/viewsettingspage.cpp @@ -33,7 +33,7 @@ ViewSettingsPage::ViewSettingsPage(QWidget* parent) : m_tabs() { QVBoxLayout* topLayout = new QVBoxLayout(this); - topLayout->setMargin(0); + topLayout->setContentsMargins(0, 0, 0, 0); QTabWidget* tabWidget = new QTabWidget(this); diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp index a7aa87098..3ccf9a342 100644 --- a/src/settings/viewpropertiesdialog.cpp +++ b/src/settings/viewpropertiesdialog.cpp @@ -149,7 +149,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : additionalInfoBox->setLayout(innerLayout); QHBoxLayout* sortingLayout = new QHBoxLayout(); - sortingLayout->setMargin(0); + sortingLayout->setContentsMargins(0, 0, 0, 0); sortingLayout->addWidget(m_sortOrder); sortingLayout->addWidget(m_sorting); diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index 1374af248..d79b7cd08 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -97,7 +97,7 @@ DolphinView::DolphinView(const QUrl& url, QWidget* parent) : { m_topLayout = new QVBoxLayout(this); m_topLayout->setSpacing(0); - m_topLayout->setMargin(0); + m_topLayout->setContentsMargins(0, 0, 0, 0); // When a new item has been created by the "Create New..." menu, the item should // get selected and it must be assured that the item will get visible. As the diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp index c9f9c177b..5d329c3ce 100644 --- a/src/views/renamedialog.cpp +++ b/src/views/renamedialog.cpp @@ -137,7 +137,7 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) : m_spinBox->setDisplayIntegerBase(10); QHBoxLayout* horizontalLayout = new QHBoxLayout(page); - horizontalLayout->setMargin(0); + horizontalLayout->setContentsMargins(0, 0, 0, 0); horizontalLayout->addWidget(infoLabel); horizontalLayout->addWidget(m_spinBox);