mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-08-02 11:16:34 -04:00
Replaced deprecated QLayout::setMargins by QLayout::setContentsMargins
This commit is contained in:
parent
33fc4308c4
commit
90041fc627
19 changed files with 21 additions and 21 deletions
|
@ -49,7 +49,7 @@ AboutWidget::AboutWidget(QWidget* parent)
|
||||||
setupUi(this);
|
setupUi(this);
|
||||||
|
|
||||||
QHBoxLayout* l = new QHBoxLayout();
|
QHBoxLayout* l = new QHBoxLayout();
|
||||||
l->setMargin(0);
|
l->setContentsMargins(0, 0, 0, 0);
|
||||||
l->addStretch(1);
|
l->addStretch(1);
|
||||||
l->addStretch(1);
|
l->addStretch(1);
|
||||||
specialFrame->setContentsMargins(0, 0, 0, 0);
|
specialFrame->setContentsMargins(0, 0, 0, 0);
|
||||||
|
|
|
@ -2165,7 +2165,7 @@ void IdDialog::headerContextMenuRequested(QPoint)
|
||||||
|
|
||||||
// create menu header
|
// create menu header
|
||||||
//QHBoxLayout *hbox = new QHBoxLayout(widget);
|
//QHBoxLayout *hbox = new QHBoxLayout(widget);
|
||||||
//hbox->setMargin(0);
|
//hbox->setContentsMargins(0, 0, 0, 0);
|
||||||
//hbox->setSpacing(6);
|
//hbox->setSpacing(6);
|
||||||
|
|
||||||
auto addEntry = [&](const QString& name,RsIdentityListModel::Columns col)
|
auto addEntry = [&](const QString& name,RsIdentityListModel::Columns col)
|
||||||
|
@ -2264,7 +2264,7 @@ void IdDialog::IdListCustomPopupMenu( QPoint )
|
||||||
|
|
||||||
// create menu header
|
// create menu header
|
||||||
QHBoxLayout *hbox = new QHBoxLayout(widget);
|
QHBoxLayout *hbox = new QHBoxLayout(widget);
|
||||||
hbox->setMargin(0);
|
hbox->setContentsMargins(0, 0, 0, 0);
|
||||||
hbox->setSpacing(6);
|
hbox->setSpacing(6);
|
||||||
|
|
||||||
QLabel *iconLabel = new QLabel(widget);
|
QLabel *iconLabel = new QLabel(widget);
|
||||||
|
|
|
@ -80,7 +80,7 @@ void LogoBar::init() {
|
||||||
);
|
);
|
||||||
|
|
||||||
QGridLayout * layout = new QGridLayout(this);
|
QGridLayout * layout = new QGridLayout(this);
|
||||||
layout->setMargin(0);
|
layout->setContentsMargins(0, 0, 0, 0);
|
||||||
layout->setSpacing(0);
|
layout->setSpacing(0);
|
||||||
|
|
||||||
layout->addWidget(FillLabel1, 0, 0);
|
layout->addWidget(FillLabel1, 0, 0);
|
||||||
|
|
|
@ -261,7 +261,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
|
||||||
QWidget *widget = new QWidget();
|
QWidget *widget = new QWidget();
|
||||||
widget->setObjectName("trans_statusComboBoxFrame");
|
widget->setObjectName("trans_statusComboBoxFrame");
|
||||||
QHBoxLayout *hbox = new QHBoxLayout();
|
QHBoxLayout *hbox = new QHBoxLayout();
|
||||||
hbox->setMargin(0);
|
hbox->setContentsMargins(0, 0, 0, 0);
|
||||||
hbox->setSpacing(6);
|
hbox->setSpacing(6);
|
||||||
hbox->addWidget(statusComboBox);
|
hbox->addWidget(statusComboBox);
|
||||||
widget->setLayout(hbox);
|
widget->setLayout(hbox);
|
||||||
|
|
|
@ -219,7 +219,7 @@ QStringList GuiExprElement::getConditionOptions(ExprSearchType t)
|
||||||
QHBoxLayout * GuiExprElement::createLayout(QWidget * parent /*= nullptr*/)
|
QHBoxLayout * GuiExprElement::createLayout(QWidget * parent /*= nullptr*/)
|
||||||
{
|
{
|
||||||
QHBoxLayout * hboxLayout = new QHBoxLayout(parent);
|
QHBoxLayout * hboxLayout = new QHBoxLayout(parent);
|
||||||
hboxLayout->setMargin(0);
|
hboxLayout->setContentsMargins(0, 0, 0, 0);
|
||||||
hboxLayout->setSpacing(0);
|
hboxLayout->setSpacing(0);
|
||||||
return hboxLayout;
|
return hboxLayout;
|
||||||
}
|
}
|
||||||
|
|
|
@ -304,7 +304,7 @@ void FriendList::peerTreeWidgetCustomPopupMenu()
|
||||||
|
|
||||||
// create menu header
|
// create menu header
|
||||||
QHBoxLayout *hbox = new QHBoxLayout(widget);
|
QHBoxLayout *hbox = new QHBoxLayout(widget);
|
||||||
hbox->setMargin(0);
|
hbox->setContentsMargins(0, 0, 0, 0);
|
||||||
hbox->setSpacing(6);
|
hbox->setSpacing(6);
|
||||||
|
|
||||||
QLabel *iconLabel = new QLabel(widget);
|
QLabel *iconLabel = new QLabel(widget);
|
||||||
|
|
|
@ -319,7 +319,7 @@ void NewFriendList::headerContextMenuRequested(QPoint /*p*/)
|
||||||
|
|
||||||
// create menu header
|
// create menu header
|
||||||
QHBoxLayout *hbox = new QHBoxLayout(widget);
|
QHBoxLayout *hbox = new QHBoxLayout(widget);
|
||||||
hbox->setMargin(0);
|
hbox->setContentsMargins(0, 0, 0, 0);
|
||||||
hbox->setSpacing(6);
|
hbox->setSpacing(6);
|
||||||
|
|
||||||
QLabel *iconLabel = new QLabel(widget);
|
QLabel *iconLabel = new QLabel(widget);
|
||||||
|
@ -591,7 +591,7 @@ void NewFriendList::peerTreeWidgetCustomPopupMenu()
|
||||||
|
|
||||||
// create menu header
|
// create menu header
|
||||||
QHBoxLayout *hbox = new QHBoxLayout(widget);
|
QHBoxLayout *hbox = new QHBoxLayout(widget);
|
||||||
hbox->setMargin(0);
|
hbox->setContentsMargins(0, 0, 0, 0);
|
||||||
hbox->setSpacing(6);
|
hbox->setSpacing(6);
|
||||||
|
|
||||||
QLabel *iconLabel = new QLabel(widget);
|
QLabel *iconLabel = new QLabel(widget);
|
||||||
|
|
|
@ -260,7 +260,7 @@ QMenu *RSTreeWidget::createStandardContextMenu(QMenu *contextMenu)
|
||||||
|
|
||||||
// create menu header
|
// create menu header
|
||||||
QHBoxLayout *hbox = new QHBoxLayout(widget);
|
QHBoxLayout *hbox = new QHBoxLayout(widget);
|
||||||
hbox->setMargin(0);
|
hbox->setContentsMargins(0, 0, 0, 0);
|
||||||
hbox->setSpacing(6);
|
hbox->setSpacing(6);
|
||||||
|
|
||||||
QLabel *iconLabel = new QLabel(widget);
|
QLabel *iconLabel = new QLabel(widget);
|
||||||
|
|
|
@ -32,7 +32,7 @@ SoundStatus::SoundStatus(QWidget *parent)
|
||||||
: QWidget(parent)
|
: QWidget(parent)
|
||||||
{
|
{
|
||||||
QHBoxLayout *hbox = new QHBoxLayout(this);
|
QHBoxLayout *hbox = new QHBoxLayout(this);
|
||||||
hbox->setMargin(0);
|
hbox->setContentsMargins(0, 0, 0, 0);
|
||||||
hbox->setSpacing(0);
|
hbox->setSpacing(0);
|
||||||
|
|
||||||
imageButton = new QPushButton(this);
|
imageButton = new QPushButton(this);
|
||||||
|
|
|
@ -33,7 +33,7 @@ SysTrayStatus::SysTrayStatus(QWidget *parent) :
|
||||||
QWidget(parent)
|
QWidget(parent)
|
||||||
{
|
{
|
||||||
QHBoxLayout *hbox = new QHBoxLayout(this);
|
QHBoxLayout *hbox = new QHBoxLayout(this);
|
||||||
hbox->setMargin(0);
|
hbox->setContentsMargins(0, 0, 0, 0);
|
||||||
hbox->setSpacing(0);
|
hbox->setSpacing(0);
|
||||||
|
|
||||||
imageButton = new QPushButton(this);
|
imageButton = new QPushButton(this);
|
||||||
|
|
|
@ -32,7 +32,7 @@ ToasterDisable::ToasterDisable(QWidget *parent)
|
||||||
: QWidget(parent)
|
: QWidget(parent)
|
||||||
{
|
{
|
||||||
QHBoxLayout *hbox = new QHBoxLayout(this);
|
QHBoxLayout *hbox = new QHBoxLayout(this);
|
||||||
hbox->setMargin(0);
|
hbox->setContentsMargins(0, 0, 0, 0);
|
||||||
hbox->setSpacing(0);
|
hbox->setSpacing(0);
|
||||||
|
|
||||||
imageButton = new QPushButton(this);
|
imageButton = new QPushButton(this);
|
||||||
|
|
|
@ -37,7 +37,7 @@ DHTStatus::DHTStatus(QWidget *parent)
|
||||||
: QWidget(parent)
|
: QWidget(parent)
|
||||||
{
|
{
|
||||||
QHBoxLayout *hbox = new QHBoxLayout();
|
QHBoxLayout *hbox = new QHBoxLayout();
|
||||||
hbox->setMargin(0);
|
hbox->setContentsMargins(0, 0, 0, 0);
|
||||||
hbox->setSpacing(6);
|
hbox->setSpacing(6);
|
||||||
|
|
||||||
statusDHT = new QLabel("<strong>" + tr("DHT") + ":</strong>", this );
|
statusDHT = new QLabel("<strong>" + tr("DHT") + ":</strong>", this );
|
||||||
|
|
|
@ -33,7 +33,7 @@ DiscStatus::DiscStatus(QWidget *parent)
|
||||||
hide (); // show only, when pending operations are available
|
hide (); // show only, when pending operations are available
|
||||||
|
|
||||||
QHBoxLayout *hbox = new QHBoxLayout(this);
|
QHBoxLayout *hbox = new QHBoxLayout(this);
|
||||||
hbox->setMargin(0);
|
hbox->setContentsMargins(0, 0, 0, 0);
|
||||||
hbox->setSpacing(6);
|
hbox->setSpacing(6);
|
||||||
|
|
||||||
QLabel *iconLabel = new QLabel(this);
|
QLabel *iconLabel = new QLabel(this);
|
||||||
|
|
|
@ -34,7 +34,7 @@ HashingStatus::HashingStatus(QWidget *parent)
|
||||||
: QWidget(parent)
|
: QWidget(parent)
|
||||||
{
|
{
|
||||||
QHBoxLayout *hbox = new QHBoxLayout(this);
|
QHBoxLayout *hbox = new QHBoxLayout(this);
|
||||||
hbox->setMargin(0);
|
hbox->setContentsMargins(0, 0, 0, 0);
|
||||||
hbox->setSpacing(6);
|
hbox->setSpacing(6);
|
||||||
|
|
||||||
movie = new QMovie(":/images/loader/indicator-16.gif");
|
movie = new QMovie(":/images/loader/indicator-16.gif");
|
||||||
|
|
|
@ -31,7 +31,7 @@ NATStatus::NATStatus(QWidget *parent)
|
||||||
: QWidget(parent)
|
: QWidget(parent)
|
||||||
{
|
{
|
||||||
QHBoxLayout *hbox = new QHBoxLayout(this);
|
QHBoxLayout *hbox = new QHBoxLayout(this);
|
||||||
hbox->setMargin(0);
|
hbox->setContentsMargins(0, 0, 0, 0);
|
||||||
hbox->setSpacing(6);
|
hbox->setSpacing(6);
|
||||||
|
|
||||||
statusNAT = new QLabel( tr("<strong>NAT:</strong>"), this );
|
statusNAT = new QLabel( tr("<strong>NAT:</strong>"), this );
|
||||||
|
|
|
@ -28,7 +28,7 @@ PeerStatus::PeerStatus(QWidget *parent)
|
||||||
: QWidget(parent)
|
: QWidget(parent)
|
||||||
{
|
{
|
||||||
QHBoxLayout *hbox = new QHBoxLayout(this);
|
QHBoxLayout *hbox = new QHBoxLayout(this);
|
||||||
hbox->setMargin(0);
|
hbox->setContentsMargins(0, 0, 0, 0);
|
||||||
hbox->setSpacing(6);
|
hbox->setSpacing(6);
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ RatesStatus::RatesStatus(QWidget *parent)
|
||||||
: QWidget(parent)
|
: QWidget(parent)
|
||||||
{
|
{
|
||||||
QHBoxLayout *hbox = new QHBoxLayout(this);
|
QHBoxLayout *hbox = new QHBoxLayout(this);
|
||||||
hbox->setMargin(0);
|
hbox->setContentsMargins(0, 0, 0, 0);
|
||||||
hbox->setSpacing(6);
|
hbox->setSpacing(6);
|
||||||
|
|
||||||
iconLabel = new QLabel( this );
|
iconLabel = new QLabel( this );
|
||||||
|
|
|
@ -40,7 +40,7 @@ TorStatus::TorStatus(QWidget *parent)
|
||||||
: QWidget(parent)
|
: QWidget(parent)
|
||||||
{
|
{
|
||||||
QHBoxLayout *hbox = new QHBoxLayout();
|
QHBoxLayout *hbox = new QHBoxLayout();
|
||||||
hbox->setMargin(0);
|
hbox->setContentsMargins(0, 0, 0, 0);
|
||||||
hbox->setSpacing(6);
|
hbox->setSpacing(6);
|
||||||
|
|
||||||
statusTor = new QLabel("<strong>" + tr("Tor") + ":</strong>", this );
|
statusTor = new QLabel("<strong>" + tr("Tor") + ":</strong>", this );
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
QGridLayout * Widget::createLayout(QWidget * parent) {
|
QGridLayout * Widget::createLayout(QWidget * parent) {
|
||||||
QGridLayout * layout = new QGridLayout(parent);
|
QGridLayout * layout = new QGridLayout(parent);
|
||||||
layout->setSpacing(0);
|
layout->setSpacing(0);
|
||||||
layout->setMargin(0);
|
layout->setContentsMargins(0, 0, 0, 0);
|
||||||
return layout;
|
return layout;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue