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

#3752 ResInsight code changes to build on both Qt4 and Qt5

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-11-26 09:53:43 +01:00
parent ddb546d877
commit 5c66b901c3
19 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/UserInterface/RiuCursors.cpp
View File

@@ -20,7 +20,7 @@
#include "RiuCursors.h"
#include <QtCore/QString>
#include <QtGui/QBitmap>
#include <QBitmap>

2
ApplicationCode/UserInterface/RiuCursors.h
View File

@@ -18,7 +18,7 @@
#pragma once
#include <QtGui/QCursor>
#include <QCursor>

6
ApplicationCode/UserInterface/RiuEditPerforationCollectionWidget.cpp
View File

@@ -57,8 +57,12 @@ RiuEditPerforationCollectionWidget::RiuEditPerforationCollectionWidget(QWidget*
m_pdmTableView->setChildArrayField(&(m_perforationCollection->m_perforations));
QHeaderView* verticalHeader = m_pdmTableView->tableView()->verticalHeader();
verticalHeader->setResizeMode(QHeaderView::Interactive);
#if QT_VERSION >= 0x050000
verticalHeader->setSectionResizeMode(QHeaderView::Interactive);
#else
verticalHeader->setResizeMode(QHeaderView::Interactive);
#endif
m_pdmTableView->tableView()->resizeColumnsToContents();
// Set active child array to be able to use generic delete

5
ApplicationCode/UserInterface/RiuExportMultipleSnapshotsWidget.cpp
View File

@@ -75,8 +75,11 @@ RiuExportMultipleSnapshotsWidget::RiuExportMultipleSnapshotsWidget(QWidget* pare
m_pdmTableView->setChildArrayField(&(project->multiSnapshotDefinitions()));
QHeaderView* verticalHeader = m_pdmTableView->tableView()->verticalHeader();
#if QT_VERSION >= 0x050000
verticalHeader->setSectionResizeMode(QHeaderView::Interactive);
#else
verticalHeader->setResizeMode(QHeaderView::Interactive);
#endif
m_pdmTableView->tableView()->resizeColumnsToContents();
// Set active child array to be able to use generic delete

2
ApplicationCode/UserInterface/RiuProcessMonitor.h
View File

@@ -18,7 +18,7 @@
#pragma once
#include <QtGui/QWidget>
#include <QWidget>
class QDockWidget;
class QLabel;

2
ApplicationCode/UserInterface/RiuResultInfoPanel.h
View File

@@ -18,7 +18,7 @@
#pragma once
#include <QtGui/QWidget>
#include <QWidget>
class QDockWidget;
class QTextEdit;

4
ApplicationCode/UserInterface/RiuViewer.cpp
View File

@@ -63,7 +63,6 @@
#include "cvfRendering.h"
#include "cvfScene.h"
#include <QCDEStyle>
#include <QLabel>
#include <QMouseEvent>
#include <QProgressBar>
@@ -156,8 +155,6 @@ RiuViewer::RiuViewer(const QGLFormat& format, QWidget* parent)
m_animationProgress->setFormat("Time Step: %v/%m");
m_animationProgress->setTextVisible(true);
m_progressBarStyle = new QCDEStyle();
m_animationProgress->setStyle(m_progressBarStyle);
m_showAnimProgress = false;
// Histogram
@@ -212,7 +209,6 @@ RiuViewer::~RiuViewer()
delete m_infoLabel;
delete m_animationProgress;
delete m_histogramWidget;
delete m_progressBarStyle;
delete m_gridBoxGenerator;
}

3
ApplicationCode/UserInterface/RiuViewer.h
View File

@@ -38,7 +38,6 @@ class RiuViewerCommands;
class RivGridBoxGenerator;
class RivWindowEdgeAxesOverlayItem;
class QCDEStyle;
class QLabel;
class QProgressBar;
@@ -157,8 +156,6 @@ private:
RiuSimpleHistogramWidget* m_histogramWidget;
bool m_showHistogram;
QCDEStyle* m_progressBarStyle;
cvf::ref<cvf::OverlayAxisCross> m_axisCross;
bool m_showAxisCross;
cvf::Collection<caf::TitledOverlayFrame> m_visibleLegends;