From 8173f9f94cede234c5b10acac12cd9c43f9e0865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Thu, 7 Oct 2021 22:16:33 +0200 Subject: [PATCH] Use setContentsMargins instead of setMargin --- YACReaderLibrary/classic_comics_view.cpp | 2 +- YACReaderLibrary/empty_folder_widget.cpp | 2 +- YACReaderLibrary/grid_comics_view.cpp | 2 +- YACReaderLibrary/import_widget.cpp | 2 +- YACReaderLibrary/library_window.cpp | 2 +- YACReaderLibrary/no_libraries_widget.cpp | 2 +- YACReaderLibrary/no_search_results_widget.cpp | 2 +- YACReaderLibrary/server_config_dialog.cpp | 2 +- YACReaderLibrary/yacreader_main_toolbar.cpp | 2 +- custom_widgets/yacreader_deleting_progress.cpp | 2 +- custom_widgets/yacreader_library_item_widget.cpp | 2 +- custom_widgets/yacreader_library_list_widget.cpp | 2 +- custom_widgets/yacreader_titled_toolbar.cpp | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/YACReaderLibrary/classic_comics_view.cpp b/YACReaderLibrary/classic_comics_view.cpp index c10cebb9..c5a8bbc1 100644 --- a/YACReaderLibrary/classic_comics_view.cpp +++ b/YACReaderLibrary/classic_comics_view.cpp @@ -76,7 +76,7 @@ ClassicComicsView::ClassicComicsView(QWidget *parent) layout->addWidget(sVertical); setLayout(layout); - layout->setMargin(0); + layout->setContentsMargins(0, 0, 0, 0); #ifdef Q_OS_MAC sVertical->setCollapsible(1, false); diff --git a/YACReaderLibrary/empty_folder_widget.cpp b/YACReaderLibrary/empty_folder_widget.cpp index 2b07b479..c1edb960 100644 --- a/YACReaderLibrary/empty_folder_widget.cpp +++ b/YACReaderLibrary/empty_folder_widget.cpp @@ -114,7 +114,7 @@ EmptyFolderWidget::EmptyFolderWidget(QWidget *parent) layout->addSpacing(12); layout->addWidget(foldersView, 1); layout->addStretch(); - layout->setMargin(0); + layout->setContentsMargins(0, 0, 0, 0); layout->setSpacing(0); setContentsMargins(0, 0, 0, 0); diff --git a/YACReaderLibrary/grid_comics_view.cpp b/YACReaderLibrary/grid_comics_view.cpp index 848c20b1..35d52049 100644 --- a/YACReaderLibrary/grid_comics_view.cpp +++ b/YACReaderLibrary/grid_comics_view.cpp @@ -208,7 +208,7 @@ void GridComicsView::createCoverSizeSliderWidget() bigLabel->setPixmap(QPixmap(":/images/comics_view_toolbar/big_size_grid_zoom.png")); horizontalLayout->addWidget(bigLabel); horizontalLayout->addSpacing(10); - horizontalLayout->setMargin(0); + horizontalLayout->setContentsMargins(0, 0, 0, 0); coverSizeSliderWidget->setLayout(horizontalLayout); // TODO add shortcuts (ctrl-+ and ctrl-- for zooming in out, + ctrl-0 for reseting the zoom) diff --git a/YACReaderLibrary/import_widget.cpp b/YACReaderLibrary/import_widget.cpp index e1b5ad74..dee85a76 100644 --- a/YACReaderLibrary/import_widget.cpp +++ b/YACReaderLibrary/import_widget.cpp @@ -48,7 +48,7 @@ YACReaderActivityIndicatorWidget::YACReaderActivityIndicatorWidget(QWidget *pare setLayout(layout); - layout->setMargin(4); + layout->setContentsMargins(4, 4, 4, 4); layout->setSpacing(0); // setFixedHeight(3); diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index 8a5e80a1..b351ea1a 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -285,7 +285,7 @@ void LibraryWindow::doLayout() rightLayout->addWidget(libraryToolBar); rightLayout->addWidget(comicsViewsManager->containerWidget()); - rightLayout->setMargin(0); + rightLayout->setContentsMargins(0, 0, 0, 0); rightLayout->setSpacing(0); QWidget *rightWidget = new QWidget(); diff --git a/YACReaderLibrary/no_libraries_widget.cpp b/YACReaderLibrary/no_libraries_widget.cpp index 15530470..2420def8 100644 --- a/YACReaderLibrary/no_libraries_widget.cpp +++ b/YACReaderLibrary/no_libraries_widget.cpp @@ -52,7 +52,7 @@ NoLibrariesWidget::NoLibrariesWidget(QWidget *parent) topLayout->addSpacing(30); topLayout->addLayout(textLayout, 1); topLayout->addStretch(); - topLayout->setMargin(0); + topLayout->setContentsMargins(0, 0, 0, 0); topWidget->setLayout(topLayout); diff --git a/YACReaderLibrary/no_search_results_widget.cpp b/YACReaderLibrary/no_search_results_widget.cpp index ef7dc611..30dd4bde 100644 --- a/YACReaderLibrary/no_search_results_widget.cpp +++ b/YACReaderLibrary/no_search_results_widget.cpp @@ -33,7 +33,7 @@ NoSearchResultsWidget::NoSearchResultsWidget(QWidget *parent) layout->addSpacing(30); layout->addWidget(titleLabel); layout->addStretch(); - layout->setMargin(0); + layout->setContentsMargins(0, 0, 0, 0); layout->setSpacing(0); setContentsMargins(0, 0, 0, 0); diff --git a/YACReaderLibrary/server_config_dialog.cpp b/YACReaderLibrary/server_config_dialog.cpp index 1e110a65..3041d29d 100644 --- a/YACReaderLibrary/server_config_dialog.cpp +++ b/YACReaderLibrary/server_config_dialog.cpp @@ -135,7 +135,7 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent) auto portWidgetLayout = new QHBoxLayout(this); portWidgetLayout->addWidget(port); portWidgetLayout->addWidget(accept); - portWidgetLayout->setMargin(0); + portWidgetLayout->setContentsMargins(0, 0, 0, 0); portWidget->setLayout(portWidgetLayout); portWidget->move(332, 244); // accept->move(514,149); diff --git a/YACReaderLibrary/yacreader_main_toolbar.cpp b/YACReaderLibrary/yacreader_main_toolbar.cpp index 5dcfe34a..a6732193 100644 --- a/YACReaderLibrary/yacreader_main_toolbar.cpp +++ b/YACReaderLibrary/yacreader_main_toolbar.cpp @@ -50,7 +50,7 @@ YACReaderMainToolBar::YACReaderMainToolBar(QWidget *parent) fullscreenButton->setStyleSheet(qToolButtonStyleSheet); fullscreenButton->setIconSize(QSize(24, 24)); - mainLayout->setMargin(0); + mainLayout->setContentsMargins(0, 0, 0, 0); mainLayout->setSpacing(0); mainLayout->addSpacing(12); diff --git a/custom_widgets/yacreader_deleting_progress.cpp b/custom_widgets/yacreader_deleting_progress.cpp index a466a234..fc54476b 100644 --- a/custom_widgets/yacreader_deleting_progress.cpp +++ b/custom_widgets/yacreader_deleting_progress.cpp @@ -46,7 +46,7 @@ YACReaderDeletingProgress::YACReaderDeletingProgress(QWidget *parent) contentLayout->addWidget(button, 0, Qt::AlignHCenter); contentLayout->addSpacing(18); - contentLayout->setMargin(0); + contentLayout->setContentsMargins(0, 0, 0, 0); setLayout(contentLayout); diff --git a/custom_widgets/yacreader_library_item_widget.cpp b/custom_widgets/yacreader_library_item_widget.cpp index 6830a4a8..9b17a633 100644 --- a/custom_widgets/yacreader_library_item_widget.cpp +++ b/custom_widgets/yacreader_library_item_widget.cpp @@ -9,7 +9,7 @@ YACReaderLibraryItemWidget::YACReaderLibraryItemWidget(QString n /*ame*/, QStrin : QWidget(parent), name(n), path(p), isSelected(false) { QHBoxLayout *mainLayout = new QHBoxLayout; - mainLayout->setMargin(0); + mainLayout->setContentsMargins(0, 0, 0, 0); mainLayout->setSpacing(0); // installEventFilter(this); diff --git a/custom_widgets/yacreader_library_list_widget.cpp b/custom_widgets/yacreader_library_list_widget.cpp index 83c1997b..5084024d 100644 --- a/custom_widgets/yacreader_library_list_widget.cpp +++ b/custom_widgets/yacreader_library_list_widget.cpp @@ -11,7 +11,7 @@ YACReaderLibraryListWidget::YACReaderLibraryListWidget(QWidget *parent) { QVBoxLayout *mainLayout = new QVBoxLayout; mainLayout->setSpacing(0); - mainLayout->setMargin(0); + mainLayout->setContentsMargins(0, 0, 0, 0); this->setLayout(mainLayout); } diff --git a/custom_widgets/yacreader_titled_toolbar.cpp b/custom_widgets/yacreader_titled_toolbar.cpp index e38c267f..516cc643 100644 --- a/custom_widgets/yacreader_titled_toolbar.cpp +++ b/custom_widgets/yacreader_titled_toolbar.cpp @@ -60,7 +60,7 @@ YACReaderTitledToolBar::YACReaderTitledToolBar(const QString &title, QWidget *pa : QWidget(parent) { QHBoxLayout *mainLayout = new QHBoxLayout; - mainLayout->setMargin(0); + mainLayout->setContentsMargins(0, 0, 0, 0); mainLayout->setSpacing(0); QString styleSheet = "QWidget {border:0px;}";