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

Move defines to RiaDateTimeDefines

Browse Source
This commit is contained in:
Magne Sjaastad
2022-03-14 09:18:48 +01:00
committed by GitHub
parent e435e28e7d
commit 0ca70249ae
49 changed files with 495 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationLibCode/Commands/RicResampleDialog.h
View File

@@ -18,7 +18,7 @@
#pragma once
#include "RiaQDateTimeTools.h"
#include "RiaDateTimeDefines.h"
#include "cafPdmPointer.h"
@@ -49,8 +49,8 @@ public:
static RicResampleDialogResult openDialog( QWidget* parent = nullptr, const QString& caption = QString() );
private:
void setPeriodOptions( const std::vector<RiaQDateTimeTools::DateTimePeriod>& dateTimePeriods );
RiaQDateTimeTools::DateTimePeriod selectedDateTimePeriod() const;
void setPeriodOptions( const std::vector<RiaDefines::DateTimePeriod>& dateTimePeriods );
RiaDefines::DateTimePeriod selectedDateTimePeriod() const;
private slots:
void slotDialogOkClicked();
@@ -69,12 +69,12 @@ private:
class RicResampleDialogResult
{
public:
RicResampleDialogResult( bool ok, RiaQDateTimeTools::DateTimePeriod period )
RicResampleDialogResult( bool ok, RiaDefines::DateTimePeriod period )
: ok( ok )
, period( period )
{
}
bool ok;
RiaQDateTimeTools::DateTimePeriod period;
bool ok;
RiaDefines::DateTimePeriod period;
};