#6345 Remove obsolete include of QFileDialog

2025-01-21 22:13:25 -06:00 · 2020-08-21 18:56:12 +02:00 · 2020-08-21 18:56:12 +02:00 · 1adf97b075
commit 1adf97b075
parent 6a0a6e9836
22 changed files with 20 additions and 31 deletions
--- a/ApplicationCode/Commands/EclipseCommands/RicImportEclipseCasesFeature.cpp
+++ b/ApplicationCode/Commands/EclipseCommands/RicImportEclipseCasesFeature.cpp
@ -32,7 +32,7 @@
 #include "cafSelectionManager.h"

 #include <QAction>
-#include <QFileDialog>
+#include <QFileInfo>

 CAF_CMD_SOURCE_INIT( RicImportEclipseCasesFeature, "RicImportEclipseCasesFeature" );

--- a/ApplicationCode/Commands/EclipseCommands/RicImportInputEclipseCaseFeature.cpp
+++ b/ApplicationCode/Commands/EclipseCommands/RicImportInputEclipseCaseFeature.cpp
@ -35,7 +35,6 @@
 #include "cafSelectionManager.h"

 #include <QAction>
-#include <QFileDialog>

 CAF_CMD_SOURCE_INIT( RicImportInputEclipseCaseFeature, "RicImportInputEclipseCaseFeature" );

--- a/ApplicationCode/Commands/ExportCommands/RicExportSelectedWellPathsFeature.cpp
+++ b/ApplicationCode/Commands/ExportCommands/RicExportSelectedWellPathsFeature.cpp
@ -37,7 +37,8 @@
 #include "cafSelectionManagerTools.h"

 #include <QAction>
-#include <QFileDialog>
+#include <QDir>
+#include <QFileInfo>

 #include <cafUtils.h>

@ -124,10 +125,10 @@ void RicExportSelectedWellPathsFeature::writeWellPathGeometryToStream( QTextStre
    stream << "WELLNAME: '" << caf::Utils::makeValidFileBasename( exportName ) << "'" << endl;

    auto numberFormat = RifTextDataTableDoubleFormatting( RIF_FLOAT, 2 );
-    formatter.header( { { "X", numberFormat, RIGHT },
-                        { "Y", numberFormat, RIGHT },
-                        { "TVDMSL", numberFormat, RIGHT },
-                        { useMdRkb ? "MDRKB" : "MDMSL", numberFormat, RIGHT } } );
+    formatter.header( {{"X", numberFormat, RIGHT},
+                       {"Y", numberFormat, RIGHT},
+                       {"TVDMSL", numberFormat, RIGHT},
+                       {useMdRkb ? "MDRKB" : "MDMSL", numberFormat, RIGHT}} );

    while ( currMd < endMd )
    {
--- a/ApplicationCode/Commands/ExportCommands/RicExportToLasFileFeature.cpp
+++ b/ApplicationCode/Commands/ExportCommands/RicExportToLasFileFeature.cpp
@ -36,7 +36,6 @@
 #include "cafSelectionManager.h"

 #include <QAction>
-#include <QFileDialog>

 CAF_CMD_SOURCE_INIT( RicExportToLasFileFeature, "RicExportToLasFileFeature" );

--- a/ApplicationCode/Commands/ExportCommands/RicExportVisibleWellPathsFeature.cpp
+++ b/ApplicationCode/Commands/ExportCommands/RicExportVisibleWellPathsFeature.cpp
@ -35,7 +35,6 @@
 #include "cafSelectionManagerTools.h"

 #include <QAction>
-#include <QFileDialog>
 #include <QFileInfo>
 #include <QMessageBox>

--- a/ApplicationCode/Commands/ExportCommands/RicSnapshotAllPlotsToFileFeature.cpp
+++ b/ApplicationCode/Commands/ExportCommands/RicSnapshotAllPlotsToFileFeature.cpp
@ -35,7 +35,7 @@
 #include <QAction>
 #include <QClipboard>
 #include <QDebug>
-#include <QFileDialog>
+#include <QDir>
 #include <QFileInfo>
 #include <QMdiSubWindow>

--- a/ApplicationCode/Commands/ExportCommands/RicSnapshotAllViewsToFileFeature.cpp
+++ b/ApplicationCode/Commands/ExportCommands/RicSnapshotAllViewsToFileFeature.cpp
@ -43,7 +43,7 @@
 #include <QAction>
 #include <QClipboard>
 #include <QDebug>
-#include <QFileDialog>
+#include <QDir>
 #include <QFileInfo>
 #include <QMdiSubWindow>

--- a/ApplicationCode/Commands/ExportCommands/RicSnapshotViewToClipboardFeature.cpp
+++ b/ApplicationCode/Commands/ExportCommands/RicSnapshotViewToClipboardFeature.cpp
@ -32,7 +32,6 @@
 #include <QAction>
 #include <QClipboard>
 #include <QDebug>
-#include <QFileDialog>
 #include <QFileInfo>
 #include <QMdiSubWindow>

--- a/ApplicationCode/Commands/PlotTemplateCommands/RicCreatePlotFromSelectionFeature.cpp
+++ b/ApplicationCode/Commands/PlotTemplateCommands/RicCreatePlotFromSelectionFeature.cpp
@ -31,7 +31,6 @@
 #include "cafSelectionManager.h"

 #include <QAction>
-#include <QFileDialog>

 CAF_CMD_SOURCE_INIT( RicCreatePlotFromSelectionFeature, "RicCreatePlotFromSelectionFeature" );

--- a/ApplicationCode/Commands/RicConvertGroupToEnsembleFeature.cpp
+++ b/ApplicationCode/Commands/RicConvertGroupToEnsembleFeature.cpp
@ -43,7 +43,6 @@
 #include "cafSelectionManagerTools.h"

 #include <QAction>
-#include <QFileDialog>
 #include <QInputDialog>
 #include <QMessageBox>

--- a/ApplicationCode/Commands/RicExportContourMapToTextFeature.cpp
+++ b/ApplicationCode/Commands/RicExportContourMapToTextFeature.cpp
@ -42,7 +42,7 @@
 #include "cafUtils.h"

 #include <QAction>
-#include <QFileDialog>
+#include <QFileInfo>

 #include <cmath>

--- a/ApplicationCode/Commands/RicImportEnsembleFeature.cpp
+++ b/ApplicationCode/Commands/RicImportEnsembleFeature.cpp
@ -44,7 +44,6 @@
 #include "SummaryPlotCommands/RicNewSummaryPlotFeature.h"

 #include <QAction>
-#include <QFileDialog>
 #include <QInputDialog>
 #include <QMessageBox>

--- a/ApplicationCode/Commands/RicImportObservedDataInMenuFeature.cpp
+++ b/ApplicationCode/Commands/RicImportObservedDataInMenuFeature.cpp
@ -28,7 +28,6 @@
 #include "RimSummaryObservedDataFile.h"

 #include <QAction>
-#include <QFileDialog>

 CAF_CMD_SOURCE_INIT( RicImportObservedDataInMenuFeature, "RicImportObservedDataInMenuFeature" );

--- a/ApplicationCode/Commands/RicImportObservedFmuDataInMenuFeature.cpp
+++ b/ApplicationCode/Commands/RicImportObservedFmuDataInMenuFeature.cpp
@ -28,7 +28,6 @@
 #include "RimSummaryObservedDataFile.h"

 #include <QAction>
-#include <QFileDialog>

 CAF_CMD_SOURCE_INIT( RicImportObservedFmuDataInMenuFeature, "RicImportObservedFmuDataInMenuFeature" );

--- a/ApplicationCode/Commands/RicImportSummaryCaseFeature.cpp
+++ b/ApplicationCode/Commands/RicImportSummaryCaseFeature.cpp
@ -34,7 +34,6 @@
 #include "RiuPlotMainWindow.h"

 #include <QAction>
-#include <QFileDialog>

 CAF_CMD_SOURCE_INIT( RicImportSummaryCaseFeature, "RicImportSummaryCaseFeature" );

--- a/ApplicationCode/Commands/RicImportSummaryCasesFeature.cpp
+++ b/ApplicationCode/Commands/RicImportSummaryCasesFeature.cpp
@ -51,7 +51,7 @@
 #include "cafSelectionManagerTools.h"

 #include <QAction>
-#include <QFileDialog>
+#include <QFileInfo>
 #include <QMessageBox>

 CAF_CMD_SOURCE_INIT( RicImportSummaryCasesFeature, "RicImportSummaryCasesFeature" );
--- a/ApplicationCode/Commands/RicImportSummaryGroupFeature.cpp
+++ b/ApplicationCode/Commands/RicImportSummaryGroupFeature.cpp
@ -40,7 +40,6 @@
 #include "SummaryPlotCommands/RicNewSummaryPlotFeature.h"

 #include <QAction>
-#include <QFileDialog>
 #include <QInputDialog>
 #include <QMessageBox>

--- a/ApplicationCode/Commands/RicResampleDialog.cpp
+++ b/ApplicationCode/Commands/RicResampleDialog.cpp
@ -26,7 +26,6 @@
 #include <QAction>
 #include <QComboBox>
 #include <QDialogButtonBox>
-#include <QFileDialog>
 #include <QGroupBox>
 #include <QLabel>
 #include <QLineEdit>
--- a/ApplicationCode/Commands/RicSummaryCaseRestartDialog.cpp
+++ b/ApplicationCode/Commands/RicSummaryCaseRestartDialog.cpp
@ -41,7 +41,8 @@
 #include <QClipboard>
 #include <QDateTime>
 #include <QDialogButtonBox>
-#include <QFileDialog>
+#include <QDir>
+#include <QFileInfo>
 #include <QGroupBox>
 #include <QLabel>
 #include <QLineEdit>
--- a/ApplicationCode/Commands/WellLogCommands/RicMoveWellLogFilesFeature.cpp
+++ b/ApplicationCode/Commands/WellLogCommands/RicMoveWellLogFilesFeature.cpp
@ -29,7 +29,6 @@
 #include "cafSelectionManagerTools.h"

 #include <QAction>
-#include <QFileDialog>

 CAF_CMD_SOURCE_INIT( RicMoveWellLogFilesFeature, "RicMoveWellLogFilesFeature" );

--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp
@ -35,7 +35,7 @@

 #include "cafPdmFieldIOScriptability.h"

-#include <QFileDialog>
+#include <QFileInfo>
 #include <QMessageBox>

 #include <algorithm>
--- a/ApplicationCode/UserInterface/RiuMultiCaseImportDialog.cpp
+++ b/ApplicationCode/UserInterface/RiuMultiCaseImportDialog.cpp
@ -20,11 +20,11 @@

 #include "RiaApplication.h"

+#include "RiuFileDialogTools.h"
 #include "RiuTools.h"

 #include "ui_RiuMultiCaseImportDialog.h"

-#include <QFileDialog>
 #include <QFileIconProvider>
 #include <QFileSystemModel>
 #include <QStringListModel>
@ -101,11 +101,11 @@ RiuMultiCaseImportDialog::~RiuMultiCaseImportDialog()
 //--------------------------------------------------------------------------------------------------
 void RiuMultiCaseImportDialog::on_m_addSearchFolderButton_clicked()
 {
-    QString selectedFolder =
-        QFileDialog::getExistingDirectory( this,
-                                           "Select an Eclipse case search folder",
-                                           RiaApplication::instance()->lastUsedDialogDirectory( "MULTICASEIMPORT" ) );
-    QStringList folderNames = m_searchFolders->stringList();
+    QString     selectedFolder = RiuFileDialogTools::getExistingDirectory( this,
+                                                                       "Select an Eclipse case search folder",
+                                                                       RiaApplication::instance()->lastUsedDialogDirectory(
+                                                                           "MULTICASEIMPORT" ) );
+    QStringList folderNames    = m_searchFolders->stringList();

    if ( !folderNames.contains( selectedFolder ) )
    {