OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings about QStyleFrameOptionsV4

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-03-12 15:29:08 +01:00
parent edc6dad0f7
commit 925747b9d4
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewDelegate.cpp
View File

@ -117,7 +117,11 @@ bool PdmUiTableViewDelegate::isEditorOpen() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void PdmUiTableViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const void PdmUiTableViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
{ {
#if QT_VERSION_MAJOR > 4
QStyleOptionViewItem viewItemOption(option);
#else
QStyleOptionViewItemV4 viewItemOption(option); QStyleOptionViewItemV4 viewItemOption(option);
#endif
QVariant fgText = index.data(Qt::ForegroundRole); QVariant fgText = index.data(Qt::ForegroundRole);

4
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionEditor.cpp
View File

@ -164,7 +164,11 @@ private:
QRect r = rect(); QRect r = rect();
QPalette pal = palette(); QPalette pal = palette();
#if QT_VERSION_MAJOR > 4
QStyleOptionFrame panel;
#else
QStyleOptionFrameV2 panel; QStyleOptionFrameV2 panel;
#endif
initStyleOption(&panel); initStyleOption(&panel);
style()->drawPrimitive(QStyle::PE_PanelLineEdit, &panel, &p, this); style()->drawPrimitive(QStyle::PE_PanelLineEdit, &panel, &p, this);
r = style()->subElementRect(QStyle::SE_LineEditContents, &panel, this); r = style()->subElementRect(QStyle::SE_LineEditContents, &panel, this);