Commit fbf98f4d authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Port deprecated methods

parent 84185907
...@@ -558,7 +558,7 @@ int TabBar::tabAt(int x) ...@@ -558,7 +558,7 @@ int TabBar::tabAt(int x)
void TabBar::wheelEvent(QWheelEvent* event) void TabBar::wheelEvent(QWheelEvent* event)
{ {
if (event->delta() < 0) if (event->angleDelta().y() < 0)
selectNextTab(); selectNextTab();
else else
selectPreviousTab(); selectPreviousTab();
......
...@@ -156,7 +156,7 @@ void Terminal::displayKPartLoadError() ...@@ -156,7 +156,7 @@ void Terminal::displayKPartLoadError()
m_terminalWidget->installEventFilter(this); m_terminalWidget->installEventFilter(this);
QLabel* label = new QLabel(widget); QLabel* label = new QLabel(widget);
label->setMargin(10); label->setContentsMargins(10, 10, 10, 10);
label->setWordWrap(false); label->setWordWrap(false);
label->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); label->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
label->setTextInteractionFlags(Qt::TextSelectableByMouse); label->setTextInteractionFlags(Qt::TextSelectableByMouse);
...@@ -166,7 +166,7 @@ void Terminal::displayKPartLoadError() ...@@ -166,7 +166,7 @@ void Terminal::displayKPartLoadError()
"required to use Yakuake.")); "required to use Yakuake."));
QLabel* icon = new QLabel(widget); QLabel* icon = new QLabel(widget);
icon->setMargin(10); icon->setContentsMargins(10, 10, 10, 10);
icon->setPixmap(QIcon::fromTheme(QStringLiteral("dialog-warning")).pixmap(QSize(48, 48))); icon->setPixmap(QIcon::fromTheme(QStringLiteral("dialog-warning")).pixmap(QSize(48, 48)));
icon->setAlignment(Qt::AlignRight | Qt::AlignVCenter); icon->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
...@@ -174,7 +174,7 @@ void Terminal::displayKPartLoadError() ...@@ -174,7 +174,7 @@ void Terminal::displayKPartLoadError()
layout->addWidget(icon); layout->addWidget(icon);
layout->addWidget(label); layout->addWidget(label);
layout->setSpacing(0); layout->setSpacing(0);
layout->setMargin(0); layout->setContentsMargins(0, 0, 0, 0);
layout->setStretchFactor(icon, 1); layout->setStretchFactor(icon, 1);
layout->setStretchFactor(label,5); layout->setStretchFactor(label,5);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment