Disable use of Qt APIs deprecated in 5.15.0 and earlier versions (#4133)

This commit is contained in:
kornes
2022-11-10 19:11:40 +00:00
committed by GitHub
parent 3303cdc0cb
commit fbfa5e0f41
21 changed files with 36 additions and 36 deletions
+3 -3
View File
@@ -167,11 +167,11 @@ EmotePopup::EmotePopup(QWidget *parent)
QRegularExpression searchRegex("\\S*");
searchRegex.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
layout->setMargin(0);
layout->setContentsMargins(0, 0, 0, 0);
layout->setSpacing(0);
QHBoxLayout *layout2 = new QHBoxLayout(this);
layout2->setMargin(8);
layout2->setContentsMargins(8, 8, 8, 8);
layout2->setSpacing(8);
this->search_ = new QLineEdit();
@@ -214,7 +214,7 @@ EmotePopup::EmotePopup(QWidget *parent)
this->notebook_ = new Notebook(this);
layout->addWidget(this->notebook_);
layout->setMargin(0);
layout->setContentsMargins(0, 0, 0, 0);
this->subEmotesView_ = makeView("Subs");
this->channelEmotesView_ = makeView("Channel");
+1 -2
View File
@@ -32,8 +32,7 @@ void NotificationPopup::updatePosition()
{
Location location = BottomRight;
QDesktopWidget *desktop = QApplication::desktop();
const QRect rect = desktop->availableGeometry();
const QRect rect = QGuiApplication::primaryScreen()->availableGeometry();
switch (location)
{
+2 -1
View File
@@ -90,7 +90,8 @@ ReplyThreadPopup::ReplyThreadPopup(bool closeAutomatically, QWidget *parent,
layout->setSpacing(0);
// provide draggable margin if frameless
layout->setMargin(closeAutomatically ? 15 : 1);
auto marginPx = closeAutomatically ? 15 : 1;
layout->setContentsMargins(marginPx, marginPx, marginPx, marginPx);
layout->addWidget(this->ui_.threadView, 1);
layout->addWidget(this->ui_.replyInput);
}
+1 -3
View File
@@ -123,7 +123,7 @@ void SettingsDialog::initUi()
.assign(&this->ui_.pageStack)
.withoutMargin();
this->ui_.pageStack->setMargin(0);
this->ui_.pageStack->setContentsMargins(0, 0, 0, 0);
outerBox->addSpacing(12);
@@ -193,9 +193,7 @@ void SettingsDialog::filterElements(const QString &text)
void SettingsDialog::addTabs()
{
this->ui_.tabContainer->setMargin(0);
this->ui_.tabContainer->setSpacing(0);
this->ui_.tabContainer->setContentsMargins(0, 20, 0, 20);
// Constructors are wrapped in std::function to remove some strain from first time loading.