mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Several adjustments related to Qt6
* Avoid ambiguous definition during unity build on Windows * Add missing include * Add Qt6 to expressionparser * Add Qt6 to nightcharts * Replace forward define of QStringList with include <QStringList> * Use toMSecsSinceEpoch * Use setContentsMargins
This commit is contained in:
@@ -72,7 +72,7 @@ auto RiaRftPltCurveDefinition::operator<=>( const RiaRftPltCurveDefinition& othe
|
||||
{
|
||||
if ( m_wellName == other.m_wellName )
|
||||
{
|
||||
return m_timeStep.toTime_t() <=> other.m_timeStep.toTime_t();
|
||||
return m_timeStep.toMSecsSinceEpoch() <=> other.m_timeStep.toMSecsSinceEpoch();
|
||||
}
|
||||
return m_wellName.toStdString() <=> other.m_wellName.toStdString();
|
||||
}
|
||||
|
||||
@@ -19,8 +19,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <QString>
|
||||
|
||||
class QStringList;
|
||||
#include <QStringList>
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
|
||||
@@ -18,13 +18,14 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QStringList>
|
||||
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
class QString;
|
||||
class QStringList;
|
||||
|
||||
class RimIdenticalGridCaseGroup;
|
||||
class RimRoffCase;
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QStringList>
|
||||
|
||||
#include <set>
|
||||
#include <vector>
|
||||
|
||||
@@ -26,7 +28,6 @@ class RifEclipseSummaryAddress;
|
||||
class RimSummaryCaseCollection;
|
||||
|
||||
class QString;
|
||||
class QStringList;
|
||||
|
||||
//==================================================================================================
|
||||
//
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
#include "RimObservedDataCollection.h"
|
||||
|
||||
#include <QString>
|
||||
#include <QStringList>
|
||||
|
||||
#include <vector>
|
||||
|
||||
@@ -38,8 +39,6 @@ class RimObservedDataCollection;
|
||||
class RimSummaryCurve;
|
||||
class RimUserDefinedCalculation;
|
||||
|
||||
class QStringList;
|
||||
|
||||
namespace caf
|
||||
{
|
||||
class PdmObject;
|
||||
|
||||
@@ -19,9 +19,9 @@
|
||||
#pragma once
|
||||
|
||||
#include <QString>
|
||||
#include <map>
|
||||
#include <QStringList>
|
||||
|
||||
class QStringList;
|
||||
#include <map>
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
|
||||
Reference in New Issue
Block a user