Use struct instead of class

OPM · Dec 19, 2024 · 2968873 · 2968873
1 parent f190596
commit 2968873
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 29 deletions.
diff --git a/ApplicationLibCode/Commands/RicRecursiveFileSearchDialog.cpp b/ApplicationLibCode/Commands/RicRecursiveFileSearchDialog.cpp
@@ -26,7 +26,6 @@
 
 #include "RiuFileDialogTools.h"
 #include "RiuTools.h"
-#include "opm/io/eclipse/EclUtil.hpp"
 
 #include <QAbstractItemView>
 #include <QAction>
@@ -269,15 +268,17 @@ RicRecursiveFileSearchDialogResult RicRecursiveFileSearchDialog::runRecursiveSea
             RiaStringListSerializer stringListSerializer( fileFilterRegistryKey );
             stringListSerializer.addString( dialog.m_fileFilterField->currentText(), maxItemsInRegistry );
         }
+
+        return { .ok             = dialog.result() == QDialog::Accepted,
+                 .files          = dialog.m_foundFiles,
+                 .rootDir        = dialog.rootDirWithEndSeparator(),
+                 .pathFilter     = dialog.pathFilterWithoutStartSeparator(),
+                 .fileNameFilter = dialog.fileNameFilter(),
+                 .fileType       = dialog.fileType(),
+                 .groupingMode   = dialog.ensembleGroupingMode() };
     }
 
-    return RicRecursiveFileSearchDialogResult( dialog.result() == QDialog::Accepted,
-                                               dialog.m_foundFiles,
-                                               dialog.rootDirWithEndSeparator(),
-                                               dialog.pathFilterWithoutStartSeparator(),
-                                               dialog.fileNameFilter(),
-                                               dialog.fileType(),
-                                               dialog.ensembleGroupingMode() );
+    return {};
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -1298,7 +1299,6 @@ RiaDefines::FileType RicRecursiveFileSearchDialog::mapSummaryFileType( RicRecurs
             return RiaDefines::FileType::STIMPLAN_SUMMARY;
         default:
         {
-            CAF_ASSERT( false && "Unsupported file type" );
             return RiaDefines::FileType::SMSPEC;
         }
     }

diff --git a/ApplicationLibCode/Commands/RicRecursiveFileSearchDialog.h b/ApplicationLibCode/Commands/RicRecursiveFileSearchDialog.h
@@ -39,7 +39,7 @@ class QComboBox;
 class QCheckBox;
 class QTreeView;
 
-class RicRecursiveFileSearchDialogResult;
+struct RicRecursiveFileSearchDialogResult;
 
 //==================================================================================================
 ///
@@ -180,26 +180,8 @@ private slots:
 //==================================================================================================
 ///
 //==================================================================================================
-class RicRecursiveFileSearchDialogResult
+struct RicRecursiveFileSearchDialogResult
 {
-public:
-    RicRecursiveFileSearchDialogResult( bool                                       ok,
-                                        const QStringList&                         files,
-                                        const QString&                             rootDir,
-                                        const QString&                             pathFilter,
-                                        const QString&                             fileNameFilter,
-                                        RicRecursiveFileSearchDialog::FileType     fileType,
-                                        RiaEnsembleNameTools::EnsembleGroupingMode groupingMode )
-        : ok( ok )
-        , files( files )
-        , rootDir( rootDir )
-        , pathFilter( pathFilter )
-        , fileNameFilter( fileNameFilter )
-        , fileType( fileType )
-        , groupingMode( groupingMode )
-    {
-    }
-
     bool                                   ok;
     QStringList                            files;
     QString                                rootDir;