diff options
| author | Laurent Montel <[email protected]> | 2019-02-27 08:59:18 +0100 |
|---|---|---|
| committer | Laurent Montel <[email protected]> | 2019-02-27 08:59:18 +0100 |
| commit | 4315e5c9380e22eed483f00adac3d075369eae49 (patch) | |
| tree | 8d86e02ae6b54ec1bdb6c057896ff0bffc09c173 /src/settings | |
| parent | 1c6240964bb8ce9d55069cc9082978e34c22e84c (diff) | |
remove deprecated methods
Diffstat (limited to 'src/settings')
| -rw-r--r-- | src/settings/general/generalsettingspage.cpp | 2 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.cpp | 2 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.cpp | 2 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinservices.cpp | 2 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.cpp | 2 | ||||
| -rw-r--r-- | src/settings/navigation/navigationsettingspage.cpp | 2 | ||||
| -rw-r--r-- | src/settings/startup/startupsettingspage.cpp | 6 | ||||
| -rw-r--r-- | src/settings/viewmodes/dolphinfontrequester.cpp | 2 | ||||
| -rw-r--r-- | src/settings/viewmodes/viewsettingspage.cpp | 2 | ||||
| -rw-r--r-- | src/settings/viewpropertiesdialog.cpp | 2 |
10 files changed, 12 insertions, 12 deletions
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<void(DolphinNavigationConfigModule::*)()>(&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<void(DolphinServicesConfigModule::*)()>(&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); |
