From 8211727b79a4607ae9bd5a813bf036f81367252f Mon Sep 17 00:00:00 2001 From: Kristian Bendiksen Date: Tue, 12 May 2020 09:00:20 +0200 Subject: [PATCH] Remove ifdefs for Qt4 support. --- ApplicationCode/Application/RiaApplication.cpp | 9 ++------- ApplicationCode/Application/RiaPreferences.cpp | 6 ------ .../HoloLensCommands/RicHoloLensRestClient.cpp | 10 ---------- .../SsiHubImportCommands/RiuWellImportWizard.cpp | 10 +--------- .../RicSummaryCurveCalculatorWidgetCreator.cpp | 4 ---- ApplicationCode/SocketInterface/RiaSocketServer.cpp | 6 +----- .../UserInterface/RiuAdvancedSnapshotExportWidget.cpp | 4 ---- .../RiuEditPerforationCollectionWidget.cpp | 5 ----- 8 files changed, 4 insertions(+), 50 deletions(-) diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp index dba69133fd..fed0c82afa 100644 --- a/ApplicationCode/Application/RiaApplication.cpp +++ b/ApplicationCode/Application/RiaApplication.cpp @@ -1355,12 +1355,8 @@ int RiaApplication::launchUnitTests() caf::ProgressInfoBlocker progressBlocker; cvf::Assert::setReportMode( cvf::Assert::CONSOLE ); -#if QT_VERSION < 0x050000 - int argc = QCoreApplication::argc(); - char** argv = QCoreApplication::argv(); -#else - int argc = QCoreApplication::arguments().size(); - QStringList arguments = QCoreApplication::arguments(); + int argc = QCoreApplication::arguments().size(); + QStringList arguments = QCoreApplication::arguments(); std::vector argumentsStd; for ( QString qstring : arguments ) { @@ -1372,7 +1368,6 @@ int RiaApplication::launchUnitTests() argVector.push_back( &string.front() ); } char** argv = argVector.data(); -#endif testing::InitGoogleTest( &argc, argv ); diff --git a/ApplicationCode/Application/RiaPreferences.cpp b/ApplicationCode/Application/RiaPreferences.cpp index fd6c422aa2..045176f35d 100644 --- a/ApplicationCode/Application/RiaPreferences.cpp +++ b/ApplicationCode/Application/RiaPreferences.cpp @@ -35,10 +35,7 @@ #include #include #include - -#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 ) #include -#endif namespace caf { @@ -118,14 +115,11 @@ RiaPreferences::RiaPreferences( void ) #ifdef WIN32 defaultTextEditor = QString( "notepad.exe" ); #else - defaultTextEditor = QString( "kate" ); -#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 ) defaultTextEditor = QStandardPaths::findExecutable( "kate" ); if ( defaultTextEditor.isEmpty() ) { defaultTextEditor = QStandardPaths::findExecutable( "gedit" ); } -#endif #endif CAF_PDM_InitField( &scriptEditorExecutable, "scriptEditorExecutable", defaultTextEditor, "Script Editor", "", "", "" ); diff --git a/ApplicationCode/Commands/HoloLensCommands/RicHoloLensRestClient.cpp b/ApplicationCode/Commands/HoloLensCommands/RicHoloLensRestClient.cpp index 0d2198a2bd..6136d5c9b9 100644 --- a/ApplicationCode/Commands/HoloLensCommands/RicHoloLensRestClient.cpp +++ b/ApplicationCode/Commands/HoloLensCommands/RicHoloLensRestClient.cpp @@ -528,16 +528,6 @@ QString RicHoloLensRestClient::networkErrorCodeAsString( QNetworkReply::NetworkE //-------------------------------------------------------------------------------------------------- qint64 RicHoloLensRestClient::getCurrentTimeStamp_ms() { -#if QT_VERSION >= 0x040700 const qint64 timeStamp_ms = QDateTime::currentMSecsSinceEpoch(); return timeStamp_ms; -#elif defined( __linux__ ) - struct timespec ts; - if ( clock_gettime( CLOCK_MONOTONIC, &ts ) == 0 ) - { - return static_cast( ts.tv_sec * 1000 + ts.tv_nsec / 1000000 ); - } -#else - return 0; -#endif } diff --git a/ApplicationCode/Commands/SsiHubImportCommands/RiuWellImportWizard.cpp b/ApplicationCode/Commands/SsiHubImportCommands/RiuWellImportWizard.cpp index 1e7964cd80..81069c63a1 100644 --- a/ApplicationCode/Commands/SsiHubImportCommands/RiuWellImportWizard.cpp +++ b/ApplicationCode/Commands/SsiHubImportCommands/RiuWellImportWizard.cpp @@ -41,12 +41,8 @@ #include #include -#if QT_VERSION >= 0x050000 -#include -#else -#include -#endif #include +#include #include @@ -349,11 +345,7 @@ void RiuWellImportWizard::startRequest( QUrl url ) if ( supportsSsl ) { QSslConfiguration config = QSslConfiguration::defaultConfiguration(); -#if QT_VERSION >= 0x050000 config.setProtocol( QSsl::TlsV1_0 ); -#else - config.setProtocol( QSsl::TlsV1 ); -#endif request.setSslConfiguration( config ); } #endif diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorWidgetCreator.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorWidgetCreator.cpp index 6744b16739..97a3bc6b6e 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorWidgetCreator.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorWidgetCreator.cpp @@ -124,11 +124,7 @@ QWidget* RicSummaryCurveCalculatorWidgetCreator::createWidget( QWidget* parent ) m_pdmTableView->enableHeaderText( false ); QHeaderView* verticalHeader = m_pdmTableView->tableView()->verticalHeader(); -#if QT_VERSION >= 0x050000 verticalHeader->setSectionResizeMode( QHeaderView::Interactive ); -#else - verticalHeader->setResizeMode( QHeaderView::Interactive ); -#endif m_pdmTableView->tableView()->resizeColumnsToContents(); diff --git a/ApplicationCode/SocketInterface/RiaSocketServer.cpp b/ApplicationCode/SocketInterface/RiaSocketServer.cpp index 54c35d61aa..5398f735ac 100644 --- a/ApplicationCode/SocketInterface/RiaSocketServer.cpp +++ b/ApplicationCode/SocketInterface/RiaSocketServer.cpp @@ -35,12 +35,8 @@ #include "cafFactory.h" -#if QT_VERSION >= 0x050000 -#include -#else -#include -#endif #include +#include #include diff --git a/ApplicationCode/UserInterface/RiuAdvancedSnapshotExportWidget.cpp b/ApplicationCode/UserInterface/RiuAdvancedSnapshotExportWidget.cpp index fe938ada81..55a545316d 100644 --- a/ApplicationCode/UserInterface/RiuAdvancedSnapshotExportWidget.cpp +++ b/ApplicationCode/UserInterface/RiuAdvancedSnapshotExportWidget.cpp @@ -76,11 +76,7 @@ RiuAdvancedSnapshotExportWidget::RiuAdvancedSnapshotExportWidget( QWidget* paren 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 diff --git a/ApplicationCode/UserInterface/RiuEditPerforationCollectionWidget.cpp b/ApplicationCode/UserInterface/RiuEditPerforationCollectionWidget.cpp index 68bdbf1170..3618a86eec 100644 --- a/ApplicationCode/UserInterface/RiuEditPerforationCollectionWidget.cpp +++ b/ApplicationCode/UserInterface/RiuEditPerforationCollectionWidget.cpp @@ -59,12 +59,7 @@ RiuEditPerforationCollectionWidget::RiuEditPerforationCollectionWidget( QWidget* m_pdmTableView->setChildArrayField( &( m_perforationCollection->m_perforations ) ); 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