Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-31 02:09:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2990 from thunder2/qt6-setMargins

Browse source 
Replaced deprecated QLayout::setMargins by QLayout::setContentsMargins
This commit is contained in:
Thunder 2025-07-22 20:26:16 +02:00 • committed by GitHub
commit 256b188861
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/AboutWidget.cpp
View file

@ -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);

4
retroshare-gui/src/gui/Identity/IdDialog.cpp
View file

@ -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);

2
retroshare-gui/src/gui/LogoBar.cpp
View file

@ -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);

2
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -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);

2
retroshare-gui/src/gui/advsearch/guiexprelement.cpp
View file

@ -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;
}

2
retroshare-gui/src/gui/common/FriendList.cpp
View file

@ -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);

4
retroshare-gui/src/gui/common/NewFriendList.cpp
View file

@ -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);

2
retroshare-gui/src/gui/common/RSTreeWidget.cpp
View file

@ -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);

2
retroshare-gui/src/gui/statusbar/SoundStatus.cpp
View file

@ -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);

2
retroshare-gui/src/gui/statusbar/SysTrayStatus.cpp
View file

@ -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);

2
retroshare-gui/src/gui/statusbar/ToasterDisable.cpp
View file

@ -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);

2
retroshare-gui/src/gui/statusbar/dhtstatus.cpp
View file

@ -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("<strong>" + tr("DHT") + ":</strong>", this );

2
retroshare-gui/src/gui/statusbar/discstatus.cpp
View file

@ -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);

2
retroshare-gui/src/gui/statusbar/hashingstatus.cpp
View file

@ -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");

2
retroshare-gui/src/gui/statusbar/natstatus.cpp
View file

@ -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("<strong>NAT:</strong>"), this );

2
retroshare-gui/src/gui/statusbar/peerstatus.cpp
View file

@ -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);

2
retroshare-gui/src/gui/statusbar/ratesstatus.cpp
View file

@ -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 );

2
retroshare-gui/src/gui/statusbar/torstatus.cpp
View file

@ -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("<strong>" + tr("Tor") + ":</strong>", this );

2
retroshare-gui/src/util/Widget.cpp
View file

@ -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;
}