Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 09:42:10 +02:00
Code Releases Activity

Remove deprecated method

Browse Source
This commit is contained in:
Laurent Montel 2019-03-01 08:49:55 +01:00
parent c32b899ae3
commit ec8217035f
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/3rdparty/fancytabwidget.cpp vendored
View File

@ -502,18 +502,18 @@ FancyTabWidget::FancyTabWidget(QWidget* parent)
proxy_style_(new FancyTabProxyStyle) proxy_style_(new FancyTabProxyStyle)
{ {
side_layout_->setSpacing(0); side_layout_->setSpacing(0);
side_layout_->setMargin(0); side_layout_->setContentsMargins(0, 0, 0, 0);
side_layout_->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Fixed, QSizePolicy::Expanding)); side_layout_->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Fixed, QSizePolicy::Expanding));
side_widget_->setLayout(side_layout_); side_widget_->setLayout(side_layout_);
side_widget_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding); side_widget_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
top_layout_->setMargin(0); top_layout_->setContentsMargins(0, 0, 0, 0);
top_layout_->setSpacing(0); top_layout_->setSpacing(0);
top_layout_->addLayout(stack_); top_layout_->addLayout(stack_);
QHBoxLayout* main_layout = new QHBoxLayout; QHBoxLayout* main_layout = new QHBoxLayout;
main_layout->setMargin(0); main_layout->setContentsMargins(0, 0, 0, 0);
main_layout->setSpacing(1); main_layout->setSpacing(1);
main_layout->addWidget(side_widget_); main_layout->addWidget(side_widget_);
main_layout->addLayout(top_layout_); main_layout->addLayout(top_layout_);

4
src/lib/popupwindow/popupwindow.cpp
View File

@ -63,7 +63,7 @@ PopupWindow::PopupWindow(PopupWebView* view)
m_notificationWidget = new QWidget(this); m_notificationWidget = new QWidget(this);
m_notificationWidget->setAutoFillBackground(true); m_notificationWidget->setAutoFillBackground(true);
QPalette pal = m_notificationWidget->palette(); QPalette pal = m_notificationWidget->palette();
pal.setColor(QPalette::Background, pal.window().color().darker(110)); pal.setColor(QPalette::Window, pal.window().color().darker(110));
m_notificationWidget->setPalette(pal); m_notificationWidget->setPalette(pal);
QVBoxLayout *nlayout = new QVBoxLayout(m_notificationWidget); QVBoxLayout *nlayout = new QVBoxLayout(m_notificationWidget);
@ -73,7 +73,7 @@ PopupWindow::PopupWindow(PopupWebView* view)
QWidget *viewSpacer = new QWidget(this); QWidget *viewSpacer = new QWidget(this);
pal = viewSpacer->palette(); pal = viewSpacer->palette();
pal.setColor(QPalette::Background, pal.window().color().darker(125)); pal.setColor(QPalette::Window, pal.window().color().darker(125));
viewSpacer->setPalette(pal); viewSpacer->setPalette(pal);
viewSpacer->setFixedHeight(1); viewSpacer->setFixedHeight(1);
viewSpacer->setAutoFillBackground(true); viewSpacer->setAutoFillBackground(true);

2
src/lib/webtab/webtab.cpp
View File

@ -169,7 +169,7 @@ WebTab::WebTab(QWidget *parent)
m_notificationWidget = new QWidget(this); m_notificationWidget = new QWidget(this);
m_notificationWidget->setAutoFillBackground(true); m_notificationWidget->setAutoFillBackground(true);
QPalette pal = m_notificationWidget->palette(); QPalette pal = m_notificationWidget->palette();
pal.setColor(QPalette::Background, pal.window().color().darker(110)); pal.setColor(QPalette::Window, pal.window().color().darker(110));
m_notificationWidget->setPalette(pal); m_notificationWidget->setPalette(pal);
QVBoxLayout *nlayout = new QVBoxLayout(m_notificationWidget); QVBoxLayout *nlayout = new QVBoxLayout(m_notificationWidget);

4
tests/modeltest/modeltest.cpp
View File

@ -459,12 +459,12 @@ void ModelTest::data()
} }
// General Purpose roles that should return a QColor // General Purpose roles that should return a QColor
QVariant colorVariant = model->data(model->index(0, 0), Qt::BackgroundColorRole); QVariant colorVariant = model->data(model->index(0, 0), Qt::BackgroundRole);
if (colorVariant.isValid()) { if (colorVariant.isValid()) {
Q_ASSERT(colorVariant.canConvert<QColor>()); Q_ASSERT(colorVariant.canConvert<QColor>());
} }
colorVariant = model->data(model->index(0, 0), Qt::TextColorRole); colorVariant = model->data(model->index(0, 0), Qt::ForegroundRole);
if (colorVariant.isValid()) { if (colorVariant.isValid()) {
Q_ASSERT(colorVariant.canConvert<QColor>()); Q_ASSERT(colorVariant.canConvert<QColor>());
} }