diff --git a/retroshare-gui/src/gui/AboutWidget.cpp b/retroshare-gui/src/gui/AboutWidget.cpp
index 1c4ae6827..9f5082fbd 100644
--- a/retroshare-gui/src/gui/AboutWidget.cpp
+++ b/retroshare-gui/src/gui/AboutWidget.cpp
@@ -49,7 +49,7 @@ AboutWidget::AboutWidget(QWidget* parent)
setupUi(this);
QHBoxLayout* l = new QHBoxLayout();
- l->setMargin(0);
+ l->setContentsMargins(0, 0, 0, 0);
l->addStretch(1);
l->addStretch(1);
specialFrame->setContentsMargins(0, 0, 0, 0);
diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp
index c9c2cdf18..9d38ed5d3 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp
@@ -2165,7 +2165,7 @@ void IdDialog::headerContextMenuRequested(QPoint)
// create menu header
//QHBoxLayout *hbox = new QHBoxLayout(widget);
- //hbox->setMargin(0);
+ //hbox->setContentsMargins(0, 0, 0, 0);
//hbox->setSpacing(6);
auto addEntry = [&](const QString& name,RsIdentityListModel::Columns col)
@@ -2264,7 +2264,7 @@ void IdDialog::IdListCustomPopupMenu( QPoint )
// create menu header
QHBoxLayout *hbox = new QHBoxLayout(widget);
- hbox->setMargin(0);
+ hbox->setContentsMargins(0, 0, 0, 0);
hbox->setSpacing(6);
QLabel *iconLabel = new QLabel(widget);
diff --git a/retroshare-gui/src/gui/LogoBar.cpp b/retroshare-gui/src/gui/LogoBar.cpp
index 081eb2c31..a5759ed16 100644
--- a/retroshare-gui/src/gui/LogoBar.cpp
+++ b/retroshare-gui/src/gui/LogoBar.cpp
@@ -80,7 +80,7 @@ void LogoBar::init() {
);
QGridLayout * layout = new QGridLayout(this);
- layout->setMargin(0);
+ layout->setContentsMargins(0, 0, 0, 0);
layout->setSpacing(0);
layout->addWidget(FillLabel1, 0, 0);
diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 5ba8f1ddd..897d11136 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -261,7 +261,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
QWidget *widget = new QWidget();
widget->setObjectName("trans_statusComboBoxFrame");
QHBoxLayout *hbox = new QHBoxLayout();
- hbox->setMargin(0);
+ hbox->setContentsMargins(0, 0, 0, 0);
hbox->setSpacing(6);
hbox->addWidget(statusComboBox);
widget->setLayout(hbox);
diff --git a/retroshare-gui/src/gui/advsearch/guiexprelement.cpp b/retroshare-gui/src/gui/advsearch/guiexprelement.cpp
index 5dd138186..cb146db1f 100644
--- a/retroshare-gui/src/gui/advsearch/guiexprelement.cpp
+++ b/retroshare-gui/src/gui/advsearch/guiexprelement.cpp
@@ -219,7 +219,7 @@ QStringList GuiExprElement::getConditionOptions(ExprSearchType t)
QHBoxLayout * GuiExprElement::createLayout(QWidget * parent /*= nullptr*/)
{
QHBoxLayout * hboxLayout = new QHBoxLayout(parent);
- hboxLayout->setMargin(0);
+ hboxLayout->setContentsMargins(0, 0, 0, 0);
hboxLayout->setSpacing(0);
return hboxLayout;
}
diff --git a/retroshare-gui/src/gui/common/FriendList.cpp b/retroshare-gui/src/gui/common/FriendList.cpp
index 00de7866a..7057e8418 100644
--- a/retroshare-gui/src/gui/common/FriendList.cpp
+++ b/retroshare-gui/src/gui/common/FriendList.cpp
@@ -304,7 +304,7 @@ void FriendList::peerTreeWidgetCustomPopupMenu()
// create menu header
QHBoxLayout *hbox = new QHBoxLayout(widget);
- hbox->setMargin(0);
+ hbox->setContentsMargins(0, 0, 0, 0);
hbox->setSpacing(6);
QLabel *iconLabel = new QLabel(widget);
diff --git a/retroshare-gui/src/gui/common/NewFriendList.cpp b/retroshare-gui/src/gui/common/NewFriendList.cpp
index 66e692375..49f392b66 100644
--- a/retroshare-gui/src/gui/common/NewFriendList.cpp
+++ b/retroshare-gui/src/gui/common/NewFriendList.cpp
@@ -319,7 +319,7 @@ void NewFriendList::headerContextMenuRequested(QPoint /*p*/)
// create menu header
QHBoxLayout *hbox = new QHBoxLayout(widget);
- hbox->setMargin(0);
+ hbox->setContentsMargins(0, 0, 0, 0);
hbox->setSpacing(6);
QLabel *iconLabel = new QLabel(widget);
@@ -591,7 +591,7 @@ void NewFriendList::peerTreeWidgetCustomPopupMenu()
// create menu header
QHBoxLayout *hbox = new QHBoxLayout(widget);
- hbox->setMargin(0);
+ hbox->setContentsMargins(0, 0, 0, 0);
hbox->setSpacing(6);
QLabel *iconLabel = new QLabel(widget);
diff --git a/retroshare-gui/src/gui/common/RSTreeWidget.cpp b/retroshare-gui/src/gui/common/RSTreeWidget.cpp
index 8ecdfde3f..ab4004633 100644
--- a/retroshare-gui/src/gui/common/RSTreeWidget.cpp
+++ b/retroshare-gui/src/gui/common/RSTreeWidget.cpp
@@ -260,7 +260,7 @@ QMenu *RSTreeWidget::createStandardContextMenu(QMenu *contextMenu)
// create menu header
QHBoxLayout *hbox = new QHBoxLayout(widget);
- hbox->setMargin(0);
+ hbox->setContentsMargins(0, 0, 0, 0);
hbox->setSpacing(6);
QLabel *iconLabel = new QLabel(widget);
diff --git a/retroshare-gui/src/gui/statusbar/SoundStatus.cpp b/retroshare-gui/src/gui/statusbar/SoundStatus.cpp
index 374a61b12..e798142a0 100644
--- a/retroshare-gui/src/gui/statusbar/SoundStatus.cpp
+++ b/retroshare-gui/src/gui/statusbar/SoundStatus.cpp
@@ -32,7 +32,7 @@ SoundStatus::SoundStatus(QWidget *parent)
: QWidget(parent)
{
QHBoxLayout *hbox = new QHBoxLayout(this);
- hbox->setMargin(0);
+ hbox->setContentsMargins(0, 0, 0, 0);
hbox->setSpacing(0);
imageButton = new QPushButton(this);
diff --git a/retroshare-gui/src/gui/statusbar/SysTrayStatus.cpp b/retroshare-gui/src/gui/statusbar/SysTrayStatus.cpp
index 1f52163ec..c4144d67c 100644
--- a/retroshare-gui/src/gui/statusbar/SysTrayStatus.cpp
+++ b/retroshare-gui/src/gui/statusbar/SysTrayStatus.cpp
@@ -33,7 +33,7 @@ SysTrayStatus::SysTrayStatus(QWidget *parent) :
QWidget(parent)
{
QHBoxLayout *hbox = new QHBoxLayout(this);
- hbox->setMargin(0);
+ hbox->setContentsMargins(0, 0, 0, 0);
hbox->setSpacing(0);
imageButton = new QPushButton(this);
diff --git a/retroshare-gui/src/gui/statusbar/ToasterDisable.cpp b/retroshare-gui/src/gui/statusbar/ToasterDisable.cpp
index 273245972..a304f8721 100644
--- a/retroshare-gui/src/gui/statusbar/ToasterDisable.cpp
+++ b/retroshare-gui/src/gui/statusbar/ToasterDisable.cpp
@@ -32,7 +32,7 @@ ToasterDisable::ToasterDisable(QWidget *parent)
: QWidget(parent)
{
QHBoxLayout *hbox = new QHBoxLayout(this);
- hbox->setMargin(0);
+ hbox->setContentsMargins(0, 0, 0, 0);
hbox->setSpacing(0);
imageButton = new QPushButton(this);
diff --git a/retroshare-gui/src/gui/statusbar/dhtstatus.cpp b/retroshare-gui/src/gui/statusbar/dhtstatus.cpp
index 9d998137f..40790e4d6 100644
--- a/retroshare-gui/src/gui/statusbar/dhtstatus.cpp
+++ b/retroshare-gui/src/gui/statusbar/dhtstatus.cpp
@@ -37,7 +37,7 @@ DHTStatus::DHTStatus(QWidget *parent)
: QWidget(parent)
{
QHBoxLayout *hbox = new QHBoxLayout();
- hbox->setMargin(0);
+ hbox->setContentsMargins(0, 0, 0, 0);
hbox->setSpacing(6);
statusDHT = new QLabel("" + tr("DHT") + ":", this );
diff --git a/retroshare-gui/src/gui/statusbar/discstatus.cpp b/retroshare-gui/src/gui/statusbar/discstatus.cpp
index 64ac7813e..7475bf3a7 100644
--- a/retroshare-gui/src/gui/statusbar/discstatus.cpp
+++ b/retroshare-gui/src/gui/statusbar/discstatus.cpp
@@ -33,7 +33,7 @@ DiscStatus::DiscStatus(QWidget *parent)
hide (); // show only, when pending operations are available
QHBoxLayout *hbox = new QHBoxLayout(this);
- hbox->setMargin(0);
+ hbox->setContentsMargins(0, 0, 0, 0);
hbox->setSpacing(6);
QLabel *iconLabel = new QLabel(this);
diff --git a/retroshare-gui/src/gui/statusbar/hashingstatus.cpp b/retroshare-gui/src/gui/statusbar/hashingstatus.cpp
index fc57bb286..109933cc8 100644
--- a/retroshare-gui/src/gui/statusbar/hashingstatus.cpp
+++ b/retroshare-gui/src/gui/statusbar/hashingstatus.cpp
@@ -34,7 +34,7 @@ HashingStatus::HashingStatus(QWidget *parent)
: QWidget(parent)
{
QHBoxLayout *hbox = new QHBoxLayout(this);
- hbox->setMargin(0);
+ hbox->setContentsMargins(0, 0, 0, 0);
hbox->setSpacing(6);
movie = new QMovie(":/images/loader/indicator-16.gif");
diff --git a/retroshare-gui/src/gui/statusbar/natstatus.cpp b/retroshare-gui/src/gui/statusbar/natstatus.cpp
index 15e2a7067..28ae53c35 100644
--- a/retroshare-gui/src/gui/statusbar/natstatus.cpp
+++ b/retroshare-gui/src/gui/statusbar/natstatus.cpp
@@ -31,7 +31,7 @@ NATStatus::NATStatus(QWidget *parent)
: QWidget(parent)
{
QHBoxLayout *hbox = new QHBoxLayout(this);
- hbox->setMargin(0);
+ hbox->setContentsMargins(0, 0, 0, 0);
hbox->setSpacing(6);
statusNAT = new QLabel( tr("NAT:"), this );
diff --git a/retroshare-gui/src/gui/statusbar/peerstatus.cpp b/retroshare-gui/src/gui/statusbar/peerstatus.cpp
index 4f1c9811f..5cfce309f 100644
--- a/retroshare-gui/src/gui/statusbar/peerstatus.cpp
+++ b/retroshare-gui/src/gui/statusbar/peerstatus.cpp
@@ -28,7 +28,7 @@ PeerStatus::PeerStatus(QWidget *parent)
: QWidget(parent)
{
QHBoxLayout *hbox = new QHBoxLayout(this);
- hbox->setMargin(0);
+ hbox->setContentsMargins(0, 0, 0, 0);
hbox->setSpacing(6);
diff --git a/retroshare-gui/src/gui/statusbar/ratesstatus.cpp b/retroshare-gui/src/gui/statusbar/ratesstatus.cpp
index 8e4f606f7..b953020fa 100644
--- a/retroshare-gui/src/gui/statusbar/ratesstatus.cpp
+++ b/retroshare-gui/src/gui/statusbar/ratesstatus.cpp
@@ -32,7 +32,7 @@ RatesStatus::RatesStatus(QWidget *parent)
: QWidget(parent)
{
QHBoxLayout *hbox = new QHBoxLayout(this);
- hbox->setMargin(0);
+ hbox->setContentsMargins(0, 0, 0, 0);
hbox->setSpacing(6);
iconLabel = new QLabel( this );
diff --git a/retroshare-gui/src/gui/statusbar/torstatus.cpp b/retroshare-gui/src/gui/statusbar/torstatus.cpp
index d43de1df3..12bcddf54 100644
--- a/retroshare-gui/src/gui/statusbar/torstatus.cpp
+++ b/retroshare-gui/src/gui/statusbar/torstatus.cpp
@@ -40,7 +40,7 @@ TorStatus::TorStatus(QWidget *parent)
: QWidget(parent)
{
QHBoxLayout *hbox = new QHBoxLayout();
- hbox->setMargin(0);
+ hbox->setContentsMargins(0, 0, 0, 0);
hbox->setSpacing(6);
statusTor = new QLabel("" + tr("Tor") + ":", this );
diff --git a/retroshare-gui/src/util/Widget.cpp b/retroshare-gui/src/util/Widget.cpp
index 0fdf10880..cb9f6ad91 100644
--- a/retroshare-gui/src/util/Widget.cpp
+++ b/retroshare-gui/src/util/Widget.cpp
@@ -27,7 +27,7 @@
QGridLayout * Widget::createLayout(QWidget * parent) {
QGridLayout * layout = new QGridLayout(parent);
layout->setSpacing(0);
- layout->setMargin(0);
+ layout->setContentsMargins(0, 0, 0, 0);
return layout;
}