remove deprecated methods

diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp
index e0e9bf4bdbcb50faffd0dfbb265bb0dc0e3345e1..6dae730ebbe84b48ae8ab4a4eaa9c71f6b01f6d5 100644 (file)
--- 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 767f2ae8f614041fa5cf6a59930c72bdcf78568c..cdce157eb989e9bd95829e08fdd5b39d10b712a5 100644 (file)
--- 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 813a50838bed208a8a364a34ca90cad915e14a44..b4fef22a817cb7983add4ceb3feb544a98220c85 100644 (file)
--- 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 c98a2150cf8fdec26afd3586f14ed6fe8de13f6b..95953f66bd1a47531621985c2a142a70061a0a9f 100644 (file)
--- 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 494429b8c23cbd6595b8b9ca82907698ecc6d931..95f535713c32b0f8d24b157ea1374f0b1d67ae53 100644 (file)
--- 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 93fba716870312ca8049c3cec615d004ff2bd2b8..d0dbcce88b7fb2224e09c2c5adea904eb04424a3 100644 (file)
--- 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 3377bab24af4c1b10fc5cc469ce4fb570098f9e9..8dedd0be11adb4baa2cbceedbad7d46be4644100 100644 (file)
--- 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 61f5c2db4f8e341ed22fe0ef079a27a554d10c48..9c41db9c585e5cf8a8bd441ee403ce9c0666254f 100644 (file)
--- 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 3793fcdb5fcbc117cfc0a2ab8268048ba26d22e6..daa74aff1dd1e2d7f1231c99922a72aba7df0592 100644 (file)
--- 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 bd1124adaf17ab47d36784ad6bf77f25c334afc8..0df806e41a2611b06b345556e2e6b550098fe6ba 100644 (file)
--- 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 bbc07365dd3e524eba890a148ed9de35c8143589..cc073247a20ffae0c6547a8dcd02e383b6ca65ba 100644 (file)
--- 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<void(DolphinNavigationConfigModule::*)()>(&DolphinNavigationConfigModule::changed));

diff --git a/src/settings/kcm/kcmdolphinservices.cpp b/src/settings/kcm/kcmdolphinservices.cpp
index 202bc5cf5decc7ebbced37fe766481a59186c6ea..91f4fd121b24abac1cc8cf9d4f31197da8278db3 100644 (file)
--- 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<void(DolphinServicesConfigModule::*)()>(&DolphinServicesConfigModule::changed));

diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp
index 8b04baeb69bb30bca79f1ade4cd32b498ca4b74d..584b7f64cb71523a1b3c1e13ab10e3e7db2e71c8 100644 (file)
--- 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 82015480a8b9b6f5ae06281fbc384b193b7a4fd5..aeb8019a563b9c4f97f18da0aa0cf0788942eb3b 100644 (file)
--- 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 f8b7daa79ef1d3d74e4d198f85aca1be857eb722..23d8731d4726e4c4e191768759445f689e8955d2 100644 (file)
--- 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 ff42e39aa324b63c2d4e8a6455a7f15c7861b095..e7b4589e376211e6ddbf8816384102b67c727b5f 100644 (file)
--- 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 dd85a6159e290d907ec51813bc90fc56e98314d3..be2226db6ebee63ab7a7205c1cca32a018b5b743 100644 (file)
--- 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 a7aa8709836d1d521e3d78e734cb6327bf87d1d2..3ccf9a342c8841919071ecc2f2ed325e56b96799 100644 (file)
--- 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 1374af24811c5453c70be13e8fd82395bc1ede0d..d79b7cd0824bd0e5b78a644ada679b9583858612 100644 (file)
--- 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 c9f9c177b08db55972d383994e67d208da075783..5d329c3ce57a9545631f878ddce8dbdbe2dafc5c 100644 (file)
--- 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);