diff --git a/ApplicationCode/Application/Tools/RiaQDateTimeTools.cpp b/ApplicationCode/Application/Tools/RiaQDateTimeTools.cpp index ccc651c776..7757cc31ca 100644 --- a/ApplicationCode/Application/Tools/RiaQDateTimeTools.cpp +++ b/ApplicationCode/Application/Tools/RiaQDateTimeTools.cpp @@ -122,7 +122,7 @@ QDateTime RiaQDateTimeTools::epoch() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QDateTime RiaQDateTimeTools::createDateTime() +QDateTime RiaQDateTimeTools::createUtcDateTime() { auto qdt = QDateTime(); qdt.setTimeSpec(currentTimeSpec()); @@ -132,7 +132,7 @@ QDateTime RiaQDateTimeTools::createDateTime() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QDateTime RiaQDateTimeTools::createDateTime(const QDate& date) +QDateTime RiaQDateTimeTools::createUtcDateTime(const QDate& date) { auto qdt = QDateTime(date); qdt.setTimeSpec(currentTimeSpec()); @@ -142,7 +142,7 @@ QDateTime RiaQDateTimeTools::createDateTime(const QDate& date) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QDateTime RiaQDateTimeTools::createDateTime(const QDate& date, const QTime& time) +QDateTime RiaQDateTimeTools::createUtcDateTime(const QDate& date, const QTime& time) { auto qdt = QDateTime(date, time, currentTimeSpec()); return qdt; diff --git a/ApplicationCode/Application/Tools/RiaQDateTimeTools.h b/ApplicationCode/Application/Tools/RiaQDateTimeTools.h index ae25f4008e..50db1ed3cb 100644 --- a/ApplicationCode/Application/Tools/RiaQDateTimeTools.h +++ b/ApplicationCode/Application/Tools/RiaQDateTimeTools.h @@ -43,9 +43,9 @@ public: static QDateTime epoch(); - static QDateTime createDateTime(); - static QDateTime createDateTime(const QDate& date); - static QDateTime createDateTime(const QDate& date, const QTime& time); + static QDateTime createUtcDateTime(); + static QDateTime createUtcDateTime(const QDate& date); + static QDateTime createUtcDateTime(const QDate& date, const QTime& time); private: static quint64 secondsInDay(); diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeature.h b/ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeature.h index c8dccb9efb..e670fcfad5 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeature.h +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeature.h @@ -24,8 +24,6 @@ #include -#include - class RimSummaryCurve; class RimAsciiDataCurve; class RicPasteAsciiDataToSummaryPlotFeatureUi; diff --git a/ApplicationCode/FileInterface/RifColumnBasedUserData.h b/ApplicationCode/FileInterface/RifColumnBasedUserData.h index e1e84eb4ec..7a1da3e4b8 100644 --- a/ApplicationCode/FileInterface/RifColumnBasedUserData.h +++ b/ApplicationCode/FileInterface/RifColumnBasedUserData.h @@ -22,11 +22,8 @@ #include "RifSummaryReaderInterface.h" #include -#include -#include #include -class QDateTime; class QString; class RifColumnBasedUserDataParser; @@ -53,7 +50,7 @@ public: private: std::unique_ptr m_parser; - std::vector< std::vector > m_timeSteps; + std::vector< std::vector > m_timeSteps; std::map m_mapFromAddressToTimeStepIndex; std::map > m_mapFromAddressToResultIndex; diff --git a/ApplicationCode/FileInterface/RifColumnBasedUserDataParser.h b/ApplicationCode/FileInterface/RifColumnBasedUserDataParser.h index b71ba549ab..624bf7909c 100644 --- a/ApplicationCode/FileInterface/RifColumnBasedUserDataParser.h +++ b/ApplicationCode/FileInterface/RifColumnBasedUserDataParser.h @@ -20,12 +20,8 @@ #include "RifEclipseSummaryAddress.h" -#include -#include #include -#include -#include #include struct ColumnInfo; diff --git a/ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp b/ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp index bbbdc8ce8b..eac5be12f7 100644 --- a/ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp +++ b/ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp @@ -160,7 +160,7 @@ void RifEclipseOutputFileTools::timeSteps(ecl_file_type* ecl_file, std::vector #include -#include #include diff --git a/ApplicationCode/FileInterface/RifReaderObservedData.h b/ApplicationCode/FileInterface/RifReaderObservedData.h index 15ef4f11d0..56d647b677 100644 --- a/ApplicationCode/FileInterface/RifReaderObservedData.h +++ b/ApplicationCode/FileInterface/RifReaderObservedData.h @@ -26,7 +26,6 @@ #include #include -class QDateTime; class QString; class RifColumnBasedAsciiParser; diff --git a/ApplicationCode/FileInterface/RifSummaryReaderInterface.h b/ApplicationCode/FileInterface/RifSummaryReaderInterface.h index 0708018e87..e96b6eb4a2 100644 --- a/ApplicationCode/FileInterface/RifSummaryReaderInterface.h +++ b/ApplicationCode/FileInterface/RifSummaryReaderInterface.h @@ -47,7 +47,7 @@ public: virtual std::string unitName(const RifEclipseSummaryAddress& resultAddress) const = 0; // TODO: Move this to a tools class with static members - static std::vector fromTimeT(const std::vector& timeSteps); + static std::vector fromTimeT(const std::vector& timeSteps); protected: std::vector m_allResultAddresses;