#6345 Remove obsolete include of QFileDialog

This commit is contained in:
Magne Sjaastad 2020-08-21 18:56:12 +02:00
parent 6a0a6e9836
commit 1adf97b075
22 changed files with 20 additions and 31 deletions

View File

@ -32,7 +32,7 @@
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
#include <QAction> #include <QAction>
#include <QFileDialog> #include <QFileInfo>
CAF_CMD_SOURCE_INIT( RicImportEclipseCasesFeature, "RicImportEclipseCasesFeature" ); CAF_CMD_SOURCE_INIT( RicImportEclipseCasesFeature, "RicImportEclipseCasesFeature" );

View File

@ -35,7 +35,6 @@
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
#include <QAction> #include <QAction>
#include <QFileDialog>
CAF_CMD_SOURCE_INIT( RicImportInputEclipseCaseFeature, "RicImportInputEclipseCaseFeature" ); CAF_CMD_SOURCE_INIT( RicImportInputEclipseCaseFeature, "RicImportInputEclipseCaseFeature" );

View File

@ -37,7 +37,8 @@
#include "cafSelectionManagerTools.h" #include "cafSelectionManagerTools.h"
#include <QAction> #include <QAction>
#include <QFileDialog> #include <QDir>
#include <QFileInfo>
#include <cafUtils.h> #include <cafUtils.h>
@ -124,10 +125,10 @@ void RicExportSelectedWellPathsFeature::writeWellPathGeometryToStream( QTextStre
stream << "WELLNAME: '" << caf::Utils::makeValidFileBasename( exportName ) << "'" << endl; stream << "WELLNAME: '" << caf::Utils::makeValidFileBasename( exportName ) << "'" << endl;
auto numberFormat = RifTextDataTableDoubleFormatting( RIF_FLOAT, 2 ); auto numberFormat = RifTextDataTableDoubleFormatting( RIF_FLOAT, 2 );
formatter.header( { { "X", numberFormat, RIGHT }, formatter.header( {{"X", numberFormat, RIGHT},
{ "Y", numberFormat, RIGHT }, {"Y", numberFormat, RIGHT},
{ "TVDMSL", numberFormat, RIGHT }, {"TVDMSL", numberFormat, RIGHT},
{ useMdRkb ? "MDRKB" : "MDMSL", numberFormat, RIGHT } } ); {useMdRkb ? "MDRKB" : "MDMSL", numberFormat, RIGHT}} );
while ( currMd < endMd ) while ( currMd < endMd )
{ {

View File

@ -36,7 +36,6 @@
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
#include <QAction> #include <QAction>
#include <QFileDialog>
CAF_CMD_SOURCE_INIT( RicExportToLasFileFeature, "RicExportToLasFileFeature" ); CAF_CMD_SOURCE_INIT( RicExportToLasFileFeature, "RicExportToLasFileFeature" );

View File

@ -35,7 +35,6 @@
#include "cafSelectionManagerTools.h" #include "cafSelectionManagerTools.h"
#include <QAction> #include <QAction>
#include <QFileDialog>
#include <QFileInfo> #include <QFileInfo>
#include <QMessageBox> #include <QMessageBox>

View File

@ -35,7 +35,7 @@
#include <QAction> #include <QAction>
#include <QClipboard> #include <QClipboard>
#include <QDebug> #include <QDebug>
#include <QFileDialog> #include <QDir>
#include <QFileInfo> #include <QFileInfo>
#include <QMdiSubWindow> #include <QMdiSubWindow>

View File

@ -43,7 +43,7 @@
#include <QAction> #include <QAction>
#include <QClipboard> #include <QClipboard>
#include <QDebug> #include <QDebug>
#include <QFileDialog> #include <QDir>
#include <QFileInfo> #include <QFileInfo>
#include <QMdiSubWindow> #include <QMdiSubWindow>

View File

@ -32,7 +32,6 @@
#include <QAction> #include <QAction>
#include <QClipboard> #include <QClipboard>
#include <QDebug> #include <QDebug>
#include <QFileDialog>
#include <QFileInfo> #include <QFileInfo>
#include <QMdiSubWindow> #include <QMdiSubWindow>

View File

@ -31,7 +31,6 @@
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
#include <QAction> #include <QAction>
#include <QFileDialog>
CAF_CMD_SOURCE_INIT( RicCreatePlotFromSelectionFeature, "RicCreatePlotFromSelectionFeature" ); CAF_CMD_SOURCE_INIT( RicCreatePlotFromSelectionFeature, "RicCreatePlotFromSelectionFeature" );

View File

@ -43,7 +43,6 @@
#include "cafSelectionManagerTools.h" #include "cafSelectionManagerTools.h"
#include <QAction> #include <QAction>
#include <QFileDialog>
#include <QInputDialog> #include <QInputDialog>
#include <QMessageBox> #include <QMessageBox>

View File

@ -42,7 +42,7 @@
#include "cafUtils.h" #include "cafUtils.h"
#include <QAction> #include <QAction>
#include <QFileDialog> #include <QFileInfo>
#include <cmath> #include <cmath>

View File

@ -44,7 +44,6 @@
#include "SummaryPlotCommands/RicNewSummaryPlotFeature.h" #include "SummaryPlotCommands/RicNewSummaryPlotFeature.h"
#include <QAction> #include <QAction>
#include <QFileDialog>
#include <QInputDialog> #include <QInputDialog>
#include <QMessageBox> #include <QMessageBox>

View File

@ -28,7 +28,6 @@
#include "RimSummaryObservedDataFile.h" #include "RimSummaryObservedDataFile.h"
#include <QAction> #include <QAction>
#include <QFileDialog>
CAF_CMD_SOURCE_INIT( RicImportObservedDataInMenuFeature, "RicImportObservedDataInMenuFeature" ); CAF_CMD_SOURCE_INIT( RicImportObservedDataInMenuFeature, "RicImportObservedDataInMenuFeature" );

View File

@ -28,7 +28,6 @@
#include "RimSummaryObservedDataFile.h" #include "RimSummaryObservedDataFile.h"
#include <QAction> #include <QAction>
#include <QFileDialog>
CAF_CMD_SOURCE_INIT( RicImportObservedFmuDataInMenuFeature, "RicImportObservedFmuDataInMenuFeature" ); CAF_CMD_SOURCE_INIT( RicImportObservedFmuDataInMenuFeature, "RicImportObservedFmuDataInMenuFeature" );

View File

@ -34,7 +34,6 @@
#include "RiuPlotMainWindow.h" #include "RiuPlotMainWindow.h"
#include <QAction> #include <QAction>
#include <QFileDialog>
CAF_CMD_SOURCE_INIT( RicImportSummaryCaseFeature, "RicImportSummaryCaseFeature" ); CAF_CMD_SOURCE_INIT( RicImportSummaryCaseFeature, "RicImportSummaryCaseFeature" );

View File

@ -51,7 +51,7 @@
#include "cafSelectionManagerTools.h" #include "cafSelectionManagerTools.h"
#include <QAction> #include <QAction>
#include <QFileDialog> #include <QFileInfo>
#include <QMessageBox> #include <QMessageBox>
CAF_CMD_SOURCE_INIT( RicImportSummaryCasesFeature, "RicImportSummaryCasesFeature" ); CAF_CMD_SOURCE_INIT( RicImportSummaryCasesFeature, "RicImportSummaryCasesFeature" );

View File

@ -40,7 +40,6 @@
#include "SummaryPlotCommands/RicNewSummaryPlotFeature.h" #include "SummaryPlotCommands/RicNewSummaryPlotFeature.h"
#include <QAction> #include <QAction>
#include <QFileDialog>
#include <QInputDialog> #include <QInputDialog>
#include <QMessageBox> #include <QMessageBox>

View File

@ -26,7 +26,6 @@
#include <QAction> #include <QAction>
#include <QComboBox> #include <QComboBox>
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QFileDialog>
#include <QGroupBox> #include <QGroupBox>
#include <QLabel> #include <QLabel>
#include <QLineEdit> #include <QLineEdit>

View File

@ -41,7 +41,8 @@
#include <QClipboard> #include <QClipboard>
#include <QDateTime> #include <QDateTime>
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QFileDialog> #include <QDir>
#include <QFileInfo>
#include <QGroupBox> #include <QGroupBox>
#include <QLabel> #include <QLabel>
#include <QLineEdit> #include <QLineEdit>

View File

@ -29,7 +29,6 @@
#include "cafSelectionManagerTools.h" #include "cafSelectionManagerTools.h"
#include <QAction> #include <QAction>
#include <QFileDialog>
CAF_CMD_SOURCE_INIT( RicMoveWellLogFilesFeature, "RicMoveWellLogFilesFeature" ); CAF_CMD_SOURCE_INIT( RicMoveWellLogFilesFeature, "RicMoveWellLogFilesFeature" );

View File

@ -35,7 +35,7 @@
#include "cafPdmFieldIOScriptability.h" #include "cafPdmFieldIOScriptability.h"
#include <QFileDialog> #include <QFileInfo>
#include <QMessageBox> #include <QMessageBox>
#include <algorithm> #include <algorithm>

View File

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